Merge "Bump the openstackdocstheme extension to 1.20"

api-ref/source/conf.py

@@ -68,7 +68,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Octavia API Reference'
 copyright = u'2017-present, OpenStack Foundation'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -151,12 +150,6 @@ pygments_style = 'sphinx'
 # so a file named "default.css" will overwrite the builtin "default.css".
 # html_static_path = ['_static']
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-# Must set this variable to include year, month, day, hours, and minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
@@ -216,14 +209,6 @@ latex_documents = [
      u'OpenStack Foundation', 'manual'),
 ]
 
-latex_elements = {
-    # ...
-    # Additional stuff for the LaTeX preamble.
-    'preamble': latex_custom_template,
-}
-
-latex_engine = 'xelatex'
-
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
 # latex_logo = None

doc/requirements.txt

@@ -12,7 +12,7 @@ docutils>=0.11 # OSI-Approved Open Source, Public Domain
 sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
 sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
 graphviz!=0.5.0,>=0.4 # MIT License
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.20.0 # Apache-2.0
 sadisplay>=0.4.8 # BSD
 reno>=2.5.0 # Apache-2.0
 sphinx-feature-classification>=0.2.0 # Apache-2.0

doc/source/conf.py

@@ -84,7 +84,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Octavia'
 copyright = u'2014, OpenStack Octavia Team'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -162,10 +161,6 @@ html_theme_options = {'show_other_versions': True}
 
 html_static_path = ['_static']
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
@@ -217,17 +212,6 @@ latex_custom_template = r"""
 \usepackage{%s}
 """ % (openstack_logo, pdf_theme_path)
 
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    'preamble': latex_custom_template,
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
@@ -239,8 +223,6 @@ latex_documents = [(
     'manual'
 )]
 
-latex_engine = 'xelatex'
-
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
 # latex_logo = None

releasenotes/source/conf.py

@@ -60,17 +60,11 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Octavia Release Notes'
 copyright = u'2015, Octavia Developers'
 
 # Release notes are version independent.
 # The short X.Y version.
 
-# The full version, including alpha/beta/rc tags.
-release = ''
-# The short X.Y version.
-version = ''
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None
@@ -150,11 +144,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
@@ -198,17 +187,6 @@ htmlhelp_basename = 'OctaviaReleaseNotesdoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    # 'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author,
 #  documentclass [howto, manual, or own class]).