aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-12-11 23:32:04 -0800
committerYves Senn <yves.senn@gmail.com>2013-12-11 23:32:04 -0800
commit6f3c3ba784f80bcde8d1fcd20588d022983aee66 (patch)
treebe059f17085ebddf6dfb16b1214cdbfa0740d2dd
parent864b92cd25d70bb623d43dbe3b28488c93885e61 (diff)
parent10fffd7ae67a7960491f21bd845e19e40cc3ec9a (diff)
downloadrails-6f3c3ba784f80bcde8d1fcd20588d022983aee66.tar.gz
rails-6f3c3ba784f80bcde8d1fcd20588d022983aee66.tar.bz2
rails-6f3c3ba784f80bcde8d1fcd20588d022983aee66.zip
Merge pull request #13287 from aayushkhandelwal11/typo_rectified
typos rectified lifecycle => life cycle
-rw-r--r--activemodel/lib/active_model/validator.rb2
-rw-r--r--activesupport/lib/active_support/callbacks.rb6
-rw-r--r--guides/source/active_record_callbacks.md2
3 files changed, 5 insertions, 5 deletions
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index 690856aee1..aad5ff480b 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -61,7 +61,7 @@ module ActiveModel
# end
#
# Note that the validator is initialized only once for the whole application
- # lifecycle, and not on each validation run.
+ # life cycle, and not on each validation run.
#
# The easiest way to add custom validators for validating individual attributes
# is with the convenient <tt>ActiveModel::EachValidator</tt>.
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 02adba50a3..3052e5011c 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -7,14 +7,14 @@ require 'active_support/core_ext/kernel/singleton_class'
require 'thread'
module ActiveSupport
- # Callbacks are code hooks that are run at key points in an object's lifecycle.
+ # Callbacks are code hooks that are run at key points in an object's life cycle.
# The typical use case is to have a base class define a set of callbacks
# relevant to the other functionality it supplies, so that subclasses can
# install callbacks that enhance or modify the base functionality without
# needing to override or redefine methods of the base class.
#
# Mixing in this module allows you to define the events in the object's
- # lifecycle that will support callbacks (via +ClassMethods.define_callbacks+),
+ # life cycle that will support callbacks (via +ClassMethods.define_callbacks+),
# set the instance methods, procs, or callback objects to be called (via
# +ClassMethods.set_callback+), and run the installed callbacks at the
# appropriate times (via +run_callbacks+).
@@ -648,7 +648,7 @@ module ActiveSupport
self.set_callbacks name, callbacks.dup.clear
end
- # Define sets of events in the object lifecycle that support callbacks.
+ # Define sets of events in the object life cycle that support callbacks.
#
# define_callbacks :validate
# define_callbacks :initialize, :save, :destroy
diff --git a/guides/source/active_record_callbacks.md b/guides/source/active_record_callbacks.md
index 863da3be72..ece18a0a53 100644
--- a/guides/source/active_record_callbacks.md
+++ b/guides/source/active_record_callbacks.md
@@ -55,7 +55,7 @@ class User < ActiveRecord::Base
end
```
-Callbacks can also be registered to only fire on certain lifecycle events:
+Callbacks can also be registered to only fire on certain life cycle events:
```ruby
class User < ActiveRecord::Base