diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc index 9b121510a9..4861b0a002 100644 --- a/activemodel/README.rdoc +++ b/activemodel/README.rdoc @@ -28,8 +28,8 @@ to integrate with Action Pack out of the box: +ActiveModel::Model+. person.age # => 18 person.valid? # => false -It includes model name instrospection, conversions, translations and -validations, resulting in a class suitable to be used with ActionPack. +It includes model name introspections, conversions, translations and +validations, resulting in a class suitable to be used with Action Pack. See +ActiveModel::Model+ for more examples. Active Model also provides the following functionality to have ORM-like diff --git a/activemodel/lib/active_model/model.rb b/activemodel/lib/active_model/model.rb index 8445113b64..6825fdc653 100644 --- a/activemodel/lib/active_model/model.rb +++ b/activemodel/lib/active_model/model.rb @@ -3,8 +3,8 @@ module ActiveModel # == Active Model Basic Model # # Includes the required interface for an object to interact with +ActionPack+, - # using different +ActiveModel+ modules. It includes model name instrospection, - # conversions, translations and validations . Besides that, it allows you to + # using different +ActiveModel+ modules. It includes model name introspections, + # conversions, translations and validations. Besides that, it allows you to # initialize the object with a hash of attributes, pretty much like # +ActiveRecord+ does. # @@ -51,7 +51,7 @@ module ActiveModel # person = Person.new(:id => 1, :name => 'bob') # person.omg # => true # - # For more detailed information on other functionality available, please refer + # For more detailed information on other functionalities available, please refer # to the specific modules included in +ActiveModel::Model+ (see below). module Model def self.included(base)