summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/requirements.txt3
-rwxr-xr-xdoc/source/conf.py5
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index b46abf3..eead9e1 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,5 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
openstackdocstheme>=1.20.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b056e5c..0547331 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,6 +23,7 @@ extensions = [
'sphinx.ext.autodoc',
#'sphinx.ext.intersphinx',
'openstackdocstheme',
+ 'sphinxcontrib.rsvgconverter',
]
# autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -67,11 +68,13 @@ htmlhelp_basename = 'python-barbicanclientdoc'
# [howto/manual]).
latex_documents = [
('index',
- 'python-barbicanclient.tex',
+ 'doc-python-barbicanclient.tex',
u'python-barbicanclient Documentation',
u'OpenStack Foundation', 'manual'),
]
+latex_use_xindy = False
+
# Example configuration for intersphinx: refer to the Python standard library.
#intersphinx_mapping = {'http://docs.python.org/': None}