From fd90bc6900d30c0b0009d6c20ab1f12a60967ac5 Mon Sep 17 00:00:00 2001
From: pengyuesheng <pengyuesheng@gohighsec.com>
Date: Wed, 31 Jul 2019 17:26:06 +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: Ifbb7aeb2a9e0963faefadeaaed8bc8b3738a9c78
---
 doc/requirements.txt        |  2 +-
 doc/source/conf.py          | 13 -------------
 releasenotes/source/conf.py |  5 -----
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 9939493..30e1fb1 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,4 +1,4 @@
-openstackdocstheme>=1.18.1  # Apache-2.0
+openstackdocstheme>=1.20.0  # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6c84aa8..38ee9ac 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -80,14 +80,12 @@ master_doc = 'index'
 exclude_trees = []
 
 # General information about the project.
-project = u'Cinder Library'
 copyright = u"2017, Cinder Developers"
 
 # openstackdocstheme options
 repository_name = 'openstack/cinderlib'
 bug_project = 'cinderlib'
 bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -218,17 +216,6 @@ htmlhelp_basename = 'cinderlibdoc'
 
 # -- 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]).
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 4bbe622..8f4e0eb 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -34,7 +34,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Cinderlib Release Notes'
 copyright = u'2017, Cinder Developers'
 
 # Release notes are unversioned, so we don't need to set version and release
@@ -47,10 +46,6 @@ release = ''
 # a list of builtin themes.
 html_theme = 'openstackdocs'
 
-# 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 openstackdocstheme -------------------------------------------
 
 repository_name = 'openstack/cinderlib'