diff --git a/doc/requirements.txt b/doc/requirements.txt index 7e10d293..c9928539 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -openstackdocstheme>=1.18.1 # Apache-2.0 +openstackdocstheme>=1.20.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 reno>=2.5.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 9cae9988..8260ee75 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -13,8 +13,6 @@ import os -project = 'python-muranoclient' - # -- General configuration ---------------------------------------------------- # Add any Sphinx extension module names here, as strings. They can be @@ -64,11 +62,8 @@ repository_name = 'openstack/python-muranoclient' bug_project = 'python-muranoclient' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # Output file base name for HTML help builder. -htmlhelp_basename = '%sdoc' % project +htmlhelp_basename = 'python-muranoclientdoc' # Grouping the document tree into LaTeX files. List of tuples @@ -77,8 +72,8 @@ htmlhelp_basename = '%sdoc' % project latex_documents = [ ( 'index', - '%s.tex' % project, - u'%s Documentation' % project, + 'python-muranoclient.tex', + u'python-muranoclient Documentation', u'OpenStack Foundation', 'manual' ), diff --git a/lower-constraints.txt b/lower-constraints.txt index 1702818d..3afef453 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -39,7 +39,7 @@ munch==2.1.0 murano-pkg-check==0.3.0 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.18.1 +openstackdocstheme==1.20.0 openstacksdk==0.11.2 os-client-config==1.28.0 os-service-types==1.2.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 41fb7123..90c4937d 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -55,7 +55,6 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Murano Client Release Notes' copyright = u'2015, Murano Developers' # Release notes are version independent. @@ -123,9 +122,6 @@ repository_name = 'openstack/python-muranoclient' bug_project = 'python-muranoclient' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". # html_title = None @@ -199,17 +195,6 @@ htmlhelp_basename = 'MuranoClientReleaseNotesdoc' # -- 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]).