Minor typo fixes

4 files changed, 6 insertions, 6 deletions

diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb
index 36e4c5725f..523f8aed7a 100644
--- a/actionview/lib/action_view/helpers/date_helper.rb
+++ b/actionview/lib/action_view/helpers/date_helper.rb
@@ -115,7 +115,7 @@ module ActionView
                 # e.g. if there are 20 leap year days between 2 dates having the same day
                 # and month then the based on 365 days calculation
                 # the distance in years will come out to over 80 years when in written
-                # english it would read better as about 80 years.
+                # English it would read better as about 80 years.
                 minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
               else
                 minutes_with_offset = distance_in_minutes
diff --git a/actionview/test/actionpack/abstract/layouts_test.rb b/actionview/test/actionpack/abstract/layouts_test.rb
index c79cb50fd7..8a96d434e2 100644
--- a/actionview/test/actionpack/abstract/layouts_test.rb
+++ b/actionview/test/actionpack/abstract/layouts_test.rb
@@ -214,19 +214,19 @@ module AbstractControllerTests
         assert_equal "With String Hello string!", controller.response_body
       end
 
-      test "when layout is overwriten by :default in render, render default layout" do
+      test "when layout is overwritten by :default in render, render default layout" do
         controller = WithString.new
         controller.process(:overwrite_default)
         assert_equal "With String Hello string!", controller.response_body
       end
 
-      test "when layout is overwriten by string in render, render new layout" do
+      test "when layout is overwritten by string in render, render new layout" do
         controller = WithString.new
         controller.process(:overwrite_string)
         assert_equal "Overwrite Hello string!", controller.response_body
       end
 
-      test "when layout is overwriten by false in render, render no layout" do
+      test "when layout is overwritten by false in render, render no layout" do
         controller = WithString.new
         controller.process(:overwrite_false)
         assert_equal "Hello string!", controller.response_body
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 964dccbffb..8c99504050 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -992,7 +992,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
-    @request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, appliction/x-shockwave-flash, */*"
+    @request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, */*"
     get :formatted_xml_erb
     assert_equal '<test>passed formatted html erb</test>', @response.body
   end
diff --git a/actionview/test/template/erb_util_test.rb b/actionview/test/template/erb_util_test.rb
index 3e5b029cea..9a7c617eb3 100644
--- a/actionview/test/template/erb_util_test.rb
+++ b/actionview/test/template/erb_util_test.rb
@@ -31,7 +31,7 @@ class ErbUtilTest < ActiveSupport::TestCase
     assert escaped.html_safe?
   end
 
-  def test_html_escape_passes_html_escpe_unmodified
+  def test_html_escape_passes_html_escape_unmodified
     escaped = h("<p>".html_safe)
     assert_equal "<p>", escaped
     assert escaped.html_safe?