aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-01-07 15:28:47 +0000
committerAaron Patterson <aaron.patterson@gmail.com>2011-01-11 13:45:05 -0800
commit1390a443289dbe4bfed63bfd3192c8c6a29fd833 (patch)
tree48267fc57a1d6a5d25dbbfa0b8dd73c7fcc7a39b /activerecord
parentf6b71dea15435ea91e4db27ddf657ff840fd3a72 (diff)
downloadrails-1390a443289dbe4bfed63bfd3192c8c6a29fd833.tar.gz
rails-1390a443289dbe4bfed63bfd3192c8c6a29fd833.tar.bz2
rails-1390a443289dbe4bfed63bfd3192c8c6a29fd833.zip
Correctly indent the bullet points under 'One-to-one associations', so that the lines are not broken in the generated rdoc html
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations.rb20
1 files changed, 10 insertions, 10 deletions
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 (<tt>new_record? == true</tt>).
+ # the object being replaced (if there is one), in order to update their primary
+ # keys - except if the parent object is unsaved (<tt>new_record? == true</tt>).
# * 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 <tt>association.build</tt> method (documented below).
+ # use the <tt>association.build</tt> 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 <tt>push</tt> or similar)
- # fails, then <tt>push</tt> returns +false+.
+ # fails, then <tt>push</tt> returns +false+.
# * You can add an object to a collection without automatically saving it by using the
- # <tt>collection.build</tt> method (documented below).
+ # <tt>collection.build</tt> method (documented below).
# * All unsaved (<tt>new_record? == true</tt>) members of the collection are automatically
- # saved when the parent is saved.
+ # saved when the parent is saved.
#
# === Association callbacks
#