summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-04-03 16:45:47 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-04-03 16:45:47 (GMT)
commitfd4bba1bf3c288add3009aad59c3ec8558dca9b4 (patch)
treeb87ee637896f04251eca76ca8925856652dca8ee
parent670e1b7b1e8be7e2817cf74cd92dccae776a8164 (diff)
parent41459a9b295db4f909d1890dc5882e78e7f5138e (diff)
downloadcpython-fd4bba1bf3c288add3009aad59c3ec8558dca9b4.zip
cpython-fd4bba1bf3c288add3009aad59c3ec8558dca9b4.tar.gz
cpython-fd4bba1bf3c288add3009aad59c3ec8558dca9b4.tar.bz2
Merge with 3.3
-rw-r--r--Doc/library/time.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index d5f81ca..1e21fb6 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -672,7 +672,7 @@ The module defines the following functions and data items:
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