diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 0e220d6..c534adf 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -343,10 +343,9 @@
 
    .. 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 fc0e17d..d9185e2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -820,6 +820,7 @@
 Sam Rushing
 Mark Russell
 Nick Russo
+Patrick Sabin
 Sébastien Sablé
 Hajime Saitou
 George Sakkis