aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorJamison Dance <jergason@gmail.com>2010-08-26 21:20:22 -0600
committerJamison Dance <jergason@gmail.com>2010-08-26 21:20:22 -0600
commit6398eba2400af004d9db19217f9d43ea7a33d877 (patch)
treef9f0755bbf42a2a86eff5a6b4d9bb46902745bee /activemodel/lib
parent4d8158d9e5ada4aff5dc62712b7c4730b60cde48 (diff)
parent6eed7b36a2ec6f94d9ac3f254b05697649b78881 (diff)
downloadrails-6398eba2400af004d9db19217f9d43ea7a33d877.tar.gz
rails-6398eba2400af004d9db19217f9d43ea7a33d877.tar.bz2
rails-6398eba2400af004d9db19217f9d43ea7a33d877.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/observing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index 62d2694da5..2c2ff8f5d5 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -93,7 +93,7 @@ module ActiveModel
# == Active Model Observers
#
- # Observer classes respond to lifecycle callbacks to implement trigger-like
+ # Observer classes respond to life cycle callbacks to implement trigger-like
# behavior outside the original class. This is a great way to reduce the
# clutter that normally comes when the model class is burdened with
# functionality that doesn't pertain to the core responsibility of the