[Python-3000-checkins] r61352 - in python/branches/py3k: Doc/conf.py

[georg.brandl]

Author: georg.brandl
Date: Wed Mar 12 09:52:43 2008
New Revision: 61352

Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/conf.py
Log:
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.
........


Modified: python/branches/py3k/Doc/conf.py
==============================================================================
--- python/branches/py3k/Doc/conf.py	(original)
+++ python/branches/py3k/Doc/conf.py	Wed Mar 12 09:52:43 2008
@@ -14,6 +14,7 @@
 # ---------------------
 
 extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage']
+templates_path = ['tools/sphinxext']
 
 # General substitutions.
 project = 'Python'
@@ -74,16 +75,16 @@
 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.