summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/thwait.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ba6c90512..4ab3fe8596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 29 18:39:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/thwait.rb (ThreadsWait#join): refined rdoc again.
+ [ruby-core:29863] [ruby-dev:41092]
+
Thu Apr 29 14:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby: use more descriptive assertions.
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 7ac033d30d..963ff4d1b6 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -74,8 +74,8 @@ class ThreadsWait
end
#
- # Waits for specified threads to terminate, and returns when any
- # thread terminated.
+ # Waits for specified threads to terminate, and returns when one of
+ # the threads terminated.
#
def join(*threads)
join_nowait(*threads)