usa	2013-04-02 13:09:07 +0900 (Tue, 02 Apr 2013)

  New Revision: 40055

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

  Log:
    merge revision(s) 40015: [Backport #8196]
    
    doumentation by @toolmantim [GH fixes #270]
    
     * timeout.rb: Document Timeout::timeout 0 and nil argument behavior

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/lib/timeout.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/lib/timeout.rb
===================================================================
--- ruby_1_9_3/lib/timeout.rb	(revision 40054)
+++ ruby_1_9_3/lib/timeout.rb	(revision 40055)
@@ -33,11 +33,12 @@ module Timeout https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/timeout.rb#L33
   CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
   # :startdoc:
 
-  # Perform an operation in a block, timing it out if it takes longer
-  # than +sec+ seconds to complete.
+  # Perform an operation in a block, raising an error if it takes longer than
+  # +sec+ seconds to complete.
   #
   # +sec+:: Number of seconds to wait for the block to terminate. Any number
-  #         may be used, including Floats to specify fractional seconds.
+  #         may be used, including Floats to specify fractional seconds. A
+  #         value of 0 or +nil+ will execute the block without any timeout.
   # +klass+:: Exception Class to raise if the block fails to terminate
   #           in +sec+ seconds.  Omitting will use the default, Timeout::Error
   #
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40054)
+++ ruby_1_9_3/version.h	(revision 40055)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 406
+#define RUBY_PATCHLEVEL 407
 
 #define RUBY_RELEASE_DATE "2013-04-02"
 #define RUBY_RELEASE_YEAR 2013

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40015


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