From 495d8b0ec350ece15bc5d975a3cb29481745bc79 Mon Sep 17 00:00:00 2001 From: zzak Date: Sun, 24 Feb 2013 05:39:11 +0000 Subject: [PATCH] backport r39460, ack'd by mame-san git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ thread.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ed539ae5d..50137b57af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 20 14:23:00 2013 Zachary Scott + + * thread.c: Grammar for #backtrace_locations and ::handle_interrupt + Fri Feb 22 11:10:00 2013 Zachary Scott * enum.c (Enumerable#chunk: Improved examples, grammar, and formatting diff --git a/thread.c b/thread.c index 83c30e0ca8..b232f395de 100644 --- a/thread.c +++ b/thread.c @@ -1640,7 +1640,7 @@ handle_interrupt_arg_check_i(VALUE key, VALUE val) * 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 *argv, VALUE thval) * * 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)