diff options
author | Steve Klabnik <steve@steveklabnik.com> | 2013-03-29 12:06:34 -0700 |
---|---|---|
committer | Steve Klabnik <steve@steveklabnik.com> | 2013-03-29 12:06:34 -0700 |
commit | b22ec860abcad5c92c450b7fb03b6e9928d50807 (patch) | |
tree | 2b92736d09f5240d205212e105e61c02adafb1b5 | |
parent | 1003f5bd6d36bc0bdc9723eb8245d6f7aeb818aa (diff) | |
parent | f3cabb3c05949b63e9eef25d91b32cf1e313e463 (diff) | |
download | rails-b22ec860abcad5c92c450b7fb03b6e9928d50807.tar.gz rails-b22ec860abcad5c92c450b7fb03b6e9928d50807.tar.bz2 rails-b22ec860abcad5c92c450b7fb03b6e9928d50807.zip |
Merge pull request #9998 from neerajdotname/association-doc
fixes for association doc
-rw-r--r-- | activerecord/lib/active_record/associations/association.rb | 4 |
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 4c4b0f08e5..54971e61e1 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -92,7 +92,7 @@ module ActiveRecord # The scope for this association. # # 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 + # scope 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. def association_scope @@ -113,7 +113,7 @@ module ActiveRecord end end - # This class of the target. belongs_to polymorphic overrides this to look at the + # Returns the class of the target. belongs_to polymorphic overrides this to look at the # polymorphic_type field on the owner. def klass reflection.klass |