diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-01-07 14:00:49 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-01-07 14:00:49 +0100 |
| commit | 9b35abf29438600ff8a8a91226000e7ea11ca534 (patch) | |
| tree | fc929a986ff2dfc8c38a4f20f29ce22d07d91857 /doc/source | |
| parent | ada65e007e4511f63efcbfa94e51d2d41af1d315 (diff) | |
| parent | 8cdfdd14a03e1356cda4fcbdfbcc528bc7f397bd (diff) | |
Merge version stuff
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/conf.py | 8 |
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. |