aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2013-12-21 17:44:43 +0100
committerRobin Dupret <robin.dupret@gmail.com>2013-12-21 18:59:55 +0100
commitb894b7b90a6aced0e78ab84a45bf1c75c871bb2d (patch)
tree54d847efdb39e4feb70cbaabbc9f8d25eff05852
parentd39db9da1a7e093f0248c9755fb8333d89dc1724 (diff)
downloadrails-b894b7b90a6aced0e78ab84a45bf1c75c871bb2d.tar.gz
rails-b894b7b90a6aced0e78ab84a45bf1c75c871bb2d.tar.bz2
rails-b894b7b90a6aced0e78ab84a45bf1c75c871bb2d.zip
Fix few typos in the documentation [ci skip]
-rw-r--r--activemodel/lib/active_model/callbacks.rb2
-rw-r--r--activesupport/lib/active_support/callbacks.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index 377aa6ee27..b27a39b787 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -30,7 +30,7 @@ module ActiveModel
# end
#
# Then in your class, you can use the +before_create+, +after_create+ and
- # +around_create+ methods, just as you would in an Active Record module.
+ # +around_create+ methods, just as you would in an Active Record model.
#
# before_create :action_before_create
#
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 3052e5011c..e14ece7f35 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -577,7 +577,7 @@ module ActiveSupport
# The callback can be specified as a symbol naming an instance method; as a
# proc, lambda, or block; as a string to be instance evaluated; or as an
# object that responds to a certain method determined by the <tt>:scope</tt>
- # argument to +define_callback+.
+ # argument to +define_callbacks+.
#
# If a proc, lambda, or block is given, its body is evaluated in the context
# of the current object. It can also optionally accept the current object as