diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-01-11 10:34:28 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-01-11 10:34:28 +0100 |
| commit | b11fbe9b005d98dbab0d4088624927f5f5210717 (patch) | |
| tree | 3984c5896ec224f06b49cac73c18009d5ba50f36 /doc | |
| parent | 15b81abbd23f033fc9e35a7d49b8f65d2ae76586 (diff) | |
| parent | 1e746ce1ef027aa2549a8fba2904f3797eff0702 (diff) | |
Merge trunk
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/conf.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 368a686c3..996dfb0a7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -61,8 +61,9 @@ copyright = u'2010, United States Government as represented by the Administrator # built documents. # from nova import version as nova_version +#import nova.version # The full version, including alpha/beta/rc tags. -release = nova_version.version() +release = nova_version.version_string() # The short X.Y version. version = nova_version.canonical_version_string() |