diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2011-08-19 16:40:56 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2011-08-19 16:40:56 (GMT) |
| commit | 8e35cf0770b9cecda2bd1e5a8e99ef8b333177a3 (patch) | |
| tree | 8e24597d9809138297082ed6ea96ea5ff8e0fd63 /Doc/library/time.rst | |
| parent | df7fc9dda7729d446d0a6ea48c4cea98ffa64cad (diff) | |
| parent | f693810f694f8672ceb6fb86ca4201344ae4ae43 (diff) | |
| download | cpython-8e35cf0770b9cecda2bd1e5a8e99ef8b333177a3.zip cpython-8e35cf0770b9cecda2bd1e5a8e99ef8b333177a3.tar.gz cpython-8e35cf0770b9cecda2bd1e5a8e99ef8b333177a3.tar.bz2 | |
merge with 3.2
Diffstat (limited to 'Doc/library/time.rst')
| -rw-r--r-- | Doc/library/time.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst index 24461b3..d95d83c 100644 --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -509,6 +509,6 @@ The module defines the following functions and data items: 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`. |