diff options
author | Sandro Tosi <sandro.tosi@gmail.com> | 2012-04-28 09:19:59 (GMT) |
---|---|---|
committer | Sandro Tosi <sandro.tosi@gmail.com> | 2012-04-28 09:19:59 (GMT) |
commit | 4aff7ed3325a5a0375b09997bbb6bdb03352334e (patch) | |
tree | 6de1848411f16d31e55a6f1803d9444591dd1156 /Doc | |
parent | b11d91d969d9444b4df3e786c1dbba53da5b3ff0 (diff) | |
parent | 100b889ccd742022b4eaeee29f68e75bdcecdc3b (diff) | |
download | cpython-4aff7ed3325a5a0375b09997bbb6bdb03352334e.zip cpython-4aff7ed3325a5a0375b09997bbb6bdb03352334e.tar.gz cpython-4aff7ed3325a5a0375b09997bbb6bdb03352334e.tar.bz2 |
Issue #14448: merge with 3.2
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/datetime.rst | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 27197b8..b1f731a 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1599,11 +1599,18 @@ only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)). .. seealso:: `pytz <http://pypi.python.org/pypi/pytz/>`_ - The Standard Library has no :class:`tzinfo` instances except for UTC, but - it exists a third-party library which brings Olson timezone database to - Python: `pytz`. - - `pytz` contains up-to-date information and its usage is recommended. + The standard library has no :class:`tzinfo` instances except for UTC, but + there exists a third-party library which brings the *IANA timezone + database* (also known as the Olson database) to Python: *pytz*. + + *pytz* contains up-to-date information and its usage is recommended. + + `IANA timezone database <http://www.iana.org/time-zones>`_ + The Time Zone Database (often called tz or zoneinfo) contains code and + data that represent the history of local time for many representative + locations around the globe. It is updated periodically to reflect changes + made by political bodies to time zone boundaries, UTC offsets, and + daylight-saving rules. .. _datetime-timezone: |