From 705fec6552d249b6542109c29ed08ef06d6a75f3 Mon Sep 17 00:00:00 2001 From: Ken Pepple Date: Sat, 8 Jan 2011 17:40:06 -0800 Subject: [PATCH 1/3] fixed doc make process for new nova version (rev530) machanism --- doc/source/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 368a686c3..d09984b19 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -60,11 +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. # -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() +version = nova,version.canonical_version_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 30a5c9c80aee3333866e74958972bec5c4bc4d79 Mon Sep 17 00:00:00 2001 From: Ken Pepple Date: Sat, 8 Jan 2011 17:46:22 -0800 Subject: [PATCH 2/3] typo correction --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index d09984b19..34c4ec288 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -64,7 +64,7 @@ import nova.version # The full version, including alpha/beta/rc tags. release = nova.version.version_string() # The short X.Y version. -version = nova,version.canonical_version_string() +version = nova.version.canonical_version_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From ff81d66dc070d0e8df3957f93bee0e802c233758 Mon Sep 17 00:00:00 2001 From: Ken Pepple Date: Sun, 9 Jan 2011 09:25:27 -0800 Subject: [PATCH 3/3] added myself to authors and fixed typo to follow standard --- doc/source/conf.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 34c4ec288..996dfb0a7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -60,11 +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. # -import nova.version +from nova import version as nova_version +#import nova.version # The full version, including alpha/beta/rc tags. -release = nova.version.version_string() +release = nova_version.version_string() # The short X.Y version. -version = nova.version.canonical_version_string() +version = nova_version.canonical_version_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.