[Python-checkins] cpython (merge default -> default): Merge heads

[andrew.svetlov]

http://hg.python.org/cpython/rev/a213cef1396a
changeset:   79459:a213cef1396a
parent:      79456:b21288c1ec68
parent:      79458:d32b4503358b
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Oct 04 19:55:04 2012 +0300
summary:
  Merge heads

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
@@ -557,7 +557,7 @@
    :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()

-- 
Repository URL: http://hg.python.org/cpython