summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-03-12 08:52:43 (GMT)
committerGeorg Brandl <georg@python.org>2008-03-12 08:52:43 (GMT)
commit45832ea4082c6df50021dbeb9a157aad851fdeb8 (patch)
treeba896f47edd24dc6808eda527312036758b51f41
parentfe92d0b0817d083577499f17854779219daa1677 (diff)
downloadcpython-45832ea4082c6df50021dbeb9a157aad851fdeb8.zip
cpython-45832ea4082c6df50021dbeb9a157aad851fdeb8.tar.gz
cpython-45832ea4082c6df50021dbeb9a157aad851fdeb8.tar.bz2
Merged revisions 61330 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61330 | georg.brandl | 2008-03-09 19:18:30 +0100 (Sun, 09 Mar 2008) | 2 lines Update for newest Sphinx. ........
-rw-r--r--Doc/conf.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/conf.py b/Doc/conf.py
index 71bc6f7..a984d80 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -14,6 +14,7 @@ sys.path.append('tools/sphinxext')
# ---------------------
extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage']
+templates_path = ['tools/sphinxext']
# General substitutions.
project = 'Python'
@@ -74,16 +75,16 @@ html_last_updated_fmt = '%b %d, %Y'
html_use_smartypants = True
# Content template for the index page, filename relative to this file.
-html_index = 'tools/sphinxext/indexcontent.html'
+html_index = 'indexcontent.html'
# Custom sidebar templates, filenames relative to this file.
html_sidebars = {
- 'index': 'tools/sphinxext/indexsidebar.html',
+ 'index': 'indexsidebar.html',
}
# Additional templates that should be rendered to pages.
html_additional_pages = {
- 'download': 'tools/sphinxext/download.html',
+ 'download': 'download.html',
}
# Output file base name for HTML help builder.