Issue #11784: Improve multiprocessing.Process.join() documentation. Patch by

Patrick Sabin.

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 0e220d6c35feb5ef09297d87314c51493ec9fea3..c534adf97ad21427982e4b251c12f3ec61f9cacb 100644 (file)
--- 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.
 

diff --git a/Misc/ACKS b/Misc/ACKS
index fc0e17da0731dc990a9b915103e6b9c1adcbad8f..d9185e2746cf8dce0c4b5e8df29b6e3205ece104 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -820,6 +820,7 @@ Jeff Rush
 Sam Rushing
 Mark Russell
 Nick Russo
+Patrick Sabin
 Sébastien Sablé
 Hajime Saitou
 George Sakkis