diff options
| -rw-r--r-- | Doc/library/multiprocessing.rst | 7 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 0e220d6c35..c534adf97a 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -343,10 +343,9 @@ The :mod:`multiprocessing` package mostly replicates the API of the .. method:: join([timeout]) - Block the calling thread until the process whose :meth:`join` method is - called terminates or until the optional timeout occurs. - - If *timeout* is ``None`` then there is no timeout. + If the optional argument *timeout* is ``None`` (the default), the method + blocks until the process whose :meth:`join` method is called terminates. + If *timeout* is a positive number, it blocks at most *timeout* seconds. A process can be joined many times. @@ -820,6 +820,7 @@ Jeff Rush Sam Rushing Mark Russell Nick Russo +Patrick Sabin Sébastien Sablé Hajime Saitou George Sakkis |