summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/thread.rb2
2 files changed, 6 insertions, 1 deletions
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 <e@zzak.io>
+
+ * 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 <e@zzak.io>
* 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