aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2016-04-03 16:51:27 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2016-04-03 16:51:27 +0000
commitbdcacc856641b6d2956616e393926e02b422199e (patch)
tree8fb0c5558f8ee1abc4c53ae9a52fd5cafbc3d5f4 /guides/source
parent78f188a2f8e0f2d8bdb1d9ae38acc1d47af17a9d (diff)
parentfc959d6efd9fbbe37fd4bf34abe08680f70d59fa (diff)
downloadrails-bdcacc856641b6d2956616e393926e02b422199e.tar.gz
rails-bdcacc856641b6d2956616e393926e02b422199e.tar.bz2
rails-bdcacc856641b6d2956616e393926e02b422199e.zip
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/action_view_overview.md2
-rw-r--r--guides/source/caching_with_rails.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md
index 46116b1e47..d49df23e4a 100644
--- a/guides/source/action_view_overview.md
+++ b/guides/source/action_view_overview.md
@@ -177,7 +177,7 @@ would produce:
}
```
-See the [Jbuilder documention](https://github.com/rails/jbuilder#jbuilder) for
+See the [Jbuilder documentation](https://github.com/rails/jbuilder#jbuilder) for
more examples and information.
#### Template Caching
diff --git a/guides/source/caching_with_rails.md b/guides/source/caching_with_rails.md
index ebd67a4adb..ec4444eb43 100644
--- a/guides/source/caching_with_rails.md
+++ b/guides/source/caching_with_rails.md
@@ -514,7 +514,7 @@ end
### A note on weak ETags
-Etags generated by Rails are weak by default. Weak etags allow symantically equivalent responses to have the same etags, even if their bodies do not match exactly. This is useful when we don't want the page to be regenerated for minor changes in response body. If you absolutely need to generate a strong etag, it can be assigned to the header directly.
+Etags generated by Rails are weak by default. Weak etags allow semantically equivalent responses to have the same etags, even if their bodies do not match exactly. This is useful when we don't want the page to be regenerated for minor changes in response body. If you absolutely need to generate a strong etag, it can be assigned to the header directly.
```ruby
response.add_header "ETag", Digest::MD5.hexdigest(response.body)