aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/timeout.rb3
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 483dad9bfc..070aab74b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 12 05:25:00 2012 Zachary Scott <zzak@ruby-lang.org>
+
+ * lib/timeout.rb (timeout):
+ Remove paragraph on wrong implementation detail.
+ [ruby-core:47739] [Bug #7088]
+
Thu Oct 11 23:09:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_sub{seq,pos,str}, rb_str_each_{line,codepoint}):
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 91d120a113..7fd87ff40b 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -41,9 +41,6 @@ module Timeout
# +klass+:: Exception Class to raise if the block fails to terminate
# in +sec+ seconds. Omitting will use the default, Timeout::Error
#
- # The block will be executed on another thread and will be given one
- # argument: +sec+.
- #
# Returns the result of the block *if* the block completed before
# +sec+ seconds, otherwise throws an exception, based on the value of +klass+.
#