[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/8ab1a9d423d4
changeset:   92740:8ab1a9d423d4
parent:      92737:6d91c4f40ba1
parent:      92739:3da6d38d7bdd
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 02 08:27:11 2014 +0200
summary:
  merge with 3.4

files:
  Doc/conf.py |  8 +-------
  1 files changed, 1 insertions(+), 7 deletions(-)


diff --git a/Doc/conf.py b/Doc/conf.py
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -38,13 +38,6 @@
 # Else, today_fmt is used as the format for a strftime call.
 today_fmt = '%B %d, %Y'
 
-# List of files that shouldn't be included in the build.
-unused_docs = [
-    'maclib/scrap',
-    'library/xmllib',
-    'library/xml.etree',
-]
-
 # Ignore .rst in Sphinx its self.
 exclude_trees = ['tools/sphinx']
 
@@ -61,6 +54,7 @@
 # By default, highlight as Python 3.
 highlight_language = 'python3'
 
+# Require Sphinx 1.2 for build.
 needs_sphinx = '1.2'
 
 

-- 
Repository URL: https://hg.python.org/cpython