openstack/glance
Code Issues Proposed changes

Merge "doc: Explicitly set 'builders' option"

Browse Source
This commit is contained in:
Jenkins 2017-08-02 23:49:32 +00:00 committed by Gerrit Code Review
commit e7ceaebd49
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
doc/source/conf.py
View File

@ -47,13 +47,10 @@ sys.path = [
# Add any Sphinx extension module names here, as strings. They can be # Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.coverage', extensions = ['stevedore.sphinxext',
'sphinx.ext.ifconfig',
'sphinx.ext.graphviz',
'stevedore.sphinxext',
'oslo_config.sphinxext',
'sphinx.ext.autodoc', 'sphinx.ext.autodoc',
'sphinx.ext.viewcode', 'sphinx.ext.viewcode',
'oslo_config.sphinxext',
'oslo_config.sphinxconfiggen', 'oslo_config.sphinxconfiggen',
'openstackdocstheme', 'openstackdocstheme',
] ]
@ -126,9 +123,9 @@ exclude_patterns = [
# in other documents during the build but that should not be # in other documents during the build but that should not be
# included in the toctree themselves, so tell Sphinx to ignore # included in the toctree themselves, so tell Sphinx to ignore
# them when scanning for input files. # them when scanning for input files.
'man/footer.rst', 'cli/footer.txt',
'man/general_options.rst', 'cli/general_options.txt',
'man/openstack_options.rst', 'cli/openstack_options.txt',
] ]
# The reST default role (for this markup: `text`) to use for all documents. # The reST default role (for this markup: `text`) to use for all documents.
@ -157,25 +154,25 @@ modindex_common_prefix = ['glance.']
# List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual' # List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'
man_pages = [ man_pages = [
('man/glanceapi', 'glance-api', u'Glance API Server', ('cli/glanceapi', 'glance-api', u'Glance API Server',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glancecachecleaner', 'glance-cache-cleaner', u'Glance Cache Cleaner', ('cli/glancecachecleaner', 'glance-cache-cleaner', u'Glance Cache Cleaner',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glancecachemanage', 'glance-cache-manage', u'Glance Cache Manager', ('cli/glancecachemanage', 'glance-cache-manage', u'Glance Cache Manager',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glancecacheprefetcher', 'glance-cache-prefetcher', ('cli/glancecacheprefetcher', 'glance-cache-prefetcher',
u'Glance Cache Pre-fetcher', [u'OpenStack'], 1), u'Glance Cache Pre-fetcher', [u'OpenStack'], 1),
('man/glancecachepruner', 'glance-cache-pruner', u'Glance Cache Pruner', ('cli/glancecachepruner', 'glance-cache-pruner', u'Glance Cache Pruner',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glancecontrol', 'glance-control', u'Glance Daemon Control Helper ', ('cli/glancecontrol', 'glance-control', u'Glance Daemon Control Helper ',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glancemanage', 'glance-manage', u'Glance Management Utility', ('cli/glancemanage', 'glance-manage', u'Glance Management Utility',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glanceregistry', 'glance-registry', u'Glance Registry Server', ('cli/glanceregistry', 'glance-registry', u'Glance Registry Server',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glancereplicator', 'glance-replicator', u'Glance Replicator', ('cli/glancereplicator', 'glance-replicator', u'Glance Replicator',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/glancescrubber', 'glance-scrubber', u'Glance Scrubber Service', ('cli/glancescrubber', 'glance-scrubber', u'Glance Scrubber Service',
[u'OpenStack'], 1) [u'OpenStack'], 1)
] ]

1
setup.cfg
View File

@ -61,6 +61,7 @@ glance.flows.import =
ovf_process = glance.async.flows.ovf_process:get_flow ovf_process = glance.async.flows.ovf_process:get_flow
[build_sphinx] [build_sphinx]
builder = html man
all_files = 1 all_files = 1
build-dir = doc/build build-dir = doc/build
source-dir = doc/source source-dir = doc/source