From 1390a443289dbe4bfed63bfd3192c8c6a29fd833 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 7 Jan 2011 15:28:47 +0000 Subject: Correctly indent the bullet points under 'One-to-one associations', so that the lines are not broken in the generated rdoc html --- activerecord/lib/active_record/associations.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 3e7c9a370d..7659bd2d37 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -332,26 +332,26 @@ module ActiveRecord # === One-to-one associations # # * Assigning an object to a +has_one+ association automatically saves that object and - # the object being replaced (if there is one), in order to update their primary - # keys - except if the parent object is unsaved (new_record? == true). + # the object being replaced (if there is one), in order to update their primary + # keys - except if the parent object is unsaved (new_record? == true). # * If either of these saves fail (due to one of the objects being invalid) the assignment - # statement returns +false+ and the assignment is cancelled. + # statement returns +false+ and the assignment is cancelled. # * If you wish to assign an object to a +has_one+ association without saving it, - # use the association.build method (documented below). + # use the association.build method (documented below). # * Assigning an object to a +belongs_to+ association does not save the object, since - # the foreign key field belongs on the parent. It does not save the parent either. + # the foreign key field belongs on the parent. It does not save the parent either. # # === Collections # # * Adding an object to a collection (+has_many+ or +has_and_belongs_to_many+) automatically - # saves that object, except if the parent object (the owner of the collection) is not yet - # stored in the database. + # saves that object, except if the parent object (the owner of the collection) is not yet + # stored in the database. # * If saving any of the objects being added to a collection (via push or similar) - # fails, then push returns +false+. + # fails, then push returns +false+. # * You can add an object to a collection without automatically saving it by using the - # collection.build method (documented below). + # collection.build method (documented below). # * All unsaved (new_record? == true) members of the collection are automatically - # saved when the parent is saved. + # saved when the parent is saved. # # === Association callbacks # -- cgit v1.2.3