Merge remote branch 'docrails/master'

2 files changed, 11 insertions, 11 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
       #
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index 408d327dd7..2d87e8d0e5 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/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