zzak	2013-02-24 14:39:11 +0900 (Sun, 24 Feb 2013)

  New Revision: 39462

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

  Log:
    backport r39460, ack'd by mame-san

  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/thread.c

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39461)
+++ ruby_2_0_0/ChangeLog	(revision 39462)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Feb 20 14:23:00 2013  Zachary Scott  <zachary@z...>
+
+	* thread.c: Grammar for #backtrace_locations and ::handle_interrupt
+
 Fri Feb 22 11:10:00 2013  Zachary Scott  <zachary@z...>
 
 	* enum.c (Enumerable#chunk: Improved examples, grammar, and formatting
Index: ruby_2_0_0/thread.c
===================================================================
--- ruby_2_0_0/thread.c	(revision 39461)
+++ ruby_2_0_0/thread.c	(revision 39462)
@@ -1640,7 +1640,7 @@ handle_interrupt_arg_check_i(VALUE key, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread.c#L1640
  *   th.raise "stop"
  *
  * While we are ignoring the RuntimeError exception, it's safe to write our
- * resource allocation code. Then in the ensure block is where you can safely
+ * resource allocation code. Then, the ensure block is where we can safely
  * deallocate your resources.
  *
  * ==== Guarding from TimeoutError
@@ -4853,8 +4853,8 @@ rb_thread_backtrace_m(int argc, VALUE *a https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread.c#L4853
  *
  * See Thread::Backtrace::Location for more information.
  *
- * This method behaves similarly to Kernel#caller_locations except for a
- * specific thread.
+ * This method behaves similarly to Kernel#caller_locations except it applies
+ * to a specific thread.
  */
 static VALUE
 rb_thread_backtrace_locations_m(int argc, VALUE *argv, VALUE thval)

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