From 21c4058102787cf24d4f21bbcfe38078754c940a Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 8 Jun 2010 07:08:15 +0000 Subject: 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 --- lib/thwait.rb | 3 ++- version.h | 2 +- 2 files changed, 3 insertions(+), 2 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) diff --git a/version.h b/version.h index ad3c54663c..8673ddae35 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-06-08" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20100608 -#define RUBY_PATCHLEVEL 280 +#define RUBY_PATCHLEVEL 281 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3