diff -r dc728ac66c3c Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst	Wed Apr 06 14:16:08 2011 +0800
+++ b/Doc/library/multiprocessing.rst	Wed Apr 06 16:59:26 2011 +0200
@@ -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.