Merge "Minor cleanup on conf.py files"

This commit is contained in:
Jenkins 2017-07-18 05:44:07 +00:00 committed by Gerrit Code Review
commit c5dcfba0dd
2 changed files with 1 additions and 17 deletions

View File

@ -10,9 +10,6 @@
# implied. # implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Zaqar documentation build configuration file, created by
# sphinx-quickstart on Sat May 1 15:17:47 2010.
# #
# This file is execfile()d with the current directory set # This file is execfile()d with the current directory set
# to its containing dir. # to its containing dir.
@ -52,16 +49,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

@ -11,9 +11,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Zaqar Release Notes documentation build configuration file, created by
# sphinx-quickstart on Tue Nov 4 13:44:05 2015.
#
# This file is execfile()d with the current directory set to its # This file is execfile()d with the current directory set to its
# containing dir. # containing dir.
# #
@ -140,7 +137,7 @@ html_theme = 'openstackdocs'
# Add any paths that contain custom static files (such as style sheets) here, # Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files, # relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css". # so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static'] # html_static_path = ['_static']
# Add any extra paths that contain custom files (such as robots.txt or # Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied # .htaccess) here, relative to this directory. These files are copied