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: fix typo in in define_model_callbacks comment [ci skip]

---
 activesupport/lib/active_support/callbacks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 21a2f54bc1..4bc13f20ca 100644
--- 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!
 
-- 
cgit v1.2.3