summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-01-07 15:17:03 +0100
committerSoren Hansen <soren@linux2go.dk>2011-01-07 15:17:03 +0100
commit8b3925e4d4b97dc28bfc903483ec4793fb38fed5 (patch)
tree06230d55ca5cbbaf6bf38e809e7fd63c3c463b1b /doc
parent9b35abf29438600ff8a8a91226000e7ea11ca534 (diff)
downloadnova-8b3925e4d4b97dc28bfc903483ec4793fb38fed5.tar.gz
nova-8b3925e4d4b97dc28bfc903483ec4793fb38fed5.tar.xz
nova-8b3925e4d4b97dc28bfc903483ec4793fb38fed5.zip
Less code generation.
Diffstat (limited to 'doc')
-rw-r--r--doc/source/conf.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 61b3749d0..20e9c88af 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -60,12 +60,11 @@ copyright = u'2010, United States Government as represented by the Administrator
# |version| and |release|, also used in various other places throughout the
# built documents.
#
-import re
from nova import version as nova_version
# The full version, including alpha/beta/rc tags.
-release = nova_version.string()
+release = nova_version.version()
# The short X.Y version.
-version = re.sub(r'-dev$', '', nova_version.string())
+version = nova_version.canonical_version()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.