summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 07:08:15 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 07:08:15 +0000
commit21c4058102787cf24d4f21bbcfe38078754c940a (patch)
treef094879dc08a25c01ae95c6306d9ef06e621fc86 /lib
parent69ffece86c739e7dabc46a002e51319dab28d76c (diff)
merge revision(s) 27547:
* lib/thwait.rb (ThreadsWait#join): refined rdoc again. [ruby-core:29863] [ruby-dev:41092] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/thwait.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 95d294a85d..018f8c3cb7 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -101,7 +101,8 @@ class ThreadsWait
end
#
- # Waits for specified threads to terminate.
+ # Waits for specified threads to terminate, and returns when one of
+ # the threads terminated.
#
def join(*threads)
join_nowait(*threads)