Corrected some typos and American vs. Queen's English issues

6 files changed, 10 insertions, 10 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 606b01893e..a2d639cd56 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -60,11 +60,11 @@ module ActionDispatch
         assert_response(:redirect, message)
         return true if options == @response.location
 
-        redirected_to_after_normalisation = normalize_argument_to_redirection(@response.location)
-        options_after_normalisation       = normalize_argument_to_redirection(options)
+        redirected_to_after_normalization = normalize_argument_to_redirection(@response.location)
+        options_after_normalization       = normalize_argument_to_redirection(options)
 
-        if redirected_to_after_normalisation != options_after_normalisation
-          flunk "Expected response to be a redirect to <#{options_after_normalisation}> but was a redirect to <#{redirected_to_after_normalisation}>"
+        if redirected_to_after_normalization != options_after_normalization
+          flunk "Expected response to be a redirect to <#{options_after_normalization}> but was a redirect to <#{redirected_to_after_normalization}>"
         end
       end
 
diff --git a/actionpack/test/controller/new_base/base_test.rb b/actionpack/test/controller/new_base/base_test.rb
index 8fa5d20372..ed244513a5 100644
--- a/actionpack/test/controller/new_base/base_test.rb
+++ b/actionpack/test/controller/new_base/base_test.rb
@@ -40,7 +40,7 @@ module Dispatching
     class ContainedEmptyController < ActionController::Base ; end
     class ContainedSubEmptyController < ContainedEmptyController ; end
     class ContainedNonDefaultPathController < ActionController::Base
-      def self.controller_path; "i_am_extremly_not_default"; end
+      def self.controller_path; "i_am_extremely_not_default"; end
     end
   end
 
@@ -89,7 +89,7 @@ module Dispatching
     end
 
     test "namespaced non-default controller path" do
-      assert_equal 'i_am_extremly_not_default', Submodule::ContainedNonDefaultPathController.controller_path
+      assert_equal 'i_am_extremely_not_default', Submodule::ContainedNonDefaultPathController.controller_path
       assert_equal Submodule::ContainedNonDefaultPathController.controller_path, Submodule::ContainedNonDefaultPathController.new.controller_path
     end
 
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index a0a1ff23db..3acfa5f729 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -860,7 +860,7 @@ module ActiveRecord
     # the inverse of each other and the inverse of the +dungeon+ association on +EvilWizard+
     # is the +evil_wizard+ association on +Dungeon+ (and vice-versa). By default,
     # Active Record doesn't know anything about these inverse relationships and so no object
-    # loading optimisation is possible. For example:
+    # loading optimization is possible. For example:
     #
     #    d = Dungeon.first
     #    t = d.traps.first
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index 588f52be44..14db7a6cd6 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -17,7 +17,7 @@ module ActiveRecord
       #   posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
       #
       #   fruits = Fruit.scoped
-      #   fruits = fruits.where(:colour => 'red') if options[:red_only]
+      #   fruits = fruits.where(:color => 'red') if options[:red_only]
       #   fruits = fruits.limit(10) if limited?
       #
       # Anonymous \scopes tend to be useful when procedurally generating complex
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index 62e6999736..19585f6214 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -106,7 +106,7 @@ HEADER
             spec = {}
             spec[:name]      = column.name.inspect
 
-            # AR has an optimisation which handles zero-scale decimals as integers. This
+            # AR has an optimization which handles zero-scale decimals as integers. This
             # code ensures that the dumper still dumps the column as a decimal.
             spec[:type]      = if column.type == :integer && [/^numeric/, /^decimal/].any? { |e| e.match(column.sql_type) }
                                  'decimal'
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 0c272fa093..74730ca01f 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -283,7 +283,7 @@ module ActiveResource
       #     attribute 'name', :string
       #
       #     # or use the convenience methods and pass >=1 attribute names
-      #     string  'eye_colour', 'hair_colour'
+      #     string  'eye_color', 'hair_color'
       #     integer 'age'
       #     float   'height', 'weight'
       #