aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-12-20 00:10:30 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-12-20 00:10:30 +0530
commita3b1105ada3da64acfa3843b164b14b734456a50 (patch)
treeb3af8434bf411419bb0bc51aaac306ffe1451b95 /activemodel/lib/active_model
parent3968870d31dc5ab272b5e77904c45183227696be (diff)
parent4dd8b0b5484289eaa30975dbd45bf7112f43a64a (diff)
downloadrails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.gz
rails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.bz2
rails-a3b1105ada3da64acfa3843b164b14b734456a50.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb2
-rw-r--r--activemodel/lib/active_model/validator.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 8d6d405e96..391442afa7 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -14,7 +14,7 @@ module ActiveModel
class MissingAttributeError < NoMethodError
end
- # == Active \Model Attribute Methods
+ # == Active Model Attribute Methods
#
# <tt>ActiveModel::AttributeMethods</tt> provides a way to add prefixes and
# suffixes to your methods as well as handling the creation of
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index ecb067962f..bddacc8c45 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -109,7 +109,7 @@ module ActiveModel
deprecated_setup(options)
end
- # Return the kind for this validator.
+ # Returns the kind for this validator.
#
# PresenceValidator.new.kind # => :presence
# UniquenessValidator.new.kind # => :uniqueness