openstack/oslo.middleware
Code Issues Proposed changes

Revert "work around doc build error"

Browse Source 
This reverts commit bb8dbeb3a3.

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>
This commit is contained in:
Doug Hellmann 2016-02-24 12:21:41 -05:00
parent bb8dbeb3a3
commit 67bf9d274c
4 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -50,4 +50,3 @@ ChangeLog
# Editors # Editors
*~ *~
.*.swp .*.swp
/doc/source/sample.config

8
doc/source/conf.py
View File

@ -25,17 +25,9 @@ extensions = [
#'sphinx.ext.intersphinx', #'sphinx.ext.intersphinx',
'oslosphinx', 'oslosphinx',
'oslo_config.sphinxext', 'oslo_config.sphinxext',
'oslo_config.sphinxconfiggen',
'stevedore.sphinxext', '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 # autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles. # text edit cycles.
# execute "export SPHINX_DEBUG=1" in your terminal to disable # execute "export SPHINX_DEBUG=1" in your terminal to disable

9
doc/source/cors.rst
View File

@ -125,14 +125,7 @@ configuration, this may be done as follows.::
Configuration Options Configuration Options
--------------------- ---------------------
.. NOTE(dhellmann): An issue with the oslo.config sphinx integration .. show-options:: oslo.middleware.cors
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
Module Documentation Module Documentation
-------------------- --------------------

2
doc/source/cors_config_file.cfg
View File

@ -1,2 +0,0 @@
[DEFAULT]
namespace = oslo.middleware.cors