summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-07-27 18:19:21 (GMT)
committerGeorg Brandl <georg@python.org>2010-07-27 18:19:21 (GMT)
commit4bf70686fab91dcc5603c11c36f77bd2131ff6ed (patch)
tree0d741613aecfa7e577c03f48a6bee4492cf5a4d6
parentc02cc2707a8ed58896511f7ee151b5509873afc3 (diff)
downloadcpython-4bf70686fab91dcc5603c11c36f77bd2131ff6ed.zip
cpython-4bf70686fab91dcc5603c11c36f77bd2131ff6ed.tar.gz
cpython-4bf70686fab91dcc5603c11c36f77bd2131ff6ed.tar.bz2
Update Sphinx to 1.0.1.
-rw-r--r--Doc/Makefile2
-rw-r--r--Doc/conf.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/Makefile b/Doc/Makefile
index 2669d3d..c20374f 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 ea21f21..b192354 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
# --------------------------------