Merge "Swap the saharaclient and savannaclient directories"

1 files changed, 11 insertions, 11 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9b55f48..d65da06 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,7 +25,7 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('../../savannaclient'))
+sys.path.insert(0, os.path.abspath('../../saharaclient'))
 sys.path.append(os.path.abspath('..'))
 sys.path.append(os.path.abspath('../bin'))
 
@@ -55,7 +55,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Savanna Client'
+project = u'Sahara Client'
 copyright = u'2013, OpenStack Foundation'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -63,10 +63,10 @@ copyright = u'2013, OpenStack Foundation'
 # built documents.
 #
 # Version info
-from savannaclient.version import version_info as savannaclient_version
-release = savannaclient_version.release_string()
+from saharaclient.version import version_info as saharaclient_version
+release = saharaclient_version.release_string()
 # The short X.Y version.
-version = savannaclient_version.version_string()
+version = saharaclient_version.version_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -122,7 +122,7 @@ if on_rtd:
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = 'Savanna Client'
+html_title = 'Sahara Client'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
@@ -189,7 +189,7 @@ html_sidebars = {
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'SavannaClientDoc'
+htmlhelp_basename = 'SaharaClientDoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -208,7 +208,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', 'savannaclientdoc.tex', u'Savanna Client',
+    ('index', 'saharaclientdoc.tex', u'Sahara Client',
      u'OpenStack Foundation', 'manual'),
 ]
 
@@ -238,7 +238,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'savannaclient', u'Savanna Client',
+    ('index', 'saharaclient', u'Sahara Client',
      [u'OpenStack Foundation'], 1)
 ]
 
@@ -252,8 +252,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'Savanna Client', u'Savanna Client',
-     u'OpenStack Foundation', 'Savanna Client', 'Savanna Client',
+    ('index', 'Sahara Client', u'Sahara Client',
+     u'OpenStack Foundation', 'Sahara Client', 'Sahara Client',
      'Miscellaneous'),
 ]