diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-01-08 15:35:50 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-01-08 15:35:50 +0100 |
| commit | 325330840ebe87da8e5943735b8956c8dfc4d112 (patch) | |
| tree | 08e7ca119859b667889eba903f64b69506b8f8ae /doc/source | |
| parent | 19ffc1275814a6c00f6ff19dd0c03060143d097a (diff) | |
| parent | 3885195ba05ca5317975797760a0cf81b5e4c647 (diff) | |
Merge with trunk
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/conf.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 8f1b370cc..368a686c3 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -60,10 +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. # -# The short X.Y version. -version = '2011.1' +from nova import version as nova_version # The full version, including alpha/beta/rc tags. -release = '2011.1-prerelease' +release = nova_version.version() +# The short X.Y version. +version = nova_version.canonical_version_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |