← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to doc/source/conf.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-01-21 11:48:06 UTC
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20110121114806-v8fvnnl6az4m4ohv
Tags: upstream-2011.1~bzr597
Import upstream version 2011.1~bzr597

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/source/conf.py
60
60
# |version| and |release|, also used in various other places throughout the
61
61
# built documents.
62
62
#
 
63
from nova import version as nova_version
 
64
#import nova.version
 
65
# The full version, including alpha/beta/rc tags.
 
66
release = nova_version.version_string()
63
67
# The short X.Y version.
64
 
version = '2011.1'
65
 
# The full version, including alpha/beta/rc tags.
66
 
release = '2011.1-prerelease'
 
68
version = nova_version.canonical_version_string()
67
69
 
68
70
# The language for content autogenerated by Sphinx. Refer to documentation
69
71
# for a list of supported languages.