aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-18 22:33:49 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-18 22:33:49 -0800
commit86dcb555886ea575bce947554d28121861369838 (patch)
tree912ea2222565e1feab928ea176525f36ff33bb00
parent947efd4869b83625fda52273334b4b443b96bd4c (diff)
parent517caa85c97b0addba0d27fffa03aec40f70ff1f (diff)
downloadrails-86dcb555886ea575bce947554d28121861369838.tar.gz
rails-86dcb555886ea575bce947554d28121861369838.tar.bz2
rails-86dcb555886ea575bce947554d28121861369838.zip
Merge pull request #13400 from nishant-cyro/docs
fix typos and grammar mistake [ci skip]
-rw-r--r--activerecord/lib/active_record/attribute_methods.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/thread.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index 217fc52dd5..73761520f7 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -330,7 +330,7 @@ module ActiveRecord
end
# Returns the value of the attribute identified by <tt>attr_name</tt> after it has been typecast (for example,
- # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)). It raises
+ # "2004-12-12" in a date column is cast to a date object, like Date.new(2004, 12, 12)). It raises
# <tt>ActiveModel::MissingAttributeError</tt> if the identified attribute is missing.
#
# Alias for the <tt>read_attribute</tt> method.
diff --git a/activesupport/lib/active_support/core_ext/thread.rb b/activesupport/lib/active_support/core_ext/thread.rb
index d5a420301a..ac1ffa4128 100644
--- a/activesupport/lib/active_support/core_ext/thread.rb
+++ b/activesupport/lib/active_support/core_ext/thread.rb
@@ -33,7 +33,7 @@ class Thread
_locals[key.to_sym] = value
end
- # Returns an an array of the names of the thread-local variables (as Symbols).
+ # Returns an array of the names of the thread-local variables (as Symbols).
#
# thr = Thread.new do
# Thread.current.thread_variable_set(:cat, 'meow')