diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-15 01:56:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-15 01:56:27 +0000 |
commit | a2e3d60644aadb4ecb3d49dadbcd5d4c1dec2176 (patch) | |
tree | 7b82f07ea7e6c39bfd9f6794c513af0e92d4f7f7 | |
parent | 04052686af1f2c437095f5a2aa210256e126e0d9 (diff) | |
parent | 126cad8dee7a4455901c5fb56a81cb17a473c2b0 (diff) | |
download | keystonemiddleware-a2e3d60644aadb4ecb3d49dadbcd5d4c1dec2176.tar.gz |
Merge "Remove old comment referencing fixed bug"
-rw-r--r-- | doc/source/conf.py | 4 | ||||
-rw-r--r-- | setup.cfg | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 71909b7..a6eb2c4 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -43,10 +43,6 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.intersphinx', - # NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and - # remove this Sphinx extension when - # https://launchpad.net/bugs/1260495 is fixed. - 'ext.apidoc', 'oslosphinx', 'oslo_config.sphinxconfiggen' ] @@ -45,6 +45,10 @@ source-dir = doc/source build-dir = doc/build all_files = 1 +[pbr] +autodoc_tree_index_modules = True +autodoc_tree_excludes = setup.py + [upload_sphinx] upload-dir = doc/build/html |