summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-15 01:56:27 +0000
committerGerrit Code Review <review@openstack.org>2017-03-15 01:56:27 +0000
commita2e3d60644aadb4ecb3d49dadbcd5d4c1dec2176 (patch)
tree7b82f07ea7e6c39bfd9f6794c513af0e92d4f7f7
parent04052686af1f2c437095f5a2aa210256e126e0d9 (diff)
parent126cad8dee7a4455901c5fb56a81cb17a473c2b0 (diff)
downloadkeystonemiddleware-a2e3d60644aadb4ecb3d49dadbcd5d4c1dec2176.tar.gz
Merge "Remove old comment referencing fixed bug"
-rw-r--r--doc/source/conf.py4
-rw-r--r--setup.cfg4
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'
]
diff --git a/setup.cfg b/setup.cfg
index dff4e89..96b3104 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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