From 8b3925e4d4b97dc28bfc903483ec4793fb38fed5 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Fri, 7 Jan 2011 15:17:03 +0100
Subject: Less code generation.

---
 doc/source/conf.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'doc')

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.
-- 
cgit