aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/getting_started.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-06-30 23:15:22 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-06-30 23:15:22 +0530
commit6b9d1a0db2f7829509689d244d6a5eda5210401d (patch)
tree2d4920fa5e2f3d8571573d5aee717cac261c53ac /guides/source/getting_started.textile
parent4662c5f4effd829099d647a7a76c7044fcc68121 (diff)
parent32c28e8214940fe6b06043b280e8d342e16eb3c6 (diff)
downloadrails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.gz
rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.bz2
rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: activemodel/lib/active_model/errors.rb
Diffstat (limited to 'guides/source/getting_started.textile')
-rw-r--r--guides/source/getting_started.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/getting_started.textile b/guides/source/getting_started.textile
index 897327a888..07419d11b4 100644
--- a/guides/source/getting_started.textile
+++ b/guides/source/getting_started.textile
@@ -900,7 +900,7 @@ end
</ruby>
The new method, +update_attributes+, is used when you want to update a record
-that already exists, and it accepts an hash containing the attributes
+that already exists, and it accepts a hash containing the attributes
that you want to update. As before, if there was an error updating the
post we want to show the form back to the user.
@@ -1185,7 +1185,7 @@ delete "posts/:id" => "posts#destroy"
That's a lot to type for covering a single *resource*. Fortunately,
Rails provides a +resources+ method which can be used to declare a
-standard REST resource. Here's how +config/routes/rb+ looks after the
+standard REST resource. Here's how +config/routes.rb+ looks after the
cleanup:
<ruby>