diff options
author | Larry Hastings <larry@hastings.org> | 2014-03-15 21:13:56 -0700 |
---|---|---|
committer | Larry Hastings <larry@hastings.org> | 2014-03-15 21:13:56 -0700 |
commit | 3732ed24145c1ac77e99bcf85bccda3af095e696 (patch) | |
tree | 432a243f5f4d9720ec0cc202ee969f6175e450b7 /Doc/conf.py | |
parent | b6b6a6d587d267cbad490232d08faebd30fdb7e2 (diff) | |
download | cpython-git-3732ed24145c1ac77e99bcf85bccda3af095e696.tar.gz |
Merge in all documentation changes since branching 3.4.0rc1.
Diffstat (limited to 'Doc/conf.py')
-rw-r--r-- | Doc/conf.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/conf.py b/Doc/conf.py index 5b63cad028..c0ed8c62cd 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -61,6 +61,8 @@ add_module_names = True # By default, highlight as Python 3. highlight_language = 'python3' +needs_sphinx = '1.1' + # Options for HTML output # ----------------------- @@ -118,11 +120,11 @@ _stdauthor = r'Guido van Rossum\\Fred L. Drake, Jr., editor' latex_documents = [ ('c-api/index', 'c-api.tex', 'The Python/C API', _stdauthor, 'manual'), - ('distutils/index', 'distutils.tex', + ('distributing/index', 'distributing.tex', 'Distributing Python Modules', _stdauthor, 'manual'), ('extending/index', 'extending.tex', 'Extending and Embedding Python', _stdauthor, 'manual'), - ('install/index', 'install.tex', + ('installing/index', 'installing.tex', 'Installing Python Modules', _stdauthor, 'manual'), ('library/index', 'library.tex', 'The Python Library Reference', _stdauthor, 'manual'), |