diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-04-03 16:35:25 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-04-03 16:35:25 (GMT) |
| commit | 670e1b7b1e8be7e2817cf74cd92dccae776a8164 (patch) | |
| tree | 47f3174a25f9f6d5920bd13fd0675231c2f88482 | |
| parent | eea1f5c2e448b6c4b95bf0b782bbe25a8cdd9aca (diff) | |
| parent | b5e2e7e93aebc9fe399263cdee121e1e72617163 (diff) | |
| download | cpython-670e1b7b1e8be7e2817cf74cd92dccae776a8164.zip cpython-670e1b7b1e8be7e2817cf74cd92dccae776a8164.tar.gz cpython-670e1b7b1e8be7e2817cf74cd92dccae776a8164.tar.bz2 | |
Merge with 3.3
| -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 d7d8230..d5f81ca 100644 --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -671,8 +671,8 @@ The module defines the following functions and data items: More object-oriented interface to dates and times. Module :mod:`locale` - Internationalization services. The locale settings can affect the return values - for some of the functions in the :mod:`time` module. + Internationalization services. The locale setting affects the interpretation + of many format specifiers in :func:`strftime` and :func:`strptime`. Module :mod:`calendar` General calendar-related functions. :func:`timegm` is the inverse of |