summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/source/conf.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8f1b370cc..61b3749d0 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -60,10 +60,12 @@ copyright = u'2010, United States Government as represented by the Administrator
# |version| and |release|, also used in various other places throughout the
# built documents.
#
-# The short X.Y version.
-version = '2011.1'
+import re
+from nova import version as nova_version
# The full version, including alpha/beta/rc tags.
-release = '2011.1-prerelease'
+release = nova_version.string()
+# The short X.Y version.
+version = re.sub(r'-dev$', '', nova_version.string())
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.