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

[georg.brandl]

https://hg.python.org/cpython/rev/7bf99e314bb6
changeset:   93222:7bf99e314bb6
parent:      93220:ae0be3678394
parent:      93221:4800d4579dfe
user:        Georg Brandl <georg at python.org>
date:        Wed Oct 29 08:14:08 2014 +0100
summary:
  merge with 3.4

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


diff --git a/Doc/conf.py b/Doc/conf.py
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -90,7 +90,7 @@
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
-_stdauthor = r'Guido van Rossum\\Fred L. Drake, Jr., editor'
+_stdauthor = r'Guido van Rossum\\and the Python development team'
 latex_documents = [
     ('c-api/index', 'c-api.tex',
      'The Python/C API', _stdauthor, 'manual'),

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