aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/association.rb
diff options
context:
space:
mode:
authorR.T. Lechow <rtlechow@gmail.com>2011-03-03 23:54:58 -0500
committerXavier Noria <fxn@hashref.com>2011-03-05 11:56:34 +0100
commita1b4d8e7b277ddcfba6c31cbb9245025123cf04b (patch)
tree33de6503bbbfcb849fbb903531123748422387cb /activerecord/lib/active_record/associations/association.rb
parent273700cbd0f8e9013fd4b4a33ab310e4ac02ff62 (diff)
downloadrails-a1b4d8e7b277ddcfba6c31cbb9245025123cf04b.tar.gz
rails-a1b4d8e7b277ddcfba6c31cbb9245025123cf04b.tar.bz2
rails-a1b4d8e7b277ddcfba6c31cbb9245025123cf04b.zip
Active Record typos.
Diffstat (limited to 'activerecord/lib/active_record/associations/association.rb')
-rw-r--r--activerecord/lib/active_record/associations/association.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index 67752da2a5..25b4b9d90d 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -7,7 +7,7 @@ module ActiveRecord
# This is the root class of all associations ('+ Foo' signifies an included module Foo):
#
# Association
- # SingularAssociaton
+ # SingularAssociation
# HasOneAssociation
# HasOneThroughAssociation + ThroughAssociation
# BelongsToAssociation
@@ -88,7 +88,7 @@ module ActiveRecord
# Construct the scope for this association.
#
- # Note that the association_scope is merged into the targed_scope only when the
+ # Note that the association_scope is merged into the target_scope only when the
# scoped method is called. This is because at that point the call may be surrounded
# by scope.scoping { ... } or with_scope { ... } etc, which affects the scope which
# actually gets built.