summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpengyuesheng <pengyuesheng@gohighsec.com>2019-08-02 15:11:02 +0800
committerpengyuesheng <pengyuesheng@gohighsec.com>2019-08-02 15:11:07 +0800
commitf7d8334829c926636aef469ccff45230bdc1dc7d (patch)
treee49e23de513442702bcf9dca468d4cf15d780b4a
parent3183b3d2fc28e36efab7c19f13abe7146cf6b93b (diff)
downloadkeystonemiddleware-f7d8334829c926636aef469ccff45230bdc1dc7d.tar.gz
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: I161a3983e23b0ae50c232eb63ca78f8fd230e91e
-rw-r--r--doc/requirements.txt2
-rw-r--r--doc/source/conf.py14
-rw-r--r--releasenotes/source/conf.py17
3 files changed, 1 insertions, 32 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index bf40912..b805230 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,7 +4,7 @@
# For generating sphinx documentation
doc8>=0.6.0 # Apache-2.0
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.20.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
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,>=1.6.2;python_version>='3.4' # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9e8aaff..b97fbbc 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -71,18 +71,8 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = 'keystonemiddleware'
copyright = 'OpenStack Contributors'
-# 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.
-version_info = pbr.version.VersionInfo('keystonemiddleware')
-# The short X.Y version.
-version = version_info.version_string()
-# The full version, including alpha/beta/rc tags.
-release = version_info.release_string()
-
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None
@@ -163,10 +153,6 @@ html_theme = 'openstackdocs'
# 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 = '%Y-%m-%d %H:%M'
-
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index ea5e540..1be30eb 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -54,7 +54,6 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = u'keystonemiddleware Release Notes'
copyright = u'2015, Keystone Developers'
# Release notes do not need a version number in the title, they
@@ -143,11 +142,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
@@ -191,17 +185,6 @@ htmlhelp_basename = 'keystonemiddlewareReleaseNotesdoc'
# -- 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]).