summaryrefslogtreecommitdiff
path: root/doc/conf.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-07 21:41:03 +0100
committerGeorg Brandl <georg@python.org>2010-01-07 21:41:03 +0100
commitb1c937f0d9288a7033feb0feff05cc621667a008 (patch)
tree6bdd77acf8c3695f3cba5e0e80f13dfc1d8612cc /doc/conf.py
parent5e17487b7434576d9b8d838e98854d40530fd334 (diff)
parent75be813edc7d2323dc97b48b1f10ed7f353d6a11 (diff)
downloadsphinx-git-b1c937f0d9288a7033feb0feff05cc621667a008.tar.gz
merge with trunk (not working perfectly yet)
Diffstat (limited to 'doc/conf.py')
-rw-r--r--doc/conf.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py
index 279072d69..afa330681 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -18,6 +18,8 @@ source_suffix = '.rst'
# The master toctree document.
master_doc = 'contents'
+exclude_patterns = ['_build']
+
# General substitutions.
project = 'Sphinx'
copyright = '2007-2010, Georg Brandl'
@@ -50,7 +52,7 @@ html_last_updated_fmt = '%b %d, %Y'
html_index = 'index.html'
# Custom sidebar templates, maps page names to templates.
-html_sidebars = {'index': 'indexsidebar.html'}
+html_sidebars = {'index': ['indexsidebar.html', 'searchbox.html']}
# Additional templates that should be rendered to pages, maps page names to
# templates.