Merge "Clean up doc configuration"

doc/source/conf.py

@@ -87,8 +87,6 @@ policy_generator_config_file = (
     '../../tools/config/cinder-policy-generator.conf')
 sample_policy_basename = '_static/cinder'
 
-todo_include_todos = True
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = []
 
@@ -108,16 +106,6 @@ bug_tag = 'doc'
 project = u'Cinder'
 copyright = u'2010-present, OpenStack Foundation'
 
-# 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.
-#
-from cinder.version import version_info
-# The full version, including alpha/beta/rc tags.
-release = version_info.release_string()
-# The short X.Y version.
-version = version_info.version_string()
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None
@@ -128,12 +116,6 @@ version = version_info.version_string()
 # Else, today_fmt is used as the format for a strftime call.
 # today_fmt = '%B %d, %Y'
 
-# List of documents that shouldn't be included in the build.
-unused_docs = [
-    'api_ext/rst_extension_template',
-    'installer',
-]
-
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
 exclude_trees = []