diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-29 12:46:35 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-29 12:46:35 -0700 |
commit | eb3f81f9dce7a7e22ff228a564408daeef09a11e (patch) | |
tree | ea9623612567ea02dbdd5a73463274bb3f92a6f9 /activerecord/lib/active_record/associations.rb | |
parent | 18b153d15d76ff2f06b76a16ca46b548b7d6750a (diff) | |
parent | 4f234bfd799f471490775a2843b3cf7db2af21ed (diff) | |
download | rails-eb3f81f9dce7a7e22ff228a564408daeef09a11e.tar.gz rails-eb3f81f9dce7a7e22ff228a564408daeef09a11e.tar.bz2 rails-eb3f81f9dce7a7e22ff228a564408daeef09a11e.zip |
Merge pull request #1398 from leereilly/my_new_branch
Corrected some typos and American vs. Queen's English issues
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 a0a1ff23db..3acfa5f729 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -860,7 +860,7 @@ module ActiveRecord # 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 - # loading optimisation is possible. For example: + # loading optimization is possible. For example: # # d = Dungeon.first # t = d.traps.first |