[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2
sandro.tosi
python-checkins at python.org
Fri Aug 19 18:47:39 CEST 2011
http://hg.python.org/cpython/rev/4a2f72d74194
changeset: 71970:4a2f72d74194
parent: 71967:47176e8d7060
parent: 71969:f2d7d447609e
user: Sandro Tosi <sandro.tosi at gmail.com>
date: Fri Aug 19 18:40:56 2011 +0200
summary:
merge with 3.2
files:
Doc/library/time.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -509,6 +509,6 @@
preferred hour/minute offset is not supported by all ANSI C libraries. Also, a
strict reading of the original 1982 :rfc:`822` standard calls for a two-digit
year (%y rather than %Y), but practice moved to 4-digit years long before the
- year 2000. The 4-digit year has been mandated by :rfc:`2822`, which obsoletes
- :rfc:`822`.
+ year 2000. After that, :rfc:`822` became obsolete and the 4-digit year has
+ been first recommended by :rfc:`1123` and then mandated by :rfc:`2822`.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list