[Python-checkins] r62407 - in python/trunk/Doc: conf.py tools/sphinxext/indexcontent.html

[georg.brandl]

Author: georg.brandl
Date: Sat Apr 19 23:28:38 2008
New Revision: 62407

Log:
Update template for newest Sphinx.


Modified:
   python/trunk/Doc/conf.py
   python/trunk/Doc/tools/sphinxext/indexcontent.html

Modified: python/trunk/Doc/conf.py
==============================================================================
--- python/trunk/Doc/conf.py	(original)
+++ python/trunk/Doc/conf.py	Sat Apr 19 23:28:38 2008
@@ -74,9 +74,6 @@
 # typographically correct entities.
 html_use_smartypants = True
 
-# Content template for the index page, filename relative to this file.
-html_index = 'indexcontent.html'
-
 # Custom sidebar templates, filenames relative to this file.
 html_sidebars = {
     'index': 'indexsidebar.html',
@@ -85,6 +82,7 @@
 # Additional templates that should be rendered to pages.
 html_additional_pages = {
     'download': 'download.html',
+    'index': 'indexcontent.html',
 }
 
 # Output file base name for HTML help builder.

Modified: python/trunk/Doc/tools/sphinxext/indexcontent.html
==============================================================================
--- python/trunk/Doc/tools/sphinxext/indexcontent.html	(original)
+++ python/trunk/Doc/tools/sphinxext/indexcontent.html	Sat Apr 19 23:28:38 2008
@@ -1,3 +1,5 @@
+{% extends "defindex.html" %}
+{% block tables %}
   <p><strong>Parts of the documentation:</strong></p>
   <table class="contentstable" align="center"><tr>
     <td width="50%">
@@ -54,3 +56,4 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("copyright") }}">Copyright</a></p>
     </td></tr>
   </table>
+{% endblock %}