diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-02-14 15:35:47 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-02-14 15:35:47 +0000 |
| commit | 95546d493525a79f2da542c7e3fcff6cd5acca73 (patch) | |
| tree | 90bd2c1e9be0a1f3767da72d60bf3b519333c791 /activesupport/lib | |
| parent | 698afe1173c6501d29b98389204d3ac70aaea910 (diff) | |
| parent | 773dd2598d6158a553a33ab638795c128fc1cc8d (diff) | |
| download | rails-95546d493525a79f2da542c7e3fcff6cd5acca73.tar.gz rails-95546d493525a79f2da542c7e3fcff6cd5acca73.tar.bz2 rails-95546d493525a79f2da542c7e3fcff6cd5acca73.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 51cf468d2b..f32bb8a0cc 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -741,8 +741,8 @@ module ActiveSupport # # * <tt>:skip_after_callbacks_if_terminated</tt> - Determines if after # callbacks should be terminated by the <tt>:terminator</tt> option. By - # default after callbacks executed no matter if callback chain was - # terminated or not. Option makes sense only when <tt>:terminator</tt> + # default after callbacks are executed no matter if callback chain was + # terminated or not. This option makes sense only when <tt>:terminator</tt> # option is specified. # # * <tt>:scope</tt> - Indicates which methods should be executed when an |