From d29d1d1a9ef2cf08a64f5957aa3139dbc144c587 Mon Sep 17 00:00:00 2001
From: zhangyangyang <zhangyangyang@unionpay.com>
Date: Fri, 19 Jul 2019 17:20:42 +0800
Subject: [PATCH] Bump the openstackdocstheme extension to 1.20

Some options are now automatically configured by the version 1.20:
- project
- html_last_updated_fmt
- latex_engine
- latex_elements
- version
- release.

Change-Id: I3a5c7e115d0c4f52b015d0d55eb09c9836cd2fe7
---
 api-ref/source/conf.py      | 16 ----------------
 doc/source/conf.py          |  1 -
 releasenotes/source/conf.py | 26 --------------------------
 3 files changed, 43 deletions(-)

diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 53c90dd1b88f..23fd173a8128 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -22,8 +22,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from nova.version import version_info
-
 
 extensions = [
     'openstackdocstheme',
@@ -42,7 +40,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Compute API Reference'
 copyright = u'2010-present, OpenStack Foundation'
 
 # openstackdocstheme options
@@ -50,15 +47,6 @@ repository_name = 'openstack/nova'
 bug_project = 'nova'
 bug_tag = 'api-ref'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The full version, including alpha/beta/rc tags.
-release = version_info.release_string()
-# The short X.Y version.
-version = version_info.version_string()
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
@@ -75,10 +63,6 @@ html_theme_options = {
     "sidebar_mode": "toc",
 }
 
-# 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'
-
 # -- Options for LaTeX output -------------------------------------------------
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 43879c7ae064..ecfc6f5fb376 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -69,7 +69,6 @@ todo_include_todos = True
 master_doc = 'index'
 
 # General information about the project.
-project = u'nova'
 copyright = u'2010-present, OpenStack Foundation'
 
 # The name of the Pygments (syntax highlighting) style to use.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 9ea602a1921e..55d43481882d 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -41,22 +41,12 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Nova Release Notes'
 copyright = u'2015, Nova developers'
 # openstackdocstheme options
 repository_name = 'openstack/nova'
 bug_project = 'nova'
 bug_tag = ''
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# Release notes are version independent, no need to set version and release.
-version = ""
-# The full version, including alpha/beta/rc tags.
-release = ""
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
@@ -136,11 +126,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
@@ -184,17 +169,6 @@ htmlhelp_basename = 'NovaReleaseNotesdoc'
 
 # -- 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]).