aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/collection_association.rb
diff options
context:
space:
mode:
authorBen Angel <benjamin.b2@gmail.com>2013-12-19 18:35:24 -0800
committerBen Angel <benjamin.b2@gmail.com>2013-12-19 18:35:24 -0800
commit855ded667975a797cc10b0f38c2986c76b18e251 (patch)
tree81844b0a10dc0a41bf85d5fb3044a91347a745d2 /activerecord/lib/active_record/associations/collection_association.rb
parent1f88fedd6f975c09c8cde6ac43cf0ef71e259d19 (diff)
downloadrails-855ded667975a797cc10b0f38c2986c76b18e251.tar.gz
rails-855ded667975a797cc10b0f38c2986c76b18e251.tar.bz2
rails-855ded667975a797cc10b0f38c2986c76b18e251.zip
change CollectionAssociation's comments to say Association instead of AssociationProxy to match changes for 3.1 removing Association proxy.
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 62f23f54f9..c7315b12bd 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -4,7 +4,7 @@ module ActiveRecord
#
# CollectionAssociation is an abstract class that provides common stuff to
# ease the implementation of association proxies that represent
- # collections. See the class hierarchy in AssociationProxy.
+ # collections. See the class hierarchy in Association.
#
# CollectionAssociation:
# HasManyAssociation => has_many