diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-12 08:12:13 -0800 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-12 08:12:13 -0800 |
commit | 07fd25c759b079a12dcd087aeacf39deb3e549d0 (patch) | |
tree | 68daf738634ff37865370c48361845750819393e /activerecord | |
parent | a9b3c8f2b03fec61aeea976a1ddfa9eb41c8a2ba (diff) | |
parent | 5fccd77b6c71e26fcbf879657c1f532999171900 (diff) | |
download | rails-07fd25c759b079a12dcd087aeacf39deb3e549d0.tar.gz rails-07fd25c759b079a12dcd087aeacf39deb3e549d0.tar.bz2 rails-07fd25c759b079a12dcd087aeacf39deb3e549d0.zip |
Merge pull request #13293 from akshay-vishnoi/typo
Spelling and Grammar checks [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/counter_cache.rb | 8 | ||||
-rw-r--r-- | activerecord/lib/active_record/errors.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/counter_cache.rb b/activerecord/lib/active_record/counter_cache.rb index 7e3bef9431..dcbdf75627 100644 --- a/activerecord/lib/active_record/counter_cache.rb +++ b/activerecord/lib/active_record/counter_cache.rb @@ -82,10 +82,10 @@ module ActiveRecord # Increment a numeric field by one, via a direct SQL update. # - # This method is used primarily for maintaining counter_cache columns used to - # store aggregate values. For example, a DiscussionBoard may cache posts_count - # and comments_count to avoid running an SQL query to calculate the number of - # posts and comments there are each time it is displayed. + # This method is used primarily for maintaining counter_cache columns that are + # used to store aggregate values. For example, a DiscussionBoard may cache + # posts_count and comments_count to avoid running an SQL query to calculate the + # number of posts and comments there are, each time it is displayed. # # ==== Parameters # diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb index 7e38719811..2602f79db9 100644 --- a/activerecord/lib/active_record/errors.rb +++ b/activerecord/lib/active_record/errors.rb @@ -188,7 +188,7 @@ module ActiveRecord end end - # Raised when a primary key is needed, but there is not one specified in the schema or model. + # Raised when a primary key is needed, but not specified in the schema or model. class UnknownPrimaryKey < ActiveRecordError attr_reader :model |