summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/lib/libthreading.tex7
1 files changed, 6 insertions, 1 deletions
diff --git a/Doc/lib/libthreading.tex b/Doc/lib/libthreading.tex
index 3526974..33839a4 100644
--- a/Doc/lib/libthreading.tex
+++ b/Doc/lib/libthreading.tex
@@ -594,7 +594,12 @@ unhandled exception -- or until the optional timeout occurs.
When the \var{timeout} argument is present and not \code{None}, it
should be a floating point number specifying a timeout for the
-operation in seconds (or fractions thereof).
+operation in seconds (or fractions thereof). As \method{join()} always
+returns \code{None}, you must call \method{isAlive()} to decide whether
+a timeout happened.
+
+When the \var{timeout} argument is not present or \code{None}, the
+operation will block until the thread terminates.
A thread can be \method{join()}ed many times.