aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorMichael Lavrisha <michael.lavrisha@gmail.com>2011-07-24 16:36:52 -0600
committerMichael Lavrisha <michael.lavrisha@gmail.com>2011-07-24 16:36:52 -0600
commit62f865db0be30bbc20feb5c3428d00c41e85f070 (patch)
treeac5bd71beb81e6c53ea14b970ae82d47afe81fe7 /activerecord
parent5cece57c93aff28010defece05085cff903fb9d2 (diff)
parent6734bc98e7a90dd7c4dce47750721a0d19170d83 (diff)
downloadrails-62f865db0be30bbc20feb5c3428d00c41e85f070.tar.gz
rails-62f865db0be30bbc20feb5c3428d00c41e85f070.tar.bz2
rails-62f865db0be30bbc20feb5c3428d00c41e85f070.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/persistence.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index d9cd7987b0..ebda3875cd 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -287,7 +287,7 @@ module ActiveRecord
private
- # A hook to be overriden by association modules.
+ # A hook to be overridden by association modules.
def destroy_associations
end