[Python-checkins] cpython (merge 3.4 -> default): Merge: #23215: note that time.sleep affects the current thread only.

[r.david.murray]

https://hg.python.org/cpython/rev/52a06812d5da
changeset:   94273:52a06812d5da
parent:      94270:a858cde113f2
parent:      94272:3a9b1e5fe179
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Jan 25 15:47:06 2015 -0500
summary:
  Merge: #23215: note that time.sleep affects the current thread only.

files:
  Doc/library/time.rst |  13 +++++++------
  1 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Doc/library/time.rst b/Doc/library/time.rst
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -342,12 +342,13 @@
 
 .. function:: sleep(secs)
 
-   Suspend execution for the given number of seconds.  The argument may be a
-   floating point number to indicate a more precise sleep time. The actual
-   suspension time may be less than that requested because any caught signal will
-   terminate the :func:`sleep` following execution of that signal's catching
-   routine.  Also, the suspension time may be longer than requested by an arbitrary
-   amount because of the scheduling of other activity in the system.
+   Suspend execution of the calling thread for the given number of seconds.
+   The argument may be a floating point number to indicate a more precise sleep
+   time. The actual suspension time may be less than that requested because any
+   caught signal will terminate the :func:`sleep` following execution of that
+   signal's catching routine.  Also, the suspension time may be longer than
+   requested by an arbitrary amount because of the scheduling of other activity
+   in the system.
 
 
 .. function:: strftime(format[, t])

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