zzak	2013-11-11 01:05:04 +0900 (Mon, 11 Nov 2013)

  New Revision: 43640

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43640

  Log:
    * lib/timeout.rb: Added note about change from #8730 [Fixes GH-440]
    * NEWS: Improve grammar on change to Timeout
      Patched by @srawlins in https://github.com/ruby/ruby/pull/440

  Modified files:
    trunk/ChangeLog
    trunk/NEWS
    trunk/lib/timeout.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43639)
+++ ChangeLog	(revision 43640)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Nov 11 01:02:06 2013  Zachary Scott  <e@z...>
+
+	* lib/timeout.rb: Added note about change from #8730 [Fixes GH-440]
+	* NEWS: Improve grammar on change to Timeout
+	  Patched by @srawlins in https://github.com/ruby/ruby/pull/440
+
 Sun Nov 10 23:47:05 2013  Kazuki Tsujimoto  <kazuki@c...>
 
 	* gc.c (rb_gcdebug_print_obj_condition): catch up recent changes
Index: lib/timeout.rb
===================================================================
--- lib/timeout.rb	(revision 43639)
+++ lib/timeout.rb	(revision 43640)
@@ -57,6 +57,9 @@ module Timeout https://github.com/ruby/ruby/blob/trunk/lib/timeout.rb#L57
   # Returns the result of the block *if* the block completed before
   # +sec+ seconds, otherwise throws an exception, based on the value of +klass+.
   #
+  # The exception thrown to terminate the given block cannot be rescued inside
+  # the block unless +klass+ is given explicitly.
+  #
   # Note that this is both a method of module Timeout, so you can <tt>include
   # Timeout</tt> into your classes so they have a #timeout method, as well as
   # a module method, so you can call it directly as Timeout.timeout().
Index: NEWS
===================================================================
--- NEWS	(revision 43639)
+++ NEWS	(revision 43640)
@@ -251,7 +251,7 @@ with all sufficient information, see the https://github.com/ruby/ruby/blob/trunk/NEWS#L251
     * Tempfile.create
 
 * Timeout
-  * No longer an exception to terminate the given block can be rescued
+  * The exception to terminate the given block can no longer be rescued
     inside the block, by default, unless the exception class is given
     explicitly.
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/