Fix typos (closes #10378)

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8301 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

24 files changed, 35 insertions, 35 deletions

diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index ab46b1bfae..64db41207f 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -29,7 +29,7 @@ Rake::TestTask.new { |t|
 }
 
 
-# Genereate the RDoc documentation
+# Generate the RDoc documentation
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index ee4ad5c5ae..5b9a2b71f2 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -16,7 +16,7 @@ module ActionController #:nodoc:
   #   assert flash.empty? # makes sure that there's nothing in the flash
   #
   # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
-  # appease our yearning for symbols, though, an alternative accessor has been deviced using a method call instead of index referencing.
+  # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
   # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
   #
   # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index b9fd25aa8f..379e88b9c5 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -164,7 +164,7 @@ module ActionController #:nodoc:
   # For removing objects from the session, you can either assign a single key to nil, like <tt>session[:person] = nil</tt>, or you can
   # remove the entire session with reset_session.
   #
-  # Sessions are stored in a browser cookie that's crytographically signed, but unencrypted, by default. This prevents
+  # Sessions are stored in a browser cookie that's cryptographically signed, but unencrypted, by default. This prevents
   # the user from tampering with the session but also allows him to see its contents.
   #
   # Do not put secret information in session!
@@ -293,7 +293,7 @@ module ActionController #:nodoc:
     # The param_parsers hash lets you register handlers which will process the http body and add parameters to the
     # <tt>params</tt> hash. These handlers are invoked for post and put requests.
     #
-    # By default application/xml is enabled. A XmlSimple class with the same param name as the root will be instanciated
+    # By default application/xml is enabled. A XmlSimple class with the same param name as the root will be instantiated
     # in the <tt>params</tt>. This allows XML requests to mask themselves as regular form submissions, so you can have one
     # action serve both regular forms and web service requests.
     #
@@ -454,10 +454,10 @@ module ActionController #:nodoc:
         view_paths.push(*path)
       end
       
-      # Replace sensitive paramater data from the request log.
-      # Filters paramaters that have any of the arguments as a substring.
+      # Replace sensitive parameter data from the request log.
+      # Filters parameters that have any of the arguments as a substring.
       # Looks in all subhashes of the param hash for keys to filter.
-      # If a block is given, each key and value of the paramater hash and all
+      # If a block is given, each key and value of the parameter hash and all
       # subhashes is passed to it, the value or key
       # can be replaced using String#replace or similar method.
       #
@@ -590,7 +590,7 @@ module ActionController #:nodoc:
       # However, you might ask why the action from the current request, 'contacts', isn't carried over into the new URL. The
       # answer has to do with the order in which the parameters appear in the generated path. In a nutshell, since the
       # value that appears in the slot for <tt>:first</tt> is not equal to default value for <tt>:first</tt> we stop using
-      # defaults. On it's own, this rule can account for much of the typical Rails URL behavior.
+      # defaults. On its own, this rule can account for much of the typical Rails URL behavior.
       #  
       # Although a convenience, defaults can occasionally get in your way. In some cases a default persists longer than desired.
       # The default may be cleared by adding <tt>:name => nil</tt> to <tt>url_for</tt>'s options.
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index c245fe2326..cbe0ea6587 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -70,7 +70,7 @@ module ActionController #:nodoc:
     # no layout explicitly assigned with the +layout+ method. Nested controllers use the same folder structure for automatic layout.
     # assignment. So an Admin::WeblogController will look for a template named <tt>app/views/layouts/admin/weblog.erb</tt>.
     # Setting a layout explicitly will always override the automatic behaviour for the controller where the layout is set.
-    # Explicitly setting the layout in a parent class, though, will not override the child class's layout assignement if the child
+    # Explicitly setting the layout in a parent class, though, will not override the child class's layout assignment if the child
     # class has a layout with the same name. 
     #
     # == Inheritance for layouts
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index 454d593df7..46611b7c00 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -227,7 +227,7 @@ module ActionController #:nodoc:
           # assume they should exist at this point. An early raised exception
           # could trigger some other handler and the array could include
           # precisely a string whose corresponding constant has not yet been
-          # seen. This is why we are tolerant to unkown constants.
+          # seen. This is why we are tolerant to unknown constants.
           #
           # Note that this tolerance only matters if the exception was given as
           # a string, otherwise a NameError will be raised by the interpreter
diff --git a/actionpack/lib/action_controller/routing_optimisation.rb b/actionpack/lib/action_controller/routing_optimisation.rb
index 3669f5c950..ba4aeb4e82 100644
--- a/actionpack/lib/action_controller/routing_optimisation.rb
+++ b/actionpack/lib/action_controller/routing_optimisation.rb
@@ -8,7 +8,7 @@ module ActionController
     # :requirements, we can just build up a string and return it.
     # 
     # To support building optimisations for other common cases, the 
-    # generation code is seperated into several classes 
+    # generation code is separated into several classes 
     module Optimisation
       def generate_optimisation_block(route, kind)
         return "" unless route.optimise?
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index da8ebb06dd..90e511dcc0 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -356,7 +356,7 @@ module ActionView
       #
       # ==== Options
       # You can add HTML attributes using the +options+. The +options+ supports
-      # three additional keys for convienence and conformance:
+      # three additional keys for convenience and conformance:
       #
       # * <tt>:alt</tt>  - If no alt text is given, the file name part of the
       #   +source+ is used (capitalized and without the extension)
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 97b77bd165..734156b474 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -213,7 +213,7 @@ module ActionView
       # Returns a set of html select-tags (one for year, month, day, hour, and minute) pre-selected with the +datetime+.
       # It's also possible to explicitly set the order of the tags using the <tt>:order</tt> option with an array of
       # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not supply a Symbol, it
-      # will be appened onto the <tt>:order</tt> passed in. You can also add <tt>:date_separator</tt> and <tt>:time_separator</tt>
+      # will be appended onto the <tt>:order</tt> passed in. You can also add <tt>:date_separator</tt> and <tt>:time_separator</tt>
       # keys to the +options+ to control visual display of the elements.
       #
       # ==== Examples
@@ -226,7 +226,7 @@ module ActionView
       #   select_datetime()
       #
       #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
-      #   # with the fields ordered year, month, day rather then month, day, year.
+      #   # with the fields ordered year, month, day rather than month, day, year.
       #   select_datetime(my_date_time, :order => [:year, :month, :day])
       #
       #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
@@ -249,7 +249,7 @@ module ActionView
       # Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+.
       # It's possible to explicitly set the order of the tags using the <tt>:order</tt> option with an array of
       # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not supply a Symbol, it
-      # will be appened onto the <tt>:order</tt> passed in.
+      # will be appended onto the <tt>:order</tt> passed in.
       #
       # ==== Examples
       #   my_date = Time.today + 6.days
@@ -261,7 +261,7 @@ module ActionView
       #   select_date()
       #
       #   # Generates a date select that defaults to the date in my_date (six days after today)
-      #   # with the fields ordered year, month, day rather then month, day, year.
+      #   # with the fields ordered year, month, day rather than month, day, year.
       #   select_date(my_date, :order => [:year, :month, :day])
       #
       #   # Generates a date select that discards the type of the field and defaults to the date in 
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 0b76f1a48f..8ea5d20ed6 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -21,7 +21,7 @@ module ActionView
       #  number_to_phone(1235551234, :area_code => true, :extension => 555) # => (123) 555-1234 x 555
       #  number_to_phone(1235551234, :country_code => 1)                    # => +1-123-555-1234
       #
-      #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimeter => ".")
+      #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
       #  => +1.123.555.1234 x 1343      
       def number_to_phone(number, options = {})
         number       = number.to_s.strip unless number.nil?
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index ddd09de352..eb3391180e 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -331,7 +331,7 @@ module ActionView
       # also used as the name of the link unless +name+ is specified. Additional
       # HTML attributes for the link can be passed in +html_options+.
       #
-      # mail_to has several methods for hindering email harvestors and customizing
+      # mail_to has several methods for hindering email harvesters and customizing
       # the email itself by passing special keys to +html_options+.
       #
       # ==== Options
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index e784244c88..8f3709de3d 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -882,14 +882,14 @@ class DynamicSegmentTest < Test::Unit::TestCase
   end
   
   def test_build_pattern_non_optional_with_no_captures
-    # Non optioanl
+    # Non optional
     a_segment = ROUTING::DynamicSegment.new
     a_segment.regexp = /\d+/ #number_of_captures is 0
     assert_equal "(\\d+)stuff", a_segment.build_pattern('stuff')
   end
 
   def test_build_pattern_non_optional_with_captures
-    # Non optioanl
+    # Non optional
     a_segment = ROUTING::DynamicSegment.new
     a_segment.regexp = /(\d+)(.*?)/ #number_of_captures is 2
     assert_equal "((\\d+)(.*?))stuff", a_segment.build_pattern('stuff')
diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb
index 6ae46594ae..ca106ba236 100644
--- a/actionpack/test/controller/selector_test.rb
+++ b/actionpack/test/controller/selector_test.rb
@@ -85,11 +85,11 @@ class SelectorTest < Test::Unit::TestCase
     assert_equal 2, @matches.size
     assert_equal "2", @matches[0].attributes["id"]
     assert_equal "3", @matches[1].attributes["id"]
-    # Match alement with attribute value.
+    # Match element with attribute value.
     select("*[title=foo]")
     assert_equal 1, @matches.size
     assert_equal "3", @matches[0].attributes["id"]
-    # Match alement with attribute and attribute value.
+    # Match element with attribute and attribute value.
     select("[bar=foo][title]")
     assert_equal 1, @matches.size
     assert_equal "2", @matches[0].attributes["id"]
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 8fbe980eec..9b90d69e95 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -214,7 +214,7 @@ XML
   def test_assert_tag_descendant
     process :test_html_output
 
-    # there is a tag with a decendant 'li' tag
+    # there is a tag with a descendant 'li' tag
     assert_tag :descendant => { :tag => "li" }
     # there is no tag with a descendant 'html' tag
     assert_no_tag :descendant => { :tag => "html" }
diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb
index c227893765..6fef668e1a 100644
--- a/activerecord/lib/active_record/aggregations.rb
+++ b/activerecord/lib/active_record/aggregations.rb
@@ -123,7 +123,7 @@ module ActiveRecord
       #   This defaults to +false+.
       #
       # An optional block can be passed to convert the argument that is passed to the writer method into an instance of
-      # <tt>:class_name</tt>. The block will only be called if the arguement is not already an instance of <tt>:class_name</tt>.
+      # <tt>:class_name</tt>. The block will only be called if the argument is not already an instance of <tt>:class_name</tt>.
       #
       # Option examples:
       #   composed_of :temperature, :mapping => %w(reading celsius)
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index e9a1eb67b9..16cc4773cd 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -266,7 +266,7 @@ module ActiveRecord
     #
     # === Association callbacks
     #
-    # Similiar to the normal callbacks that hook into the lifecycle of an Active Record object, you can also define callbacks that get
+    # Similar to the normal callbacks that hook into the lifecycle of an Active Record object, you can also define callbacks that get
     # triggered when you add an object to or remove an object from an association collection. Example:
     #
     #   class Project
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 2d06e90416..06b1276860 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -120,7 +120,7 @@ module ActiveRecord
       def count(*args)
         column_name, options = @reflection.klass.send(:construct_count_options_from_args, *args)
         if @reflection.options[:uniq]
-          # This is needed becase 'SELECT count(DISTINCT *)..' is not valid sql statement.
+          # This is needed because 'SELECT count(DISTINCT *)..' is not valid sql statement.
           column_name = "#{@reflection.klass.table_name}.#{@reflection.klass.primary_key}" if column_name == :all
           options.merge!(:distinct => true) 
         end
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index 118b596591..dd26c1f749 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -79,7 +79,7 @@ module ActiveRecord
         end
       end
 
-      # Check to see if the method is defined in the model or any of it's subclasses that also derive from ActiveRecord.
+      # Check to see if the method is defined in the model or any of its subclasses that also derive from ActiveRecord.
       # Raise DangerousAttributeError if the method is defined by ActiveRecord though.
       def instance_method_already_implemented?(method_name)
         return true if method_name =~ /^id(=$|\?$|$)/
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index c8807f6f64..9a9bf28323 100755
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -164,7 +164,7 @@ module ActiveRecord
   # If <tt>Base#save!</tt> is called it will raise a +RecordNotSaved+ exception.
   # Nothing will be appended to the errors object.
   #
-  # == Cancelling callbacks
+  # == Canceling callbacks
   #
   # If a <tt>before_*</tt> callback returns +false+, all the later callbacks and the associated action are cancelled. If an <tt>after_*</tt> callback returns
   # +false+, all the later callbacks are cancelled. Callbacks are generally run in the order they are defined, with the exception of callbacks
diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb
index 263aba7747..a694cbfe72 100755
--- a/activerecord/test/validations_test.rb
+++ b/activerecord/test/validations_test.rb
@@ -367,7 +367,7 @@ class ValidationsTest < Test::Unit::TestCase
     assert !r2.valid?, "Saving r2"
 
     # Should succeed as validates_uniqueness_of only applies to
-    # UniqueReply and it's subclasses
+    # UniqueReply and its subclasses
     r3 = t.replies.create "title" => "r2", "content" => "a barrel of fun"
     assert r3.valid?, "Saving r3"
   end
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 8f72294838..2c84329178 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -4,7 +4,7 @@ module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Array #:nodoc:
       module Conversions
-        # Converts the array to comma-seperated sentence where the last element is joined by the connector word. Options:
+        # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
         # * <tt>:connector</tt> - The word used to join the last element in arrays with two or more elements (default: "and")
         # * <tt>:skip_last_comma</tt> - Set to true to return "a, b and c" instead of "a, b, and c".
         def to_sentence(options = {})
diff --git a/activesupport/test/multibyte_handler_test.rb b/activesupport/test/multibyte_handler_test.rb
index 77b125641d..3384a1a0d4 100644
--- a/activesupport/test/multibyte_handler_test.rb
+++ b/activesupport/test/multibyte_handler_test.rb
@@ -69,7 +69,7 @@ module UTF8HandlingTest
     assert_raise(ActiveSupport::Multibyte::Handlers::EncodingError) { @handler.normalize(@bytestring) }
   end
   
-  # Test for the Public Review Issue #29, bad explaination of composition might lead to a
+  # Test for the Public Review Issue #29, bad explanation of composition might lead to a
   # bad implementation: http://www.unicode.org/review/pr-29.html
   def test_normalization_C_pri_29
     [
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index ab6549164c..4b522e2920 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -176,7 +176,7 @@ module Rails
     #
     # In the default implementation, as each plugin discovered in <tt>plugin_paths</tt> is initialized:
     # * its +lib+ directory, if present, is added to the load path (immediately after the applications lib directory)
-    # * <tt>init.rb</tt> is evalutated, if present
+    # * <tt>init.rb</tt> is evaluated, if present
     #
     # After all plugins are loaded, duplicates are removed from the load path.
     # If an array of plugin names is specified in config.plugins, only those plugins will be loaded
@@ -217,7 +217,7 @@ module Rails
       end
     end
 
-    # This initialzation sets $KCODE to 'u' to enable the multibyte safe operations.
+    # 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+ on ActionController::Base
     def initialize_encoding
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index dcc62d50b6..438afa4d32 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -10,7 +10,7 @@ module Rails
       # all plugins, and adds all plugin load paths, when it is created. The plugins
       # are then fully loaded (init.rb is evaluated) when load_plugins is called.
       #
-      # It is the loader's responsibilty to ensure that only the plugins specified
+      # It is the loader's responsibility to ensure that only the plugins specified
       # in the configuration are actually loaded, and that the order defined
       # is respected.
       def initialize(initializer)
diff --git a/railties/test/generators/generator_test_helper.rb b/railties/test/generators/generator_test_helper.rb
index be23f5c6eb..63780b3dfb 100644
--- a/railties/test/generators/generator_test_helper.rb
+++ b/railties/test/generators/generator_test_helper.rb
@@ -1,5 +1,5 @@
 module GeneratorTestHelper
-  # Instatiates the Generator
+  # Instantiates the Generator
   def build_generator(name,params)
     Rails::Generator::Base.instance(name,params)
   end