Merge "fix docs/links for 1.14.0 release"

api-ref/source/v2/intro.inc

@@ -91,12 +91,12 @@ The Networking API v2.0 always responds with the JSON data serialization
 format. The ``Accept`` header is ignored.
 
 Query extension
-    A ``.json`` extension can be added to the request URI. For example, the
-    ``.json`` extension in the following requests are equivalent:
+A ``.json`` extension can be added to the request URI. For example, the
+``.json`` extension in the following requests are equivalent:
 
-    - ``GET`` *publicURL*/networks
+- GET *publicURL*/networks
 
-    - ``GET`` *publicURL*/networks.json
+- GET *publicURL*/networks.json
 
 Tenant and project attributes in responses
 ------------------------------------------

doc/source/reference/index.rst

@@ -25,9 +25,6 @@ Module Reference
 
 .. toctree::
    :maxdepth: 1
-   :glob:
-
-   modules/*
 
 * :ref:`genindex`
 * :ref:`search`

tox.ini

@@ -54,12 +54,15 @@ commands =
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
 
 [testenv:linkcheck]
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 whitelist_externals = rm
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b linkcheck api-ref/source api-ref/build/linkcheck
   rm -rf doc/build
-  python setup.py build_sphinx
   sphinx-build -W -b linkcheck doc/source doc/build/linkcheck
 
 [testenv:debug]