Merge branch 'feature-store' into develop

[kamaki] / docs / conf.py

diff --git a/docs/conf.py b/docs/conf.py
index 3fab217..2dc22d5 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -7,7 +7,7 @@
 # dir.
 #
 # Note that not all possible configuration values are present in this
-# autogenerated file.
+# auto-generated file.
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
@@ -19,15 +19,14 @@
 from sys import path, stderr
 import os
 
-path.append('/home/saxtouri/src/synnefo/snf-common')
 try:
-    from synnefo import lib
-    lib
+    from objpool import http
+    http
 except ImportError:
-    stderr.write("`snf-common` package is required to build kamaki docs.\n")
-    exit()
+    stderr.write("`objpool` package is required to build kamaki docs.\n")
+    #exit()
 
-path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..'))
+path.insert(0, os.path.join(os.path.abspath(os.path.dirname(__file__)), '..'))
 
 # -- General configuration ---------------------------------------------------
 
@@ -52,7 +51,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Kamaki'
-copyright = u'2012, GRNet'
+copyright = u'2012, GRNET'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -61,7 +60,7 @@ copyright = u'2012, GRNet'
 # The short X.Y version.
 version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.1'
+release = '0.6.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -197,7 +196,7 @@ latex_elements = {
 # [howto/manual]).
 latex_documents = [
   ('index', 'Kamaki.tex', u'Kamaki Documentation',
-   u'GRNet', 'manual'),
+   u'GRNET', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -240,7 +239,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'Kamaki', u'Kamaki Documentation',
-   u'GRNet', 'Kamaki', 'One line description of project.',
+   u'GRNET', 'Kamaki', 'One line description of project.',
    'Miscellaneous'),
 ]