aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/upgrading_ruby_on_rails.md
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-06-26 22:57:34 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-06-26 22:57:34 +0530
commit317aaa05883c92165cfb8204634b9fd9b976a97b (patch)
treeaf4186590fb1237499f79f0a0102f4d4dccc7a0c /guides/source/upgrading_ruby_on_rails.md
parent342de058c44f6ba93c1cfeeedfc4768ea5325a3a (diff)
parent73b13f7dc908e419a404add8a331436fe5d67708 (diff)
downloadrails-317aaa05883c92165cfb8204634b9fd9b976a97b.tar.gz
rails-317aaa05883c92165cfb8204634b9fd9b976a97b.tar.bz2
rails-317aaa05883c92165cfb8204634b9fd9b976a97b.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: guides/source/layout.html.erb
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 35a9617b80..e7e28e21a3 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -61,7 +61,7 @@ end
```ruby
class UsersController < ApplicationController
def update_name
- # Change needed; form_for will try to use a non-existant PATCH route.
+ # Change needed; form_for will try to use a non-existent PATCH route.
end
end
```