diff options
| author | Andrew Kuchling <amk@amk.ca> | 2013-11-12 15:03:20 (GMT) |
|---|---|---|
| committer | Andrew Kuchling <amk@amk.ca> | 2013-11-12 15:03:20 (GMT) |
| commit | 7150787b7ebbc1bf42e5da2da25f0b323076cdc1 (patch) | |
| tree | 6e2fa694aadf2aef3aab003cc595e50f748abebd /Doc | |
| parent | 01b1f878a07b9352f80891c4c55d25c22e041e4f (diff) | |
| parent | 587e970be60ec14c017d5bfef93275f6a6c8dbac (diff) | |
| download | cpython-7150787b7ebbc1bf42e5da2da25f0b323076cdc1.zip cpython-7150787b7ebbc1bf42e5da2da25f0b323076cdc1.tar.gz cpython-7150787b7ebbc1bf42e5da2da25f0b323076cdc1.tar.bz2 | |
Merge from 3.3
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/gettext.rst | 4 | ||||
| -rw-r--r-- | Doc/library/pickle.rst | 2 | ||||
| -rw-r--r-- | Doc/library/smtpd.rst | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst index 825311b..1efa54f 100644 --- 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@zope.com> -.. sectionauthor:: Barry A. Warsaw <barry@zope.com> +.. moduleauthor:: Barry A. Warsaw <barry@python.org> +.. sectionauthor:: Barry A. Warsaw <barry@python.org> **Source code:** :source:`Lib/gettext.py` diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index 3bdbcf9..9404a47 100644 --- 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@sr.hp.com>. -.. sectionauthor:: Barry Warsaw <barry@zope.com> +.. sectionauthor:: Barry Warsaw <barry@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 index fe7258a..3ebed06 100644 --- 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@zope.com> +.. moduleauthor:: Barry Warsaw <barry@python.org> .. sectionauthor:: Moshe Zadka <moshez@moshez.org> **Source code:** :source:`Lib/smtpd.py` |