diff --git a/conf.py b/conf.py index 3cb32e561..09f862307 100644 --- a/conf.py +++ b/conf.py @@ -50,7 +50,7 @@ source_suffix = '.rst' # master_doc = 'contents' # General information about the project. -project = u'Fuel for OpenStack' +project = u'Mirantis OpenStack' copyright = u'2013, Mirantis Inc.' # The version info for the project you're documenting, acts as replacement for @@ -58,10 +58,10 @@ copyright = u'2013, Mirantis Inc.' # built documents. # # The short X.Y version. -version = '3.2' +version = '3.2.1' # The full version, including alpha/beta/rc tags. -release = '3.2' +release = '3.2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -118,7 +118,7 @@ html_add_permalinks = None # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". # html_title = project + ' v' + release + ' | Documentation' -html_title = 'Fuel v' + release + ' for OpenStack | Documentation' +html_title = project + ' v' + release + ' | Documentation' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -231,7 +231,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'fuel', u'Fuel for OpenStack | Documentation', + ('index', 'fuel', u'Mirantis OpenStack | Documentation', [u'Mirantis'], 1) ] @@ -245,7 +245,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'fuel', u'Fuel for OpenStack | Documentation', + ('index', 'fuel', u'Mirantis OpenStack | Documentation', u'Mirantis Inc.', 'fuel', 'One line description of project.', 'Miscellaneous'), ] diff --git a/index.rst b/index.rst index 421f40912..d57d9adae 100644 --- a/index.rst +++ b/index.rst @@ -15,21 +15,21 @@ PDFs --------- The following Fuel documentation is available in PDF: -* `Pre-Installation Guide `_ +* `Pre-Installation Guide `_ Prerequisites and pre-installation steps that you must execute before installing Fuel. -* `Installation Guide `_ +* `Installation Guide `_ This document describes how to pre-configure your OpenStack environment and install the Fuel Master Node. -* `User Guide `_ +* `User Guide `_ This document describes how to deploy compute nodes for Fuel. -* `Reference Architecture `_ +* `Reference Architecture `_ A deep dive into the structure of the Fuel OpenStack environment, network considerations, and deployment options. @@ -37,7 +37,7 @@ The following Fuel documentation is available in PDF: * `Release Notes 3.2.1 `_ The Release Notes provide general information about new features, - fixed issues, and known limitations in Fuel 3.2.1. + fixed issues, and known limitations in Fuel |version|. Download Fuel --------------- diff --git a/pdf/conf.py b/pdf/conf.py index a106f670e..8a9c9ac11 100644 --- a/pdf/conf.py +++ b/pdf/conf.py @@ -50,7 +50,7 @@ source_suffix = '.rst' # master_doc = 'contents' # General information about the project. -project = u'Fuel for OpenStack' +project = u'Mirantis OpenStack' copyright = u'2013, Mirantis Inc.' # The version info for the project you're documenting, acts as replacement for @@ -58,10 +58,10 @@ copyright = u'2013, Mirantis Inc.' # built documents. # # The short X.Y version. -version = '3.2' +version = '3.2.1' # The full version, including alpha/beta/rc tags. -release = '3.2' +release = '3.2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -118,7 +118,7 @@ html_add_permalinks = None # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". # html_title = project + ' v' + release + ' | Documentation' -html_title = 'Fuel v' + release + ' for OpenStack | Documentation' +html_title = project + ' v' + release + ' | Documentation' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -231,7 +231,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'fuel', u'Fuel for OpenStack | Documentation', + ('index', 'fuel', u'Mirantis OpenStack | Documentation', [u'Mirantis'], 1) ] @@ -245,7 +245,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'fuel', u'Fuel for OpenStack | Documentation', + ('index', 'fuel', u'Mirantis OpenStack | Documentation', u'Mirantis Inc.', 'fuel', 'One line description of project.', 'Miscellaneous'), ] @@ -281,11 +281,11 @@ nwdiag_antialias = True extensions += ['rst2pdf.pdfbuilder'] pdf_documents = [ - ('pdf/pdf_user', u'Fuel-for-OpenStack-3.2-UserGuide', u'User Guide', + ('pdf/pdf_user', u'Fuel-for-OpenStack-3.2.1-UserGuide', u'User Guide', u'2013, Mirantis Inc.'), - ('pdf/pdf_install', u'Fuel-for-OpenStack-3.2-InstallGuide', u'Installation Guide', u'2013, Mirantis Inc.'), - ('pdf/pdf_reference', u'Fuel-for-OpenStack-3.2-ReferenceArchitecture', u'Reference Architecture', u'2013, Mirantis Inc.'), - ('pdf/pdf_preinstall', u'Fuel-for-OpenStack-3.2-Pre-InstallationGuide', u'Pre-Installation Guide', u'2013, Mirantis Inc.') + ('pdf/pdf_install', u'Fuel-for-OpenStack-3.2.1-InstallGuide', u'Installation Guide', u'2013, Mirantis Inc.'), + ('pdf/pdf_reference', u'Fuel-for-OpenStack-3.2.1-ReferenceArchitecture', u'Reference Architecture', u'2013, Mirantis Inc.'), + ('pdf/pdf_preinstall', u'Fuel-for-OpenStack-3.2.1-Pre-InstallationGuide', u'Pre-Installation Guide', u'2013, Mirantis Inc.') # (master_doc, project, project, copyright), ] pdf_stylesheets = ['letter', 'mirantis'] diff --git a/relnotes/conf.py b/relnotes/conf.py index 9613c964d..8366edb81 100644 --- a/relnotes/conf.py +++ b/relnotes/conf.py @@ -50,7 +50,7 @@ source_suffix = '.rst' master_doc = 'contents' # General information about the project. -project = u'Fuel for OpenStack' +project = u'Mirantis OpenStack' copyright = u'2013, Mirantis Inc.' # The version info for the project you're documenting, acts as replacement for @@ -118,7 +118,7 @@ html_add_permalinks = None # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". # html_title = project + ' v' + release + ' | Documentation' -html_title = 'Fuel v' + release + ' for OpenStack | Documentation' +html_title = 'Mirantis OpenStack' + 'v' + release + ' | Documentation' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -201,7 +201,7 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'fuel.tex', u'Fuel for OpenStack | Documentation', + ('index', 'fuel.tex', u'Mirantis OpenStack | Documentation', u'Mirantis Inc.', 'manual'), ] @@ -231,7 +231,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'fuel', u'Fuel for OpenStack | Documentation', + ('index', 'fuel', u'Mirantis OpenStack | Documentation', [u'Mirantis'], 1) ] @@ -245,7 +245,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'fuel', u'Fuel for OpenStack | Documentation', + ('index', 'fuel', u'Mirantis OpenStack | Documentation', u'Mirantis Inc.', 'fuel', 'One line description of project.', 'Miscellaneous'), ]