[mapserver-commits] r10178 - trunk/docs

[svn at osgeo.org]

Author: hobu
Date: 2010-05-26 12:31:43 -0400 (Wed, 26 May 2010)
New Revision: 10178

Modified:
   trunk/docs/conf.py
Log:
use our custom sidebar for the main index page (sphinx 1.0+)

Modified: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py	2010-05-26 16:25:31 UTC (rev 10177)
+++ trunk/docs/conf.py	2010-05-26 16:31:43 UTC (rev 10178)
@@ -23,7 +23,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['labels']
+extensions = ['labels' ,'rst2pdf.pdfbuilder']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -32,7 +32,7 @@
 source_suffix = '.txt'
 
 # The encoding of source files.
-#source_encoding = 'utf-8'
+source_encoding = 'utf-8'
 
 # The master toctree document.
 master_doc = 'documentation'
@@ -125,8 +125,9 @@
 html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {"index":"indexsidebar.html"}
-
+html_sidebars = {
+    '**': ['globaltoc.html', 'sourcelink.html', 'searchbox.html'],
+"index":["indexsidebar.html",'searchbox.html']}
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 #html_additional_pages = {"index":'index.html'}