Merged revisions 83080 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83080 | brett.cannon | 2010-07-23 13:26:35 +0100 (Fri, 23 Jul 2010) | 5 lines

  Clarify the wording for threading.is_alive() to not suggest something is
  "roughly" done.

  Closes issue 9339. Thanks Brian Brazil for the patch.
........

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index f642111d2c2449dfa2b9751eac408f3074f1ae80..68d0304fae9f046703f6d90a331cbd4bf8f680ab 100644 (file)
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -299,8 +299,8 @@ impossible to detect the termination of alien threads.
 
       Return whether the thread is alive.
 
-      Roughly, a thread is alive from the moment the :meth:`start` method
-      returns until its :meth:`run` method terminates. The module function
+      This method returns ``True`` just before the :meth:`run` method starts
+      until just after the :meth:`run` method terminates.  The module function
       :func:`.enumerate` returns a list of all alive threads.
 
    .. attribute:: daemon