[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[andrew.kuchling]

http://hg.python.org/cpython/rev/5073fa30f226
changeset:   87067:5073fa30f226
parent:      87065:3ff7602ee543
parent:      87066:06f10ba16aa3
user:        Andrew Kuchling <amk at amk.ca>
date:        Tue Nov 12 10:03:20 2013 -0500
summary:
  Merge from 3.3

files:
  Doc/library/gettext.rst |  4 ++--
  Doc/library/pickle.rst  |  2 +-
  Doc/library/smtpd.rst   |  2 +-
  3 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
--- a/Doc/library/gettext.rst
+++ b/Doc/library/gettext.rst
@@ -3,8 +3,8 @@
 
 .. module:: gettext
    :synopsis: Multilingual internationalization services.
-.. moduleauthor:: Barry A. Warsaw <barry at zope.com>
-.. sectionauthor:: Barry A. Warsaw <barry at zope.com>
+.. moduleauthor:: Barry A. Warsaw <barry at python.org>
+.. sectionauthor:: Barry A. Warsaw <barry at python.org>
 
 **Source code:** :source:`Lib/gettext.py`
 
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -12,7 +12,7 @@
 .. module:: pickle
    :synopsis: Convert Python objects to streams of bytes and back.
 .. sectionauthor:: Jim Kerr <jbkerr at sr.hp.com>.
-.. sectionauthor:: Barry Warsaw <barry at zope.com>
+.. sectionauthor:: Barry Warsaw <barry at python.org>
 
 
 The :mod:`pickle` module implements a fundamental, but powerful algorithm for
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -4,7 +4,7 @@
 .. module:: smtpd
    :synopsis: A SMTP server implementation in Python.
 
-.. moduleauthor:: Barry Warsaw <barry at zope.com>
+.. moduleauthor:: Barry Warsaw <barry at python.org>
 .. sectionauthor:: Moshe Zadka <moshez at moshez.org>
 
 **Source code:** :source:`Lib/smtpd.py`

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