diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-07 14:30:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-07 14:30:54 +0000 |
| commit | 83b79fd527e9e7dd694e8067a3be8403414ac223 (patch) | |
| tree | c31374dd94ec6ac39cf73c92f97e0b18cca0e4db | |
| parent | 3525a90555e0f6c1c59342f0478f1fccc5d766d9 (diff) | |
| parent | 67bf9d274c06612b8869314a9244183caf59745b (diff) | |
| download | oslo-middleware-83b79fd527e9e7dd694e8067a3be8403414ac223.tar.gz | |
Merge "Revert "work around doc build error""
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | doc/source/conf.py | 8 | ||||
| -rw-r--r-- | doc/source/cors.rst | 9 | ||||
| -rw-r--r-- | doc/source/cors_config_file.cfg | 2 |
4 files changed, 1 insertions, 19 deletions
@@ -50,4 +50,3 @@ ChangeLog # Editors *~ .*.swp -/doc/source/sample.config 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 diff --git a/doc/source/cors.rst b/doc/source/cors.rst index 7f0beec..99e5dc0 100644 --- a/doc/source/cors.rst +++ b/doc/source/cors.rst @@ -125,14 +125,7 @@ configuration, this may be done as follows.:: Configuration Options --------------------- -.. 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. -.. .. show-options:: oslo.middleware.cors - -.. literalinclude:: sample.config +.. show-options:: oslo.middleware.cors Module Documentation -------------------- diff --git a/doc/source/cors_config_file.cfg b/doc/source/cors_config_file.cfg deleted file mode 100644 index 2cc624e..0000000 --- a/doc/source/cors_config_file.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -namespace = oslo.middleware.cors |