Merge pull request #16155 from mechanicles/fix-typos

[ci skip] Fix typos like `a html` to `an html` and 'an mail' to 'an email'.

actionmailer/lib/action_mailer/base.rb

@@ -394,7 +394,7 @@ module ActionMailer
   #   implement for a custom delivery agent.
   #
   # * <tt>perform_deliveries</tt> - Determines whether emails are actually sent from Action Mailer when you
-  #   call <tt>.deliver</tt> on an mail message or on an Action Mailer method. This is on by default but can
+  #   call <tt>.deliver</tt> on an email message or on an Action Mailer method. This is on by default but can
   #   be turned off to aid in functional testing.
   #
   # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with

actionpack/test/controller/new_base/render_template_test.rb

@@ -9,7 +9,7 @@ class WithoutLayoutController < ActionController::Base
       "locals.html.erb"            => "The secret is <%= secret %>",
       "xml_template.xml.builder"   => "xml.html do\n  xml.p 'Hello'\nend",
       "with_raw.html.erb"          => "Hello <%=raw '<strong>this is raw</strong>' %>",
-      "with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in a html template",
+      "with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in an html template",
       "with_implicit_raw.text.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in a text template",
       "test/with_json.html.erb"    => "<%= render :template => 'test/with_json', :formats => [:json] %>",
       "test/with_json.json.erb"    => "<%= render :template => 'test/final', :formats => [:json]  %>",
@@ -114,7 +114,7 @@ class TestWithoutLayout < Rack::TestCase
 
       get :with_implicit_raw
 
-      assert_body "Hello <strong>this is also raw</strong> in a html template"
+      assert_body "Hello <strong>this is also raw</strong> in an html template"
       assert_status 200
 
       get :with_implicit_raw, format: 'text'

actionview/lib/action_view/helpers/output_safety_helper.rb

@@ -17,7 +17,7 @@ def raw(stringish)
         stringish.to_s.html_safe
       end
 
-      # This method returns a html safe string similar to what <tt>Array#join</tt>
+      # This method returns an html safe string similar to what <tt>Array#join</tt>
       # would return. The array is flattened, and all items, including
       # the supplied separator, are html escaped unless they are html
       # safe, and the returned string is marked as html safe.