aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/callbacks.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-08-05 15:56:42 +0200
committerXavier Noria <fxn@hashref.com>2010-08-05 15:56:42 +0200
commit9989d3337f2ec38388538e605f5dc01aa8b58ae4 (patch)
treed154bf5b597118a4841556a60140b55112ef1083 /activesupport/lib/active_support/callbacks.rb
parent117b096d0a91ff7a8fb704b359a6fdf1ccc20e7c (diff)
parent02572399a588110709c2988fab66e2d65d735bfc (diff)
downloadrails-9989d3337f2ec38388538e605f5dc01aa8b58ae4.tar.gz
rails-9989d3337f2ec38388538e605f5dc01aa8b58ae4.tar.bz2
rails-9989d3337f2ec38388538e605f5dc01aa8b58ae4.zip
Merge remote branch 'docrails/master'
Diffstat (limited to 'activesupport/lib/active_support/callbacks.rb')
-rw-r--r--activesupport/lib/active_support/callbacks.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 50a4ce695e..85cd4db002 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -571,9 +571,9 @@ module ActiveSupport
#
# would trigger <tt>Audit#before_save</tt> instead. That's constructed by calling
# <tt>"#{kind}_#{name}"</tt> on the given instance. In this case "kind" is "before" and
- # "name" is "save". In this context treat ":kind" and ":name" as special thing where
- # ":kind" refers to "callback type(before/after)" and ":name" refers to the method on
- # which callbacks are being defined.
+ # "name" is "save". In this context ":kind" and ":name" have special meanings: ":kind"
+ # refers to the kind of callback (before/after/around) and ":name" refers to the
+ # method on which callbacks are being defined.
#
# A declaration like
#