summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-10-04 19:55:04 +0300
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-10-04 19:55:04 +0300
commitdf5959371f050ccb8e36eef12e3d9ac2f48b8c58 (patch)
tree5d6a6a3dbc671bbba7bf6b6201a903531b4e5ab0
parent88f3b23fdb7ce5cdeac88e72778e8af51bf87f5c (diff)
parent759bc5812066afebc0f5cefc747d62a93a016083 (diff)
downloadcpython-git-df5959371f050ccb8e36eef12e3d9ac2f48b8c58.tar.gz
Merge heads
-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 799140c899..bad3f47685 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -557,7 +557,7 @@ The module defines the following functions and data items:
:exc:`TypeError` is raised.
.. versionchanged:: 3.3
- :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are avaliable on platforms
+ :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are available on platforms
with C library supporting the corresponding fields in ``struct tm``.
.. function:: time()