diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-20 01:11:57 -0700 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-20 01:11:57 -0700 |
| commit | c81dc8e373143be00cccb60c3ba4af4228274962 (patch) | |
| tree | 52e7cb93d5814ac7b679963417a5475ae9982c5e /activerecord/lib | |
| parent | eda39084fa9198083c4e758d052fa862354a0a7e (diff) | |
| parent | abd89f96cd51988a50947006c50ae4ff3fe8f040 (diff) | |
| download | rails-c81dc8e373143be00cccb60c3ba4af4228274962.tar.gz rails-c81dc8e373143be00cccb60c3ba4af4228274962.tar.bz2 rails-c81dc8e373143be00cccb60c3ba4af4228274962.zip | |
Merge pull request #9821 from vipulnsward/fix_typos_in_AR
Fix some typos in AR- CHANGELOG, tests, method doc. fixed
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 0c670bdaa1..eb08f72286 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -966,7 +966,7 @@ module ActiveRecord # For +has_and_belongs_to_many+, <tt>delete</tt> and <tt>destroy</tt> are the same: they # cause the records in the join table to be removed. # - # For +has_many+, <tt>destroy</tt> and <tt>destory_all</tt> will always call the <tt>destroy</tt> method of the + # For +has_many+, <tt>destroy</tt> and <tt>destroy_all</tt> will always call the <tt>destroy</tt> method of the # record(s) being removed so that callbacks are run. However <tt>delete</tt> and <tt>delete_all</tt> will either # do the deletion according to the strategy specified by the <tt>:dependent</tt> option, or # if no <tt>:dependent</tt> option is given, then it will follow the default strategy. diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 10a31109d5..257221174b 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -614,7 +614,7 @@ module ActiveRecord # # The returned <tt>ActiveRecord::NullRelation</tt> inherits from Relation and implements the # Null Object pattern. It is an object with defined null behavior and always returns an empty - # array of records without quering the database. + # array of records without querying the database. # # Any subsequent condition chained to the returned relation will continue # generating an empty relation and will not fire any query to the database. |