[Python-checkins] cpython (3.4): #20974: Update version table in email intro.

Sat Sep 27 21:13:52 CEST 2014

https://hg.python.org/cpython/rev/2eea52c287b7
changeset: 92598:2eea52c287b7
branch: 3.4
parent: 92596:54987723de99
user: R David Murray <rdmurray at bitdance.com>
date: Sat Sep 27 14:59:36 2014 -0400
summary:
 #20974: Update version table in email intro.
Note that the email version string in 3.3 and 3.4 is inaccurate, since it
still exists but wasn't updated while the code was.
files:
 Doc/library/email.rst | 10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Doc/library/email.rst b/Doc/library/email.rst
--- a/Doc/library/email.rst
+++ b/Doc/library/email.rst
@@ -91,15 +91,19 @@
 +---------------+------------------------------+-----------------------+
 | :const:`2.5` | Python 2.2.2+ and Python 2.3 | Python 2.1 to 2.5 |
 +---------------+------------------------------+-----------------------+
-| :const:`3.0` | Python 2.4 | Python 2.3 to 2.5 |
+| :const:`3.0` | Python 2.4 and Python 2.5 | Python 2.3 to 2.6 |
 +---------------+------------------------------+-----------------------+
-| :const:`4.0` | Python 2.5 | Python 2.3 to 2.5 |
+| :const:`4.0` | Python 2.5 to Python 2.7 | Python 2.3 to 2.7 |
 +---------------+------------------------------+-----------------------+
 | :const:`5.0` | Python 3.0 and Python 3.1 | Python 3.0 to 3.2 |
 +---------------+------------------------------+-----------------------+
-| :const:`5.1` | Python 3.2 | Python 3.0 to 3.2 |
+| :const:`5.1` | Python 3.2 | Python 3.2 |
 +---------------+------------------------------+-----------------------+
 
+After Version 5.1 (Python 3.2), the email package no longer has a version that
+is separate from the Python version. (See the :ref:`whatsnew-index` documents
+for the respective Python versions for details on changes.)
+
 Here are the major differences between :mod:`email` version 5.1 and
 version 5.0:
 
-- 
Repository URL: https://hg.python.org/cpython
