changeset: 94273:52a06812d5da parent: 94270:a858cde113f2 parent: 94272:3a9b1e5fe179 user: R David Murray date: Sun Jan 25 15:47:06 2015 -0500 files: Doc/library/time.rst description: Merge: #23215: note that time.sleep affects the current thread only. diff -r a858cde113f2 -r 52a06812d5da Doc/library/time.rst --- a/Doc/library/time.rst Sat Jan 24 19:26:18 2015 -0800 +++ b/Doc/library/time.rst Sun Jan 25 15:47:06 2015 -0500 @@ -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])