[yum-commits] Branch 'yum-3_2_X' - 2 commits - docs/sphinxdocs Makefile

[James Antill]

 Makefile                |    2 +-
 docs/sphinxdocs/conf.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit aff9d948d0e51b524153fc8fc9686a3e26a1cf01
Author: Nick Jacek <njacek at redhat.com>
Date:   Fri Jul 29 09:43:54 2011 -0400

    Get the version number for the documentation from yum.__version__.

diff --git a/docs/sphinxdocs/conf.py b/docs/sphinxdocs/conf.py
index b9f2e1d..867d323 100644
--- a/docs/sphinxdocs/conf.py
+++ b/docs/sphinxdocs/conf.py
@@ -30,7 +30,7 @@ sys.path.insert(0, os.path.normpath(os.path.join(os.getcwd(), "../..")))
 sys.path.insert(1, os.getcwd())
 import rstgenerator
 rstgenerator.generateAll(sys.path[0], os.getcwd())
-
+import yum
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
@@ -60,9 +60,9 @@ copyright = None
 # built documents.
 #
 # The short X.Y version.
-version = '3.4'
+# version = 
 # The full version, including alpha/beta/rc tags.
-release = '3.4.2'
+release = yum.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
commit 7803ff59248815b254b8a6be7f569a8dfae6d7cf
Author: James Antill <james at and.org>
Date:   Thu Jul 28 17:26:23 2011 -0400

    Fix echo'd path to api docs.

diff --git a/Makefile b/Makefile
index f8212ec..fc04853 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ install:
 
 apidocs:
 	make -C docs/sphinxdocs html
-	echo "Docs are in: docs/sphinxdocs/_build/*"
+	echo "Docs are in: docs/sphinxdocs/_build/html/*"
 
 .PHONY: docs test