aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorSteven Harman <steven@harmanly.com>2014-09-16 15:23:24 -0400
committerSteven Harman <steven@harmanly.com>2014-09-16 15:23:24 -0400
commit221052104072dd5a15cac9f50dc2af0a10a883e2 (patch)
tree5592dd459ecd7b14fc7b0a62c46c1f2d7775263d /actionpack/lib/action_controller
parent49f8356f33382cdefa01a3fa2c400583d97f7279 (diff)
downloadrails-221052104072dd5a15cac9f50dc2af0a10a883e2.tar.gz
rails-221052104072dd5a15cac9f50dc2af0a10a883e2.tar.bz2
rails-221052104072dd5a15cac9f50dc2af0a10a883e2.zip
Consistently capitalize ETag.
Diffstat (limited to 'actionpack/lib/action_controller')
-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 a93727df90..f0e3e59282 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -13,9 +13,9 @@ module ActionController
end
module ClassMethods
- # Allows you to consider additional controller-wide information when generating an etag.
+ # Allows you to consider additional controller-wide information when generating an ETag.
# For example, if you serve pages tailored depending on who's logged in at the moment, you
- # may want to add the current user id to be part of the etag to prevent authorized displaying
+ # may want to add the current user id to be part of the ETag to prevent authorized displaying
# of cached pages.
#
# class InvoicesController < ApplicationController
@@ -54,7 +54,7 @@ module ActionController
# fresh_when(etag: @article, last_modified: @article.created_at, public: true)
# end
#
- # This will render the show template if the request isn't sending a matching etag or
+ # This will render the show template if the request isn't sending a matching ETag or
# 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