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 /activerecord/lib | |
| 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 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 35e4eb19a4..5b6f885122 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1231,7 +1231,7 @@ module ActiveRecord # its owner is destroyed: # # * <tt>:destroy</tt> causes the associated object to also be destroyed - # * <tt>:delete</tt> causes the asssociated object to be deleted directly from the database (so callbacks will not execute) + # * <tt>:delete</tt> causes the associated object to be deleted directly from the database (so callbacks will not execute) # * <tt>:nullify</tt> causes the foreign key to be set to +NULL+. Callbacks are not executed. # * <tt>:restrict_with_exception</tt> causes an exception to be raised if there is an associated record # * <tt>:restrict_with_error</tt> causes an error to be added to the owner if there is an associated object |