summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/objspace/object_tracing.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6353971cd83..d596febd4a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 8 02:43:01 2013 Zachary Scott <e@zzak.io>
+
+ * ext/objspace/object_tracing.c: [DOC] trace_object_allocations_stop
+ By @srawlins [Fixes GH-421] https://github.com/ruby/ruby/pull/421
+
Fri Nov 8 02:34:20 2013 Zachary Scott <e@zzak.io>
* lib/net/ftp.rb: [DOC] Document Net::FTP.mdtm and .set_socket and fix
diff --git a/ext/objspace/object_tracing.c b/ext/objspace/object_tracing.c
index 1770a8ea395..5fe1d757e58 100644
--- a/ext/objspace/object_tracing.c
+++ b/ext/objspace/object_tracing.c
@@ -207,8 +207,8 @@ trace_object_allocations_start(VALUE self)
*
* Stop tracing object allocations.
*
- * Note that if ::trace_object_allocations_start is called n-times, then stop
- * tracing after calling ::trace_object_allocations_stop n-times.
+ * Note that if ::trace_object_allocations_start is called n-times, then
+ * tracing will stop after calling ::trace_object_allocations_stop n-times.
*
*/
static VALUE