aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorHendy Tanata <htanata@gmail.com>2014-08-08 14:25:18 -0700
committerHendy Tanata <htanata@gmail.com>2014-08-08 14:27:05 -0700
commit71c7fd101324046995d8f7e51e78475c0e37ec1a (patch)
tree4b365cf8c86cb4abea975b1765c4b9edd0027297 /actionpack
parenta9a6423fd654ee2ad8f1c6bfb63bd169880c9a0c (diff)
downloadrails-71c7fd101324046995d8f7e51e78475c0e37ec1a.tar.gz
rails-71c7fd101324046995d8f7e51e78475c0e37ec1a.tar.bz2
rails-71c7fd101324046995d8f7e51e78475c0e37ec1a.zip
Uppercase HTML in docs.
[skip ci]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb14
-rw-r--r--actionpack/lib/action_controller/metal/request_forgery_protection.rb4
-rw-r--r--actionpack/lib/action_dispatch/middleware/public_exceptions.rb2
3 files changed, 10 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 00e7e980f8..e323f19ca0 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -285,7 +285,7 @@ module ActionController #:nodoc:
# e.g. <tt>index.html.erb</tt>. If no template is available, the behavior
# depends on the selected format:
#
- # * for an html response - if the request method is +get+, an exception
+ # * for an HTML response - if the request method is +get+, an exception
# is raised but for other requests such as +post+ the response
# depends on whether the resource has any validation errors (i.e.
# assuming that an attempt has been made to save the resource,
@@ -334,12 +334,12 @@ module ActionController #:nodoc:
#
# As outlined above, the +resources+ argument passed to +respond_with+
# can play two roles. It can be used to generate the redirect url
- # for successful html requests (e.g. for +create+ actions when
- # no template exists), while for formats other than html and JavaScript
+ # for successful HTML requests (e.g. for +create+ actions when
+ # no template exists), while for formats other than HTML and JavaScript
# it is the object that gets rendered, by being converted directly to the
# required format (again assuming no template exists).
#
- # For redirecting successful html requests, +respond_with+ also supports
+ # For redirecting successful HTML requests, +respond_with+ also supports
# the use of nested resources, which are supplied in the same way as
# in <code>form_for</code> and <code>polymorphic_url</code>. For example -
#
@@ -351,7 +351,7 @@ module ActionController #:nodoc:
# end
#
# This would cause +respond_with+ to redirect to <code>project_task_url</code>
- # instead of <code>task_url</code>. For request formats other than html or
+ # instead of <code>task_url</code>. For request formats other than HTML or
# JavaScript, if multiple resources are passed in this way, it is the last
# one specified that is rendered.
#
@@ -384,9 +384,9 @@ module ActionController #:nodoc:
#
# Two additional options are relevant specifically to +respond_with+ -
# 1. <tt>:location</tt> - overwrites the default redirect location used after
- # a successful html +post+ request.
+ # a successful HTML +post+ request.
# 2. <tt>:action</tt> - overwrites the default render action used after an
- # unsuccessful html +post+ request.
+ # unsuccessful HTML +post+ request.
def respond_with(*resources, &block)
if self.class.mimes_for_respond_to.empty?
raise "In order to use respond_with, first you need to declare the " \
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 0efa0fb259..7afbd767ce 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -9,7 +9,7 @@ module ActionController #:nodoc:
end
# Controller actions are protected from Cross-Site Request Forgery (CSRF) attacks
- # by including a token in the rendered html for your application. This token is
+ # by including a token in the rendered HTML for your application. This token is
# stored as a random string in the session, to which an attacker does not have
# access. When a request reaches your application, \Rails verifies the received
# token with the token in the session. Only HTML and JavaScript requests are checked,
@@ -44,7 +44,7 @@ module ActionController #:nodoc:
#
# The token parameter is named <tt>authenticity_token</tt> by default. The name and
# value of this token must be added to every layout that renders forms by including
- # <tt>csrf_meta_tags</tt> in the html +head+.
+ # <tt>csrf_meta_tags</tt> in the HTML +head+.
#
# Learn more about CSRF attacks and securing your application in the
# {Ruby on Rails Security Guide}[http://guides.rubyonrails.org/security.html].
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
index 3664e38af9..040cb215b7 100644
--- a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
@@ -1,5 +1,5 @@
module ActionDispatch
- # When called, this middleware renders an error page. By default if an html
+ # When called, this middleware renders an error page. By default if an HTML
# response is expected it will render static error pages from the `/public`
# directory. For example when this middleware receives a 500 response it will
# render the template found in `/public/500.html`.