diff options
author | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-16 15:53:20 -0400 |
---|---|---|
committer | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-16 15:53:20 -0400 |
commit | 5861fde01fbe9446666b319dfc8d24514aafda21 (patch) | |
tree | 4c78ceda7ec49a54b1c2454217e85d36d1a937aa /activerecord/lib/active_record/nested_attributes.rb | |
parent | c1ff781001af157c0d5ea5ac64e1fa17d47fe1f1 (diff) | |
parent | 35e3f72af29a33189a46a4b5ada84768b87e0ef2 (diff) | |
download | rails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.gz rails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.bz2 rails-5861fde01fbe9446666b319dfc8d24514aafda21.zip |
Merge remote branch 'origin/master'
Diffstat (limited to 'activerecord/lib/active_record/nested_attributes.rb')
-rw-r--r-- | activerecord/lib/active_record/nested_attributes.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb index 767ec85432..99f8b431c8 100644 --- a/activerecord/lib/active_record/nested_attributes.rb +++ b/activerecord/lib/active_record/nested_attributes.rb @@ -15,7 +15,7 @@ module ActiveRecord self.nested_attributes_options = {} end - # == Nested Attributes + # = Active Record Nested Attributes # # Nested attributes allow you to save attributes on associated records # through the parent. By default nested attribute updating is turned off, @@ -25,6 +25,7 @@ module ActiveRecord # # The attribute writer is named after the association, which means that # in the following example, two new methods are added to your model: + # # <tt>author_attributes=(attributes)</tt> and # <tt>pages_attributes=(attributes)</tt>. # |