[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3
terry.reedy
python-checkins at python.org
Wed Apr 3 18:50:53 CEST 2013
http://hg.python.org/cpython/rev/7a3a2009310f
changeset: 83086:7a3a2009310f
parent: 83083:816056d3f549
parent: 83085:a6d5fde72843
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Apr 03 12:45:47 2013 -0400
summary:
Merge with 3.3
files:
Doc/library/time.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -672,7 +672,7 @@
Module :mod:`locale`
Internationalization services. The locale setting affects the interpretation
- of many format specifiers in :func:`strftime` and :func:`strptime`.
+ of many format specifiers in :func:`strftime` and :func:`strptime`.
Module :mod:`calendar`
General calendar-related functions. :func:`timegm` is the inverse of
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list