summaryrefslogtreecommitdiffstats
path: root/Doc/library/locale.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-03-06 10:12:42 (GMT)
committerGeorg Brandl <georg@python.org>2011-03-06 10:12:42 (GMT)
commit891391bf68e66bc441d8c6fc49ab1cf657e394bd (patch)
treefe893ef7d37a765d7463184a9e5249d9c5720b3a /Doc/library/locale.rst
parent13039c87f14aeed325bcb5fadd202922a614957b (diff)
parent1d0a0f50606835198b0e1935a9761f3c95fef350 (diff)
downloadcpython-891391bf68e66bc441d8c6fc49ab1cf657e394bd.zip
cpython-891391bf68e66bc441d8c6fc49ab1cf657e394bd.tar.gz
cpython-891391bf68e66bc441d8c6fc49ab1cf657e394bd.tar.bz2
Merge doc fixes.
Diffstat (limited to 'Doc/library/locale.rst')
-rw-r--r--Doc/library/locale.rst11
1 files changed, 8 insertions, 3 deletions
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
index e5f5f84..dd6f954 100644
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -161,7 +161,7 @@ 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
- represent time and date in a locale-specific way.
+ represent date and time in a locale-specific way.
.. data:: D_FMT
@@ -246,12 +246,17 @@ The :mod:`locale` module defines the following exception and functions:
.. data:: ERA_D_T_FMT
- Get a format string for :func:`strftime` to represent dates and times in a
+ Get a format string for :func:`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 time in a
+ Get a format string for :func:`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
locale-specific era-based way.
.. data:: ALT_DIGITS