Fix conf.py for Sphinx 1.0.

diff --git a/Doc/conf.py b/Doc/conf.py
index b514bfff5ccc58aa9cef6d530e162cda0274b7aa..b6d212d3ca52d28a1aeca6fbb4abe66a873599b4 100644 (file)
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -63,6 +63,9 @@ add_module_names = True
 # Options for HTML output
 # -----------------------
 
+html_theme = 'default'
+html_theme_options = {'collapsiblesidebar': True}
+
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 html_last_updated_fmt = '%b %d, %Y'
@@ -83,7 +86,7 @@ html_additional_pages = {
 }
 
 # Output an OpenSearch description file.
-html_use_opensearch = 'http://docs.python.org/dev'
+html_use_opensearch = 'http://docs.python.org/'
 
 # Additional static files.
 html_static_path = ['tools/sphinxext/static']
@@ -112,8 +115,6 @@ latex_documents = [
      'The Python/C API', _stdauthor, 'manual'),
     ('distutils/index', 'distutils.tex',
      'Distributing Python Modules', _stdauthor, 'manual'),
-    ('documenting/index', 'documenting.tex',
-     'Documenting Python', 'Georg Brandl', 'manual'),
     ('extending/index', 'extending.tex',
      'Extending and Embedding Python', _stdauthor, 'manual'),
     ('install/index', 'install.tex',
@@ -151,7 +152,7 @@ latex_preamble = r'''
 latex_appendices = ['glossary', 'about', 'license', 'copyright']
 
 # Get LaTeX to handle Unicode correctly
-latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}'}
+latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''}
 
 # Options for the coverage checker
 # --------------------------------