Fix man page builds

Since Sphinx 1.6 released, pbr's build_sphinx extension has been broken.
Specifically, pbr's [build_sphinx]/builders option is ignored. Luckily,
sphinx itself ipmlemented the feature but called it just 'builder'[1].
This patch fixes the config setting name and then cleans up a Sphinx
extension inclusion that is now automatically included.

[1] http://lists.openstack.org/pipermail/openstack-dev/2017-July/119396.html

Change-Id: I5da6a996ed442524ddb108a890df2d024ee07c4d
This commit is contained in:
Colleen Murphy 2017-08-06 16:05:03 +02:00
parent 70290e3116
commit e08e7ccad7
2 changed files with 1 additions and 2 deletions

View File

@ -46,7 +46,6 @@ sys.path.insert(0, os.path.abspath('./'))
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.autodoc',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.viewcode',
'oslo_config.sphinxconfiggen',

View File

@ -44,7 +44,7 @@ tag_date = 0
tag_svn_revision = 0
[build_sphinx]
builders = html,man
builder = html,man
all_files = 1
build-dir = doc/build
source-dir = doc/source