Merge "Changes conf.py for Sphinx build because oslosphinx now contains GA"

This commit is contained in:
Jenkins 2015-07-08 17:11:06 +00:00 committed by Gerrit Code Review
commit 31ccf583a7
2 changed files with 2 additions and 11 deletions

View File

@ -39,16 +39,6 @@ extensions = ['sphinx.ext.autodoc',
todo_include_todos = True todo_include_todos = True
# Add any paths that contain templates here, relative to this directory.
# Changing the path so that the Hudson build output contains GA code
# and the source docs do not contain the code so local, offline sphinx builds
# are "clean."
templates_path = []
if os.getenv('HUDSON_PUBLISH_DOCS'):
templates_path = ['_ga', '_templates']
else:
templates_path = ['_templates']
# The suffix of source filenames. # The suffix of source filenames.
source_suffix = '.rst' source_suffix = '.rst'

View File

@ -33,7 +33,8 @@ any specific prior release.
.. _`docs.openstack.org`: https://docs.openstack.org .. _`docs.openstack.org`: https://docs.openstack.org
Compute API References Compute API References
======================= ======================
* `v2.1 (CURRENT)`_ * `v2.1 (CURRENT)`_
* `v2 (SUPPORTED)`_ and `v2 extensions (SUPPORTED)`_ (Will be deprecated in * `v2 (SUPPORTED)`_ and `v2 extensions (SUPPORTED)`_ (Will be deprecated in