1.0.3.45: added JOIN-THREAD

[sbcl.git] / doc / manual / threading.texinfo

diff --git a/doc/manual/threading.texinfo b/doc/manual/threading.texinfo
index 32f9ffe..759ab0f 100644 (file)
--- a/doc/manual/threading.texinfo
+++ b/doc/manual/threading.texinfo
@@ -9,8 +9,9 @@ multiprocessing on machines that have more than one CPU, but it does
 not allow Lisp control of the scheduler.  This is found in the
 SB-THREAD package.
 
-This requires x86/x86-64 and Linux kernel 2.6 or systems with NPTL
-backports.
+This requires Linux (2.6+ or systems with NPTL backports) running on the
+x86 or x86-64 architecture, or SunOS (Solaris) on the x86.  Support for
+threading on Darwin (Mac OS X) and FreeBSD on the x86 is experimental.
 
 @menu
 * Threading basics::            
@@ -32,6 +33,9 @@ backports.
 @include struct-sb-thread-thread.texinfo
 @include var-sb-thread-star-current-thread-star.texinfo
 @include fun-sb-thread-make-thread.texinfo
+@include fun-sb-thread-join-thread.texinfo
+@include condition-sb-thread-join-thread-error.texinfo
+@include fun-sb-thread-join-thread-error-thread.texinfo
 @include fun-sb-thread-thread-alive-p.texinfo
 @include fun-sb-thread-list-all-threads.texinfo
 @include condition-sb-thread-interrupt-thread-error.texinfo
@@ -91,7 +95,7 @@ if you want a bounded wait.
   (with-mutex (*a-mutex*)
     (format t "Thread ~A got the lock~%" *current-thread*)
     (sleep (random 5)))
-  (format t "Thread ~A dropped lock, dying now~%" *current-thread*)))
+  (format t "Thread ~A dropped lock, dying now~%" *current-thread*))
 
 (make-thread #'thread-fn)
 (make-thread #'thread-fn)