From: Georg Brandl <georg@python.org>
Date: Tue, 27 Jul 2010 18:19:21 +0000 (+0000)
Subject: Update Sphinx to 1.0.1.
X-Git-Tag: v3.2a1~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4bf70686fab91dcc5603c11c36f77bd2131ff6ed;p=thirdparty%2FPython%2Fcpython.git

Update Sphinx to 1.0.1.
---

diff --git a/Doc/Makefile b/Doc/Makefile
index 2669d3d4318f..c20374fbe351 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -40,7 +40,7 @@ help:
 checkout:
 	@if [ ! -d tools/sphinx ]; then \
 	  echo "Checking out Sphinx..."; \
-	  svn checkout $(SVNROOT)/external/Sphinx-1.0/sphinx tools/sphinx; \
+	  svn checkout $(SVNROOT)/external/Sphinx-1.0.1/sphinx tools/sphinx; \
 	fi
 	@if [ ! -d tools/docutils ]; then \
 	  echo "Checking out Docutils..."; \
diff --git a/Doc/conf.py b/Doc/conf.py
index ea21f2129e3c..b19235428b48 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -152,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
 # --------------------------------