diff options
| author | Georg Brandl <georg@python.org> | 2014-10-02 06:27:11 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-02 06:27:11 (GMT) |
| commit | 60db5137bca8441ff145b77740178b5cd07d08b4 (patch) | |
| tree | 48afe34829aafdda42da085a2986e30e824abb09 | |
| parent | 55f763426b894dfd05af3f414f609ef069abd794 (diff) | |
| parent | ea7ec2b48115c1b70d4472015703c56634a54edf (diff) | |
| download | cpython-60db5137bca8441ff145b77740178b5cd07d08b4.zip cpython-60db5137bca8441ff145b77740178b5cd07d08b4.tar.gz cpython-60db5137bca8441ff145b77740178b5cd07d08b4.tar.bz2 | |
merge with 3.4
| -rw-r--r-- | Doc/conf.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Doc/conf.py b/Doc/conf.py index 3bd82b1..d663d82 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -38,13 +38,6 @@ today = '' # 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 @@ add_module_names = True # By default, highlight as Python 3. highlight_language = 'python3' +# Require Sphinx 1.2 for build. needs_sphinx = '1.2' |