From 9ded108e841773017a27762f7ba6b6a6bd5813ab Mon Sep 17 00:00:00 2001
From: Ryan Selk <ryanselk@gmail.com>
Date: Fri, 3 Oct 2014 15:31:14 -0600
Subject: [PATCH] fix typo in in define_model_callbacks comment [ci skip]

---
 activemodel/lib/active_model/callbacks.rb     | 2 +-
 activesupport/lib/active_support/callbacks.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index 467028f9e823b..b3d70dc515776 100644
--- 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
index 21a2f54bc1a91..4bc13f20ca020 100644
--- 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!