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.
........

diff --git a/Doc/conf.py b/Doc/conf.py
index 71bc6f7282cc6d33d5bda57b9d60dbb1c2637874..a984d804ca601bbd56d6bec1b0dba3f01a736c4e 100644 (file)
--- 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.