aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/association_basics.textile
diff options
context:
space:
mode:
authorPrzemek Hocke <phocke@gmail.com>2012-09-21 03:46:14 +0200
committerPrzemek Hocke <phocke@gmail.com>2012-09-21 03:46:14 +0200
commit649a95b8af3aa42183fe0096ccf2a54ec1c13656 (patch)
tree7ceb9ceb68f84be86ab9ebaf8e0b16087414ce0e /guides/source/association_basics.textile
parentdeed3f99754bdeca11dfbc5ba674c939bd70de13 (diff)
downloadrails-649a95b8af3aa42183fe0096ccf2a54ec1c13656.tar.gz
rails-649a95b8af3aa42183fe0096ccf2a54ec1c13656.tar.bz2
rails-649a95b8af3aa42183fe0096ccf2a54ec1c13656.zip
fix two typos in the associations guide
Diffstat (limited to 'guides/source/association_basics.textile')
-rw-r--r--guides/source/association_basics.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/association_basics.textile b/guides/source/association_basics.textile
index 3ee87f642a..e3da9b7e45 100644
--- a/guides/source/association_basics.textile
+++ b/guides/source/association_basics.textile
@@ -985,7 +985,7 @@ h6(#has_one-dependent). +:dependent+
Controls what happens to the associated object when its owner is destroyed:
* +:destroy+ causes the associated object to also be destroyed
-* +:delete+ causes the asssociated object to be deleted directly from the database (so callbacks will not execute)
+* +:delete+ causes the associated object to be deleted directly from the database (so callbacks will not execute)
* +:nullify+ causes the foreign key to be set to +NULL+. Callbacks are not executed.
* +:restrict_with_exception+ causes an exception to be raised if there is an associated record
* +:restrict_with_error+ causes an error to be added to the owner if there is an associated object
@@ -1283,7 +1283,7 @@ The <tt><em>collection</em>.create</tt> method returns a new object of the assoc
h5. Options for +has_many+
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_many+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_many+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this association uses two such options:
<ruby>
class Customer < ActiveRecord::Base