summaryrefslogtreecommitdiffstats
path: root/Doc/conf.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 06:59:03 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 06:59:03 (GMT)
commit1cf8a0aeca85f5a48d8b43fd8e5cd1be3ac8f77a (patch)
tree29f97a13ac2448bad0c12d102bda006127172164 /Doc/conf.py
parent796fe2c934b585de77bd5444f54d2ffe08a0633d (diff)
parent3fdea95307966b5b1e5e6b6bbc453e8fb6bac4b6 (diff)
downloadcpython-1cf8a0aeca85f5a48d8b43fd8e5cd1be3ac8f77a.zip
cpython-1cf8a0aeca85f5a48d8b43fd8e5cd1be3ac8f77a.tar.gz
cpython-1cf8a0aeca85f5a48d8b43fd8e5cd1be3ac8f77a.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/conf.py')
-rw-r--r--Doc/conf.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/Doc/conf.py b/Doc/conf.py
index d663d82..59d9cfa 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -20,13 +20,6 @@ templates_path = ['tools']
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 @@ today = ''
# 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'