summaryrefslogtreecommitdiff
path: root/doc/source/conf.py
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2016-02-24 12:21:41 -0500
committerDoug Hellmann <doug@doughellmann.com>2016-02-24 12:22:59 -0500
commit67bf9d274c06612b8869314a9244183caf59745b (patch)
treea9536c464b888dae20d4a219e6759b268c0c1536 /doc/source/conf.py
parentbb8dbeb3a361586886b1bb060a3d98ffbf5f7e31 (diff)
downloadoslo-middleware-67bf9d274c06612b8869314a9244183caf59745b.tar.gz
Revert "work around doc build error"
This reverts commit bb8dbeb3a361586886b1bb060a3d98ffbf5f7e31. Making this work will depend on having a new release of oslo.config with the fix in the dependent patch. Depends-On: Ia024722d05ce8adaa57c58559cb42f2913653bb9 Change-Id: I33b37c74abf63bcaa95e668ec74c9c9849cc3773 Signed-off-by: Doug Hellmann <doug@doughellmann.com>
Diffstat (limited to 'doc/source/conf.py')
-rwxr-xr-xdoc/source/conf.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index af9a25f..a5301af 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,17 +25,9 @@ extensions = [
#'sphinx.ext.intersphinx',
'oslosphinx',
'oslo_config.sphinxext',
- 'oslo_config.sphinxconfiggen',
'stevedore.sphinxext',
]
-# NOTE(dhellmann): An issue with the oslo.config sphinx integration
-# makes the show-options directive here result in
-# duplicate target nodes being introduced. Until we
-# can fix that, use the other directive to dump a
-# config file and include it as literal text.
-config_generator_config_file = 'cors_config_file.cfg'
-
# autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles.
# execute "export SPHINX_DEBUG=1" in your terminal to disable