Skip to content
Browse files

Fix ActiveSupport::Callbacks' define_callbacks and ActiveSupport::Con…

…cern documentation to look like native English
  • Loading branch information...
1 parent d191db7 commit f544c0a32dd86d4fe2c11e9111d3403fbbab2776 @tomstuart tomstuart committed
Showing with 11 additions and 11 deletions.
  1. +3 −3 activesupport/lib/active_support/callbacks.rb
  2. +8 −8 activesupport/lib/active_support/concern.rb
View
6 activesupport/lib/active_support/callbacks.rb
@@ -568,9 +568,9 @@ def reset_callbacks(symbol)
#
# 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
#
View
16 activesupport/lib/active_support/concern.rb
@@ -4,33 +4,33 @@
# def self.included(base)
# base.send(:extend, ClassMethods)
# base.send(:include, InstanceMethods)
-# scope :foo, :conditions => {:created_at => nil}
+# scope :foo, :conditions => { :created_at => nil }
# end
#
# module ClassMethods
-# def cm; puts 'I am class method'; end
+# def cm; puts 'I am a class method'; end
# end
#
# module InstanceMethods
-# def im; puts 'I am instance method'; end
+# def im; puts 'I am an instance method'; end
# end
# end
#
-# By using <tt>ActiveSupport::Concern</tt> above module could be written as:
+# By using <tt>ActiveSupport::Concern</tt> the above module could instead be written as:
#
# module M
# extend ActiveSupport::Concern
#
-# included do
-# scope :foo, :conditions => {:created_at => nil}
+# included do
+# scope :foo, :conditions => { :created_at => nil }
# end
#
# module ClassMethods
-# def cm; puts 'I am class method'; end
+# def cm; puts 'I am a class method'; end
# end
#
# module InstanceMethods
-# def im; puts 'I am instance method'; end
+# def im; puts 'I am an instance method'; end
# end
# end
module ActiveSupport

0 comments on commit f544c0a

Please sign in to comment.
Something went wrong with that request. Please try again.