diff options
author | Xavier Noria <fxn@hashref.com> | 2011-02-18 23:22:15 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-02-18 23:22:15 +0100 |
commit | f41bf6938fd4aa5a83777cc767f7f32ace5f6539 (patch) | |
tree | eb85baf61ec970ca090ed057536c2d0ee1b18e5b /activerecord/lib/active_record/associations.rb | |
parent | fbfa30a1eeaaab22ac8f43a4137ec8282920fe15 (diff) | |
parent | 220cb107b672d65fdc0488d4ff310ab04b62b463 (diff) | |
download | rails-f41bf6938fd4aa5a83777cc767f7f32ace5f6539.tar.gz rails-f41bf6938fd4aa5a83777cc767f7f32ace5f6539.tar.bz2 rails-f41bf6938fd4aa5a83777cc767f7f32ace5f6539.zip |
merges docrails
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 77110c721b..364a7248d2 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -804,7 +804,7 @@ module ActiveRecord # belongs_to :dungeon # end # - # The +traps+ association on +Dungeon+ and the the +dungeon+ association on +Trap+ are + # The +traps+ association on +Dungeon+ and the +dungeon+ association on +Trap+ are # the inverse of each other and the inverse of the +dungeon+ association on +EvilWizard+ # is the +evil_wizard+ association on +Dungeon+ (and vice-versa). By default, # Active Record doesn't know anything about these inverse relationships and so no object |