Fix typos (closes #10378)

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

9 files changed, 17 insertions, 17 deletions

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