Skip to content

Commit

Permalink
Consistently markup etag options.
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenharman committed Sep 16, 2014
1 parent 2210521 commit 6c941ea
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions actionpack/lib/action_controller/metal/conditional_get.rb
Expand Up @@ -32,7 +32,7 @@ def etag(&etagger)
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:
Expand All @@ -58,7 +58,7 @@ def etag(&etagger)
# 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])
Expand Down Expand Up @@ -124,7 +124,7 @@ def fresh_when(record_or_options, additional_options = {})
# 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])
Expand Down

0 comments on commit 6c941ea

Please sign in to comment.