summaryrefslogtreecommitdiffstats
path: root/doc/conf.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2010-12-08 21:38:29 -0600
committerNarayan Desai <desai@mcs.anl.gov>2010-12-08 21:38:29 -0600
commitdfcabfcbfc6970c526c80e6f688744966e532c66 (patch)
tree7994cc2d40fcb4bbc4e3c3a508d8f4c26a13ce30 /doc/conf.py
parent19dd6674fe58f3f83a5fa85d2f8ebacf2bfd5e13 (diff)
parentd08c7ba3ca269639edd8e7696558c74bc06fb487 (diff)
downloadbcfg2-dfcabfcbfc6970c526c80e6f688744966e532c66.tar.gz
bcfg2-dfcabfcbfc6970c526c80e6f688744966e532c66.tar.bz2
bcfg2-dfcabfcbfc6970c526c80e6f688744966e532c66.zip
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'doc/conf.py')
-rw-r--r--doc/conf.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/conf.py b/doc/conf.py
index e1d1a74b2..77ab6fd94 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -36,7 +36,8 @@ source_suffix = '.txt'
#source_encoding = 'utf-8'
# The master toctree document.
-master_doc = 'contents'
+#master_doc = 'contents'
+master_doc = 'index'
# General information about the project.
project = u'Bcfg2'
@@ -47,9 +48,9 @@ copyright = u'2009-%s, Narayan Desai' % time.strftime('%Y')
# built documents.
#
# The short X.Y version.
-version = '1.1'
+version = '1.2'
# The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.2.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -175,7 +176,7 @@ latex_font_size = '11pt'
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('contents', 'bcfg2.tex', u'Bcfg2 Documentation',
- u'Narayan Desai and Thorsten Lockert', 'manual', True),
+ u'Narayan Desai et al.', 'manual', True),
]
# The name of an image file (relative to this directory) to place at the top of