[Python-checkins] cpython (merge 3.2 -> default): #13278: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/64b2efa5009f
changeset:   73158:64b2efa5009f
parent:      73154:8d85dda39663
parent:      73157:d1c2b62ff80c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Oct 28 12:33:27 2011 +0300
summary:
  #13278: merge with 3.2.

files:
  Doc/library/sched.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/sched.rst b/Doc/library/sched.rst
--- a/Doc/library/sched.rst
+++ b/Doc/library/sched.rst
@@ -95,7 +95,7 @@
 
 .. method:: scheduler.enter(delay, priority, action, argument)
 
-   Schedule an event for *delay* more time units. Other then the relative time, the
+   Schedule an event for *delay* more time units. Other than the relative time, the
    other arguments, the effect and the return value are the same as those for
    :meth:`enterabs`.
 

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