fix typo in in define_model_callbacks comment [ci skip]

2014-10-03 15:31:14 -06:00 · 2014-10-03 15:31:14 -06:00 · 9ded108e84
parent 1609ec9879
commit 9ded108e84
2 changed files with 2 additions and 2 deletions
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@ -99,7 +99,7 @@ module ActiveModel
    #   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 = {
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@ -721,7 +721,7 @@ module ActiveSupport
      #   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!