diff options
| author | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-01-11 16:17:49 +0300 |
|---|---|---|
| committer | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-01-11 16:17:49 +0300 |
| commit | af759efab2f3de57a03a54b9c10c9d606dd1b668 (patch) | |
| tree | b1b64f21b10f980b4421737a2caa73fbe71dee9d /doc/source | |
| parent | 1a6fba0ada49a464b372e681b83bac59d3a3a79a (diff) | |
| parent | 1e746ce1ef027aa2549a8fba2904f3797eff0702 (diff) | |
| download | nova-af759efab2f3de57a03a54b9c10c9d606dd1b668.tar.gz nova-af759efab2f3de57a03a54b9c10c9d606dd1b668.tar.xz nova-af759efab2f3de57a03a54b9c10c9d606dd1b668.zip | |
Trunk merge and conflcts resolved
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..996dfb0a7 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' +from nova import version as nova_version +#import nova.version # The full version, including alpha/beta/rc tags. -release = '2011.1-prerelease' +release = nova_version.version_string() +# 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. |