aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-03-05 22:46:44 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-03-05 22:46:44 +0530
commitc0a7999115e52272616b8375921119adf5835090 (patch)
tree66a53d441a0e66c0d94f7fc4df1ff860fdea0bf4
parentcf75417f229224fc05257ea6ddaa28a0f1a39d0f (diff)
downloadrails-c0a7999115e52272616b8375921119adf5835090.tar.gz
rails-c0a7999115e52272616b8375921119adf5835090.tar.bz2
rails-c0a7999115e52272616b8375921119adf5835090.zip
minor corrections in AMo::Model docs [ci skip]
-rw-r--r--activemodel/README.rdoc4
-rw-r--r--activemodel/lib/active_model/model.rb6
2 files changed, 5 insertions, 5 deletions
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)