diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-03-05 22:58:48 +0000 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-05 22:58:48 +0000 |
commit | 28ed10d3f27e27ed105dd8fd60d6151a6b372375 (patch) | |
tree | ca2cfb5696cbc9de3d636212374eaeafafa23c39 /activerecord/lib/active_record/autosave_association.rb | |
parent | b7f1b3641afe0ff4f3cd344815c6f7bb58821e9e (diff) | |
parent | 74818a35432b40fef16fe74f248ea75d35405324 (diff) | |
download | rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.gz rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.bz2 rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.zip |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
Diffstat (limited to 'activerecord/lib/active_record/autosave_association.rb')
-rw-r--r-- | activerecord/lib/active_record/autosave_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb index 748cc99a62..48dbe0838a 100644 --- a/activerecord/lib/active_record/autosave_association.rb +++ b/activerecord/lib/active_record/autosave_association.rb @@ -4,7 +4,7 @@ module ActiveRecord # = Active Record Autosave Association # # +AutosaveAssociation+ is a module that takes care of automatically saving - # associacted records when their parent is saved. In addition to saving, it + # associated records when their parent is saved. In addition to saving, it # also destroys any associated records that were marked for destruction. # (See +mark_for_destruction+ and <tt>marked_for_destruction?</tt>). # |