aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Harman <steven@harmanly.com>2014-09-16 15:24:24 -0400
committerSteven Harman <steven@harmanly.com>2014-09-16 15:24:24 -0400
commit6c941ea40571acd1e399bf885605ea90c30e1807 (patch)
tree923463c63fa7af784e3097884425c15e6e750de3
parent221052104072dd5a15cac9f50dc2af0a10a883e2 (diff)
downloadrails-6c941ea40571acd1e399bf885605ea90c30e1807.tar.gz
rails-6c941ea40571acd1e399bf885605ea90c30e1807.tar.bz2
rails-6c941ea40571acd1e399bf885605ea90c30e1807.zip
Consistently markup etag options.
-rw-r--r--actionpack/lib/action_controller/metal/conditional_get.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index f0e3e59282..b210ee3423 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -32,7 +32,7 @@ module ActionController
end
end
- # Sets the etag, +last_modified+, or both on the response and renders a
+ # Sets the +etag+, +last_modified+, or both on the response and renders a
# <tt>304 Not Modified</tt> response if the request is already fresh.
#
# === Parameters:
@@ -58,7 +58,7 @@ module ActionController
# If-Modified-Since header and just a <tt>304 Not Modified</tt> response if there's a match.
#
# You can also just pass a record where +last_modified+ will be set by calling
- # +updated_at+ and the etag by passing the object itself.
+ # +updated_at+ and the +etag+ by passing the object itself.
#
# def show
# @article = Article.find(params[:id])
@@ -124,7 +124,7 @@ module ActionController
# end
#
# You can also just pass a record where +last_modified+ will be set by calling
- # updated_at and the etag by passing the object itself.
+ # +updated_at+ and the +etag+ by passing the object itself.
#
# def show
# @article = Article.find(params[:id])