diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-11 22:58:14 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-11 22:58:14 +0530 |
| commit | b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0 (patch) | |
| tree | 573c2401b48841a28209e93664af131146eea31e /activerecord/lib/active_record/associations/collection_proxy.rb | |
| parent | a24ef8611d19bce9c98aa21ee59d9dd0a08ecec5 (diff) | |
| parent | 8a347d925d08a4fe648c6fe7c5e8c948e186c9bb (diff) | |
| download | rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.gz rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.bz2 rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/action_mailer_basics.md
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_proxy.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 8a5b312862..56e57cc36e 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -92,7 +92,7 @@ module ActiveRecord # # => ActiveModel::MissingAttributeError: missing attribute: person_id # # *Second:* You can pass a block so it can be used just like Array#select. - # This build an array of objects from the database for the scope, + # This builds an array of objects from the database for the scope, # converting them into an array and iterating through them using # Array#select. # @@ -304,7 +304,7 @@ module ActiveRecord @association.concat(*records) end - # Replace this collection with +other_array+. This will perform a diff + # Replaces this collection with +other_array+. This will perform a diff # and delete/add only records that have changed. # # class Person < ActiveRecord::Base |