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

[georg.brandl]

https://hg.python.org/cpython/rev/55c4ac3a8cd5
changeset:   93214:55c4ac3a8cd5
parent:      93211:c8ba6df39b25
parent:      93213:ac659091f11b
user:        Georg Brandl <georg at python.org>
date:        Wed Oct 29 07:59:03 2014 +0100
summary:
  merge with 3.4

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


diff --git a/Doc/conf.py b/Doc/conf.py
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -20,13 +20,6 @@
 project = 'Python'
 copyright = '1990-%s, Python Software Foundation' % time.strftime('%Y')
 
-# The default replacements for |version| and |release|.
-#
-# The short X.Y version.
-# version = '2.6'
-# The full version, including alpha/beta/rc tags.
-# release = '2.6a0'
-
 # We look for the Include/patchlevel.h file in the current Python source tree
 # and replace the values accordingly.
 import patchlevel
@@ -38,9 +31,6 @@
 # Else, today_fmt is used as the format for a strftime call.
 today_fmt = '%B %d, %Y'
 
-# Ignore .rst in Sphinx its self.
-exclude_trees = ['tools/sphinx']
-
 # Relative filename of the reference count data file.
 refcount_file = 'data/refcounts.dat'
 

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