summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-29 09:39:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-29 09:39:52 +0000
commitf88284b91ec7eedb88216f0aa9c55ca7d18cb67c (patch)
treef6eb9cc18ba56662d5adeb5c3c4fdccd1519e586
parentd610c8c686ac9345a47bc3019f58f6b270a7705c (diff)
* lib/thwait.rb (ThreadsWait#join): refined rdoc again.
[ruby-core:29863] [ruby-dev:41092] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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)