nagachika	2013-03-11 01:11:09 +0900 (Mon, 11 Mar 2013)

  New Revision: 39707

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

  Log:
    merge revision(s) 39501,39502:
    
    * error.c: clarify a document of SignalException. Process.kill()
      doesn't have any guarantee when signal will be delivered.
      [Bug #7951] [ruby-core:52864]
    
    * error.c: clarify reason for sleep in SignalException example

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/error.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39706)
+++ ruby_2_0_0/ChangeLog	(revision 39707)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 11 01:09:23 2013  Zachary Scott  <zachary@z...>
+
+	* error.c: clarify reason for sleep in SignalException example
+
+Mon Mar 11 01:09:23 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* error.c: clarify a document of SignalException. Process.kill()
+	  doesn't have any guarantee when signal will be delivered.
+	  [Bug #7951] [ruby-core:52864]
+
 Mon Mar 11 01:04:54 2013  NARUSE, Yui  <naruse@r...>
 
 	* string.c (str_byte_substr): don't set coderange if it's not known.
Index: ruby_2_0_0/error.c
===================================================================
--- ruby_2_0_0/error.c	(revision 39706)
+++ ruby_2_0_0/error.c	(revision 39707)
@@ -1349,6 +1349,7 @@ syserr_eqq(VALUE self, VALUE exc) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/error.c#L1349
  *
  *     begin
  *       Process.kill('HUP',Process.pid)
+ *       sleep # wait for receiver to handle signal sent by Process.kill
  *     rescue SignalException => e
  *       puts "received Exception #{e}"
  *     end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39706)
+++ ruby_2_0_0/version.h	(revision 39707)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-11"
-#define RUBY_PATCHLEVEL 51
+#define RUBY_PATCHLEVEL 52
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39501-39502


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