Merge pull request #17172 from rselk/typo

fix typo in in define_model_callbacks comment [ci skip]
rails · Oct 3, 2014 · cefb00a · cefb00a
2 parents 1609ec9 + 9ded108
commit cefb00a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
@@ -99,7 +99,7 @@ def self.extended(base) #:nodoc:
     #   end
     #
     # NOTE: +method_name+ passed to `define_model_callbacks` must not end with
-    # `!`, `?` and `=`.
+    # `!`, `?` or `=`.
     def define_model_callbacks(*callbacks)
       options = callbacks.extract_options!
       options = {

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
@@ -721,7 +721,7 @@ def reset_callbacks(name)
       #   would call <tt>Audit#save</tt>.
       #
       # NOTE: +method_name+ passed to `define_model_callbacks` must not end with
-      # `!`, `?` and `=`.
+      # `!`, `?` or `=`.
       def define_callbacks(*names)
         options = names.extract_options!