aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorRizwan Reza <rizwanreza@gmail.com>2010-06-15 22:21:39 +0430
committerRizwan Reza <rizwanreza@gmail.com>2010-06-15 22:21:39 +0430
commit596300ac8a2a4be3e2c793f532d8f2ba7c602749 (patch)
treea3ce3f3cf71000b594c50c95dbd03c8e5b1f1898 /activemodel/lib
parent3ae67fbebb96b7e5bf806680642345c86952959d (diff)
parent89b96c03132156f0d08b2a65d330e50cfbe94910 (diff)
downloadrails-596300ac8a2a4be3e2c793f532d8f2ba7c602749.tar.gz
rails-596300ac8a2a4be3e2c793f532d8f2ba7c602749.tar.bz2
rails-596300ac8a2a4be3e2c793f532d8f2ba7c602749.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/lint.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb
index a5977bf3cc..fe650053d9 100644
--- a/activemodel/lib/active_model/lint.rb
+++ b/activemodel/lib/active_model/lint.rb
@@ -56,7 +56,7 @@ module ActiveModel
# Returns a boolean that specifies whether the object has been persisted yet.
# This is used when calculating the URL for an object. If the object is
# not persisted, a form for that object, for instance, will be POSTed to the
- # collection. If it is persisted, a form for the object will put PUTed to the
+ # collection. If it is persisted, a form for the object will be PUT to the
# URL for the object.
def test_persisted?
assert model.respond_to?(:persisted?), "The model should respond to persisted?"
@@ -65,7 +65,7 @@ module ActiveModel
# == Naming
#
- # Model.model_name must returns a string with some convenience methods as
+ # Model.model_name must return a string with some convenience methods as
# :human and :partial_path. Check ActiveModel::Naming for more information.
#
def test_model_naming