aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-07-25 14:20:01 -0700
committerXavier Noria <fxn@hashref.com>2011-07-25 14:20:01 -0700
commit703d0e05c0a57ec032cd6966ff82e757415bcc50 (patch)
tree0af8cb5d881693165d34ca05ce452c1c7a6ecf92 /activerecord
parent8e0061128e8946d6e6fab68c078517db668ef050 (diff)
parent598eab90ffb60638a578b5b205388cb755485280 (diff)
downloadrails-703d0e05c0a57ec032cd6966ff82e757415bcc50.tar.gz
rails-703d0e05c0a57ec032cd6966ff82e757415bcc50.tar.bz2
rails-703d0e05c0a57ec032cd6966ff82e757415bcc50.zip
Merge branch 'master' of git://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