diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2012-06-02 16:22:31 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2012-06-02 16:22:31 (GMT) |
| commit | a894cbfa61392d88dff62bc60793000349e961ec (patch) | |
| tree | b83bfa1337079653d5e18884fd5c97ac41f95881 /Doc/library | |
| parent | f4b26ef250265982da3e85161a6d65e6f890f7d7 (diff) | |
| parent | 964f205a3411aab3824240c6cd9c68ebee3b5844 (diff) | |
| download | cpython-a894cbfa61392d88dff62bc60793000349e961ec.zip cpython-a894cbfa61392d88dff62bc60793000349e961ec.tar.gz cpython-a894cbfa61392d88dff62bc60793000349e961ec.tar.bz2 | |
merge with 3.2
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/locale.rst | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst index 3a49e98..45aba0a 100644 --- a/Doc/library/locale.rst +++ b/Doc/library/locale.rst @@ -160,22 +160,22 @@ The :mod:`locale` module defines the following exception and functions: .. data:: D_T_FMT - Get a string that can be used as a format string for :func:`strftime` to + Get a string that can be used as a format string for :func:`time.strftime` to represent date and time in a locale-specific way. .. data:: D_FMT - Get a string that can be used as a format string for :func:`strftime` to + Get a string that can be used as a format string for :func:`time.strftime` to represent a date in a locale-specific way. .. data:: T_FMT - Get a string that can be used as a format string for :func:`strftime` to + Get a string that can be used as a format string for :func:`time.strftime` to represent a time in a locale-specific way. .. data:: T_FMT_AMPM - Get a format string for :func:`strftime` to represent time in the am/pm + Get a format string for :func:`time.strftime` to represent time in the am/pm format. .. data:: DAY_1 ... DAY_7 @@ -239,24 +239,24 @@ The :mod:`locale` module defines the following exception and functions: then-emperor's reign. Normally it should not be necessary to use this value directly. Specifying - the ``E`` modifier in their format strings causes the :func:`strftime` + the ``E`` modifier in their format strings causes the :func:`time.strftime` function to use this information. The format of the returned string is not specified, and therefore you should not assume knowledge of it on different systems. .. data:: ERA_D_T_FMT - Get a format string for :func:`strftime` to represent date and time in a + Get a format string for :func:`time.strftime` to represent date and time in a locale-specific era-based way. .. data:: ERA_D_FMT - Get a format string for :func:`strftime` to represent a date in a + Get a format string for :func:`time.strftime` to represent a date in a locale-specific era-based way. .. data:: ERA_T_FMT - Get a format string for :func:`strftime` to represent a time in a + Get a format string for :func:`time.strftime` to represent a time in a locale-specific era-based way. .. data:: ALT_DIGITS |