diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-10 00:09:26 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-10 00:09:26 +0530 |
| commit | b938f08a3352981f9a2876a60ff2600438b771c2 (patch) | |
| tree | a4405b069c506366966bb261b45b1720026722ba /guides/source/association_basics.md | |
| parent | b3a31e936363472e7f9bf08cdb0d894127fbd753 (diff) | |
| parent | be3e402c79d5c1eac4729e2982d05161c1a9b6a2 (diff) | |
| download | rails-b938f08a3352981f9a2876a60ff2600438b771c2.tar.gz rails-b938f08a3352981f9a2876a60ff2600438b771c2.tar.bz2 rails-b938f08a3352981f9a2876a60ff2600438b771c2.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/source/association_basics.md')
| -rw-r--r-- | guides/source/association_basics.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/association_basics.md b/guides/source/association_basics.md index cb0a7c8026..65c8154064 100644 --- a/guides/source/association_basics.md +++ b/guides/source/association_basics.md @@ -1109,7 +1109,7 @@ end 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 @@ -1463,7 +1463,7 @@ end Controls what happens to the associated objects when their owner is destroyed: * `:destroy` causes all the associated objects to also be destroyed -* `:delete_all` causes all the asssociated objects to be deleted directly from the database (so callbacks will not execute) +* `:delete_all` causes all the associated objects to be deleted directly from the database (so callbacks will not execute) * `:nullify` causes the foreign keys to be set to `NULL`. Callbacks are not executed. * `:restrict_with_exception` causes an exception to be raised if there are any associated records * `:restrict_with_error` causes an error to be added to the owner if there are any associated objects |