aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--thread.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d63a46f28..e8f7bf8a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct 7 04:50:00 2012 Zachary Scott <zzak@ruby-lang.org>
+
+ * thread.c (rb_thread_aref):
+ Grammar in Thread documentation.
+ Patch by Steve Klabnik [ruby-dev:47799] [Bug #7099]
+
Sun Oct 7 04:37:00 2012 Zachary Scott <zzak@ruby-lang.org>
* string.c (rb_str_match):
diff --git a/thread.c b/thread.c
index 8320ed29bd..035ccebd7d 100644
--- a/thread.c
+++ b/thread.c
@@ -2486,8 +2486,8 @@ rb_thread_local_aref(VALUE thread, ID id)
* #<Thread:0x00000002a54130 dead>: C
*
* Thread#[] and Thread#[]= are not thread-local but fiber-local.
- * This confusion was not exist until Ruby 1.8 because
- * fiber is available since Ruby 1.9.
+ * This confusion did not exist in Ruby 1.8 because
+ * fibers were only available since Ruby 1.9.
* Ruby 1.9 chooses that the methods behaves fiber-local to save
* following idiom for dynamic scope.
*