diff options
author | Xavier Noria <fxn@hashref.com> | 2010-08-12 17:36:09 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-08-12 17:36:09 +0200 |
commit | 4134d7db34506887f5cb945bb4e51c53c5f67ec3 (patch) | |
tree | 161991a34115f2ecd41725ab65af0895b93489ed /activerecord/lib/active_record/associations.rb | |
parent | e4943e93c2571cba8630eec2e77000300947866b (diff) | |
parent | 8af2186d26c77f6fcb0787f50941ebe1a2905c5f (diff) | |
download | rails-4134d7db34506887f5cb945bb4e51c53c5f67ec3.tar.gz rails-4134d7db34506887f5cb945bb4e51c53c5f67ec3.tar.bz2 rails-4134d7db34506887f5cb945bb4e51c53c5f67ec3.zip |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rw-r--r-- | activerecord/lib/active_record/associations.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 73c0900c8b..8be36482d4 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -311,7 +311,8 @@ module ActiveRecord # You can set the :autosave option on a <tt>has_one</tt>, <tt>belongs_to</tt>, # <tt>has_many</tt>, or <tt>has_and_belongs_to_many</tt> association. Setting it # to +true+ will _always_ save the members, whereas setting it to +false+ will - # _never_ save the members. + # _never_ save the members. More details about :autosave option is available at + # autosave_association.rb . # # === One-to-one associations # @@ -956,8 +957,7 @@ module ActiveRecord # If false, don't validate the associated objects when saving the parent object. true by default. # [:autosave] # If true, always save the associated objects or destroy them if marked for destruction, - # when saving the parent object. - # If false, never save or destroy the associated objects. + # when saving the parent object. If false, never save or destroy the associated objects. # By default, only save associated objects that are new records. # [:inverse_of] # Specifies the name of the <tt>belongs_to</tt> association on the associated object |