From 324df61eea3e4c107e419ea3c685eaea4da7fd5e Mon Sep 17 00:00:00 2001 From: zzak Date: Tue, 3 Sep 2013 05:49:45 +0000 Subject: [PATCH] * lib/thread.rb: [DOC] CV#wait typo by @avdi [Fixes GH-386] https://github.com/ruby/ruby/pull/386 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/thread.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f16d0ed64b..436011c061 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 3 14:48:25 2013 Zachary Scott + + * lib/thread.rb: [DOC] CV#wait typo by @avdi [Fixes GH-386] + https://github.com/ruby/ruby/pull/386 + Tue Sep 3 14:37:53 2013 Zachary Scott * error.c: [DOC] Update bug tracker url by @ScotterC [Fixes GH-390] diff --git a/lib/thread.rb b/lib/thread.rb index 0bc95a2594..597956c22e 100644 --- a/lib/thread.rb +++ b/lib/thread.rb @@ -60,7 +60,7 @@ class ConditionVariable # Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup. # # If +timeout+ is given, this method returns after +timeout+ seconds passed, - # even if no other thread doesn't signal. + # even if no other thread has signaled. # def wait(mutex, timeout=nil) Thread.handle_interrupt(StandardError => :never) do