Merge "Switch to current Sphinx"

This commit is contained in:
Jenkins 2017-01-14 00:30:13 +00:00 committed by Gerrit Code Review
commit 707f39317e
2 changed files with 2 additions and 3 deletions

View File

@ -85,7 +85,7 @@ does alter the standard linking conventions.
Usage for the deploy guide is as follows:
.. code-block:: ini
.. code-block:: rst
:deploy_guide:`Link title text <last-part-of-url.html>`

View File

@ -9,7 +9,7 @@ hacking<0.12,>=0.11.0 # Apache-2.0
beautifulsoup4 # MIT
Jinja2>=2.8 # BSD License (3 clause)
openstack-doc-tools>=1.1.0 # Apache-2.0
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
sphinx>=1.5.1,<1.6 # BSD
openstackdocstheme>=1.5.0 # Apache-2.0
doc8 # Apache-2.0
requests>=2.10.0,!=2.12.2 # Apache-2.0
@ -17,6 +17,5 @@ requestsexceptions>=1.1.1 # Apache-2.0
sphinxmark
lxml>=2.3,!=3.7.0 # BSD
# For translations
Babel>=2.3.4 # BSD