summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/thwait.rb3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a05cc21d2..9cd70f7cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 29 12:33:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/thwait.rb (ThreadsWait#join): refined rdoc. [ruby-core:29863]
+
Thu Apr 29 12:16:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): reject
diff --git a/lib/thwait.rb b/lib/thwait.rb
index e13ae074d5..7ac033d30d 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -74,7 +74,8 @@ class ThreadsWait
end
#
- # Waits for specified threads to terminate.
+ # Waits for specified threads to terminate, and returns when any
+ # thread terminated.
#
def join(*threads)
join_nowait(*threads)