Changed a few instances of of words in the API docs written in British English to

American English(according to Weber)

15 files changed, 26 insertions, 26 deletions

diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 258a40aea6..4d016271ea 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -79,7 +79,7 @@ module ActionController #:nodoc:
         end
       end
 
-      # This is the method that defines the application behaviour when a request is found to be unverified.
+      # This is the method that defines the application behavior when a request is found to be unverified.
       # By default, \Rails resets the session when it finds an unverified request.
       def handle_unverified_request
         reset_session
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 509c29844a..7d01e5ddb8 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -154,7 +154,7 @@ module ActionView
     #     "/release-#{RELEASE_NUMBER}#{asset_path}"
     #   }
     #
-    # This example would cause the following behaviour on all servers no
+    # This example would cause the following behavior on all servers no
     # matter when they were deployed:
     #
     #   image_tag("rails.png")
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 724fe7a518..674eb31b3b 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -259,8 +259,8 @@ module ActionView
       #    :remote => true
       #
       # in the options hash creates a form that will allow the unobtrusive JavaScript drivers to modify its
-      # behaviour. The expected default behaviour is an XMLHttpRequest in the background instead of the regular
-      # POST arrangement, but ultimately the behaviour is the choice of the JavaScript driver implementor.
+      # behavior. The expected default behaviour is an XMLHttpRequest in the background instead of the regular
+      # POST arrangement, but ultimately the behavior is the choice of the JavaScript driver implementor.
       # Even though it's using JavaScript to serialize the form elements, the form submission will work just like
       # a regular submission as viewed by the receiving side (all elements available in <tt>params</tt>).
       #
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 72bc4510b5..988b4cd3f2 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -30,7 +30,7 @@ module ActionView
       #   (by passing <tt>false</tt>).
       # * A list of parameters to feed to the URL the form will be posted to.
       # * <tt>:remote</tt> - If set to true, will allow the Unobtrusive JavaScript drivers to control the
-      #   submit behaviour. By default this behaviour is an ajax submit.
+      #   submit behavior. By default this behaviour is an ajax submit.
       #
       # ==== Examples
       #   form_tag('/posts')
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index d70ae4196b..366ae8f0ab 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -55,8 +55,8 @@ module ActionView
       #
       # ==== Relying on named routes
       #
-      # Passing a record (like an Active Record or Active Resource) instead of a Hash as the options parameter will 
-      # trigger the named route for that record. The lookup will happen on the name of the class. So passing a 
+      # Passing a record (like an Active Record or Active Resource) instead of a Hash as the options parameter will
+      # trigger the named route for that record. The lookup will happen on the name of the class. So passing a
       # Workshop object will attempt to use the +workshop_path+ route. If you have a nested route, such as
       # +admin_workshop_path+ you'll have to call that explicitly (it's impossible for +url_for+ to guess that route).
       #
@@ -113,7 +113,7 @@ module ActionView
       end
 
       # Creates a link tag of the given +name+ using a URL created by the set of +options+.
-      # See the valid options in the documentation for +url_for+. It's also possible to 
+      # See the valid options in the documentation for +url_for+. It's also possible to
       # pass a String instead of an options hash, which generates a link tag that uses the
       # value of the String as the href for the link. Using a <tt>:back</tt> Symbol instead
       # of an options hash will generate a link to the referrer (a JavaScript back link
@@ -278,7 +278,7 @@ module ActionView
       #   prompt with the question specified. If the user accepts, the link is
       #   processed normally, otherwise no action is taken.
       # * <tt>:remote</tt> -  If set to true, will allow the Unobtrusive JavaScript drivers to control the
-      #   submit behaviour. By default this behaviour is an ajax submit.
+      #   submit behavior. By default this behaviour is an ajax submit.
       # * <tt>:form_class</tt> - This controls the class of the form within which the submit button will
       #   be placed
       #
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index d5bd7256f7..e88a3591d8 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -443,7 +443,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_image_tag_windows_behaviour
     old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
-    # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
+    # This simulates the behavior of File#exist? on windows when testing a file ending in "."
     # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
     # OS X, linux etc will return false in this case.
     File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 3e68f973e7..cec876149c 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -382,7 +382,7 @@ module ActiveRecord
 
           persisted.map! do |record|
             # Unfortunately we cannot simply do memory.delete(record) since on 1.8 this returns
-            # record rather than memory.at(memory.index(record)). The behaviour is fixed in 1.9.
+            # record rather than memory.at(memory.index(record)). The behavior is fixed in 1.9.
             mem_index = memory.index(record)
 
             if mem_index
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb
index cd9c358799..3efc8bf559 100644
--- a/activerecord/test/cases/identity_map_test.rb
+++ b/activerecord/test/cases/identity_map_test.rb
@@ -164,7 +164,7 @@ class IdentityMapTest < ActiveRecord::TestCase
   end
 
   ##############################################################################
-  # Tests checking dirty attribute behaviour with IM                           #
+  # Tests checking dirty attribute behavior with IM                            #
   ##############################################################################
 
   def test_loading_new_instance_should_not_update_dirty_attributes
@@ -238,7 +238,7 @@ class IdentityMapTest < ActiveRecord::TestCase
   end
 
   ##############################################################################
-  # Tests checking Identity Map behaviour with preloaded associations, joins,  #
+  # Tests checking Identity Map behavior with preloaded associations, joins,   #
   # includes etc.                                                              #
   ##############################################################################
 
diff --git a/activerecord/test/cases/invalid_date_test.rb b/activerecord/test/cases/invalid_date_test.rb
index 2de50b224c..98cda010ae 100644
--- a/activerecord/test/cases/invalid_date_test.rb
+++ b/activerecord/test/cases/invalid_date_test.rb
@@ -24,9 +24,9 @@ class InvalidDateTest < ActiveRecord::TestCase
         topic = Topic.new({"last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s})
         # Oracle DATE columns are datetime columns and Oracle adapter returns Time value
         if current_adapter?(:OracleAdapter)
-          assert_equal(topic.last_read.to_date, Time.local(*date_src).to_date, "The date should be modified according to the behaviour of the Time object")
+          assert_equal(topic.last_read.to_date, Time.local(*date_src).to_date, "The date should be modified according to the behavior of the Time object")
         else
-          assert_equal(topic.last_read, Time.local(*date_src).to_date, "The date should be modified according to the behaviour of the Time object")
+          assert_equal(topic.last_read, Time.local(*date_src).to_date, "The date should be modified according to the behavior of the Time object")
         end
       end
     end
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 74730ca01f..693bd0592e 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -395,7 +395,7 @@ module ActiveResource
         #   Subclass.site.user = 'david'
         #   Parent.site # => 'http://david@test.com'
         #
-        # Without superclass_delegating_reader (expected behaviour)
+        # Without superclass_delegating_reader (expected behavior)
         #
         #   Parent.site = 'http://anonymous@test.com'
         #   Subclass.site # => 'http://anonymous@test.com'
diff --git a/activeresource/lib/active_resource/http_mock.rb b/activeresource/lib/active_resource/http_mock.rb
index 6167c1420e..36f52d61d3 100644
--- a/activeresource/lib/active_resource/http_mock.rb
+++ b/activeresource/lib/active_resource/http_mock.rb
@@ -149,7 +149,7 @@ module ActiveResource
       # Note, by default, every time you call +respond_to+, any previous request and response pairs stored
       # in HttpMock will be deleted giving you a clean slate to work on.
       #
-      # If you want to override this behaviour, pass in +false+ as the last argument to +respond_to+
+      # If you want to override this behavior, pass in +false+ as the last argument to +respond_to+
       #
       # === Example
       #
diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb
index 41de4d6435..aae1cfccf2 100644
--- a/activesupport/lib/active_support/core_ext/string/multibyte.rb
+++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb
@@ -35,7 +35,7 @@ class String
     # object. Interoperability problems can be resolved easily with a +to_s+ call.
     #
     # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
-    # information about how to change the default Multibyte behaviour see ActiveSupport::Multibyte.
+    # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
     def mb_chars
       if ActiveSupport::Multibyte.proxy_class.consumes?(self)
         ActiveSupport::Multibyte.proxy_class.new(self)
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index da4af339fc..f9505a247c 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -7,12 +7,12 @@ module ActiveSupport
       # Whether to print a backtrace along with the warning.
       attr_accessor :debug
 
-      # Returns the set behaviour or if one isn't set, defaults to +:stderr+
+      # Returns the set behavior or if one isn't set, defaults to +:stderr+
       def behavior
         @behavior ||= [DEFAULT_BEHAVIORS[:stderr]]
       end
 
-      # Sets the behaviour to the specified value. Can be a single value or an array.
+      # Sets the behavior to the specified value. Can be a single value or an array.
       #
       # Examples
       #
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 603ede3d1e..de412553aa 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -15,7 +15,7 @@ require 'action_dispatch/railtie'
 
 # For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
 # multibyte safe operations. Plugin authors supporting other encodings
-# should override this behaviour and set the relevant +default_charset+
+# should override this behavior and set the relevant +default_charset+
 # on ActionController::Base.
 #
 # For Ruby 1.9, UTF-8 is the default internal and external encoding.
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index cb897e94d7..c41f7d7c2e 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -220,7 +220,7 @@ module Rails
   # If an engine is marked as isolated, +FooController+ has access only to helpers from +Engine+ and
   # <tt>url_helpers</tt> from <tt>MyEngine::Engine.routes</tt>.
   #
-  # The next thing that changes in isolated engines is the behaviour of routes. Normally, when you namespace
+  # The next thing that changes in isolated engines is the behavior of routes. Normally, when you namespace
   # your controllers, you also need to do namespace all your routes. With an isolated engine,
   # the namespace is applied by default, so you can ignore it in routes:
   #
@@ -232,7 +232,7 @@ module Rails
   # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you should simply use
   # <tt>articles_path</tt> as you would do with your application.
   #
-  # To make that behaviour consistent with other parts of the framework, an isolated engine also has influence on
+  # To make that behavior consistent with other parts of the framework, an isolated engine also has influence on
   # <tt>ActiveModel::Naming</tt>. When you use a namespaced model, like <tt>MyEngine::Article</tt>, it will normally
   # use the prefix "my_engine". In an isolated engine, the prefix will be omitted in url helpers and
   # form fields for convenience.
@@ -404,15 +404,15 @@ module Rails
       super
       paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
-    
+
     def load_console(app=self)
       railties.all { |r| r.load_console(app) }
       super
     end
-    
+
     def eager_load!
       railties.all(&:eager_load!)
-      
+
       config.eager_load_paths.each do |load_path|
         matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
         Dir.glob("#{load_path}/**/*.rb").sort.each do |file|