diff --git a/doc/source/conf.py b/doc/source/conf.py index c3cdb165..3a4cff98 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -23,7 +23,6 @@ sys.path.insert(0, os.path.abspath('../..')) extensions = [ 'sphinx.ext.autodoc', 'openstackdocstheme', - #'sphinx.ext.intersphinx', ] # autodoc generation is a bit aggressive and a nuisance when doing heavy @@ -37,7 +36,6 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'openstack' copyright = u'2017, OpenStack Developers' # openstackdocstheme options @@ -65,15 +63,15 @@ pygments_style = 'sphinx' html_theme = 'openstackdocs' # Output file base name for HTML help builder. -htmlhelp_basename = '%sdoc' % project +htmlhelp_basename = 'openstackdoc' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass # [howto/manual]). latex_documents = [ ('index', - '%s.tex' % project, - u'%s Documentation' % project, + 'openstack.tex', + u'openstack Documentation', u'OpenStack Developers', 'manual'), ] diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 66d6a9ed..770396a9 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -52,7 +52,6 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Neutron Tempest Plugin Release Notes' copyright = u'2017, Neutron Tempest Plugin Developers' # openstackdocstheme options @@ -60,16 +59,6 @@ repository_name = 'openstack/neutron-tempest-plugin' bug_project = 'neutron' 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. -# -# 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 @@ -196,17 +185,6 @@ htmlhelp_basename = 'NeutronTempestPluginReleaseNotesdoc' # -- 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]). diff --git a/test-requirements.txt b/test-requirements.txt index 275c4f67..8b251f65 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,6 +12,6 @@ sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testtools>=2.2.0 # MIT -openstackdocstheme>=1.18.1 # Apache-2.0 +openstackdocstheme>=1.20.0 # Apache-2.0 # releasenotes reno>=2.5.0 # Apache-2.0