aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-05-20 15:29:25 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-05-20 15:29:25 -0700
commit3b266bcfeaa2268cabf4afa362ea0982b92e5b4c (patch)
tree9310583d29e82e196882311da0416dd664817252
parent378ea96905e5f95be1a413b7bdd6fbb000265129 (diff)
parent743ea1afc676d2941beb5b76728e41a51339c3d0 (diff)
downloadrails-3b266bcfeaa2268cabf4afa362ea0982b92e5b4c.tar.gz
rails-3b266bcfeaa2268cabf4afa362ea0982b92e5b4c.tar.bz2
rails-3b266bcfeaa2268cabf4afa362ea0982b92e5b4c.zip
Merge pull request #10697 from zhubert/patch-1
Spelling correction in Upgrading Guide [ci skip]
-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 694592a9de..6c3e763f53 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -46,7 +46,7 @@ on the Rails blog.
#### A note about media types
-The erratta for the `PATCH` verb [specifies that a 'diff' media type should be
+The errata for the `PATCH` verb [specifies that a 'diff' media type should be
used with `PATCH`](http://www.rfc-editor.org/errata_search.php?rfc=5789). One
such format is [JSON Patch](http://tools.ietf.org/html/rfc6902). While Rails
does not support JSON Patch natively, it's easy enough to add support: