summaryrefslogtreecommitdiffstats
path: root/doc/conf.py
diff options
context:
space:
mode:
authorFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
committerFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
commit875aefd9beb9e7fd464348c0e0fa42896dc329ff (patch)
tree6c9920648f7c56a9a5854c1dafa474d8e8139508 /doc/conf.py
parentf5792d907e357c90624ec110d908d42b94296a12 (diff)
parent71bb583ac04ff1c52e03d69a91bbb508783566f8 (diff)
downloadbcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.gz
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.bz2
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/conf.py')
-rw-r--r--doc/conf.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py
index e11cc4ca8..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'