Merge "Prep for 0.2 release (0.2.rc1)"0.2.rc1

1 files changed, 15 insertions, 7 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index df1e9e5f..47025b6d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -15,10 +15,12 @@
 import os
 import sys
 
+import pbr.version
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # 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(os.path.join(os.path.dirname(__file__), '..', '..')))
 
 # -- General configuration ----------------------------------------------------
 
@@ -46,16 +48,18 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'OpenStack Command Line Client'
-copyright = u'2012, OpenStack'
+copyright = u'2012-2013 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.
 #
+version_info = pbr.version.VersionInfo('python-openstackclient')
+#
 # The short X.Y version.
-version = '0.1'
+version = version_info.version_string()
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = version_info.release_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -221,9 +225,13 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'openstackcommandlineclient',
-    u'OpenStack Command Line Client Documentation',
-     [u'OpenStack'], 1)
+    (
+        'man/openstack',
+        'openstack',
+        u'OpenStack Command Line Client',
+        [u'OpenStack contributors'],
+        1,
+    ),
 ]
 
 # If true, show URL addresses after external links.