From ccf9577aee86ce1f766c5e8854e0c285dc38f8ac Mon Sep 17 00:00:00 2001
From: Evgeniy Dolzhenko <dolzenko@gmail.com>
Date: Fri, 11 Jun 2010 14:15:34 +0400
Subject: Fix a bunch of minor spelling mistakes

---
 actionpack/lib/action_dispatch/http/mime_type.rb              | 2 +-
 actionpack/lib/action_dispatch/http/parameters.rb             | 2 +-
 actionpack/lib/action_dispatch/http/upload.rb                 | 4 ++--
 actionpack/lib/action_dispatch/middleware/stack.rb            | 2 +-
 actionpack/lib/action_dispatch/testing/assertions/selector.rb | 2 +-
 actionpack/lib/action_dispatch/testing/test_response.rb       | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index d6a805bf3b..c6fc582851 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -60,7 +60,7 @@ module Mime
       def initialize(order, name, q=nil)
         @order = order
         @name = name.strip
-        q ||= 0.0 if @name == Mime::ALL # default wilcard match to end of list
+        q ||= 0.0 if @name == Mime::ALL # default wildcard match to end of list
         @q = ((q || 1.0).to_f * 100).to_i
       end
 
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index bc43414e75..0a37bd7fc1 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -32,7 +32,7 @@ module ActionDispatch
       end
 
     private
-      # Convert nested Hashs to HashWithIndifferentAccess
+      # Convert nested Hash to HashWithIndifferentAccess
       def normalize_parameters(value)
         case value
         when Hash
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index 81d2517304..8ee4b81cdd 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -31,8 +31,8 @@ module ActionDispatch
     end
 
     module Upload
-      # Convert nested Hashs to HashWithIndifferentAccess and replace
-      # file upload hashs with UploadedFile objects
+      # Convert nested Hash to HashWithIndifferentAccess and replace
+      # file upload hash with UploadedFile objects
       def normalize_parameters(value)
         if Hash === value && value.has_key?(:tempfile)
           upload = value[:tempfile]
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 4240e7a5d5..4618f3befc 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -70,7 +70,7 @@ module ActionDispatch
     end
 
     def active
-      ActiveSupport::Deprecation.warn "All middlewares in the chaing are active since the laziness " << 
+      ActiveSupport::Deprecation.warn "All middlewares in the chain are active since the laziness " << 
         "was removed from the middleware stack", caller
     end
 
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 0e82b41590..b490547da7 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -359,7 +359,7 @@ module ActionDispatch
       # position. Possible values are <tt>:top</tt>, <tt>:bottom</tt>, <tt>:before</tt>
       # and <tt>:after</tt>.
       #
-      # Use the argument <tt>:redirect</tt> follwed by a path to check that an statement
+      # Use the argument <tt>:redirect</tt> followed by a path to check that an statement
       # which redirects to the specified path is generated.
       #
       # Using the <tt>:remove</tt> statement, you will be able to pass a block, but it will
diff --git a/actionpack/lib/action_dispatch/testing/test_response.rb b/actionpack/lib/action_dispatch/testing/test_response.rb
index 9a51a32899..44fb1bde99 100644
--- a/actionpack/lib/action_dispatch/testing/test_response.rb
+++ b/actionpack/lib/action_dispatch/testing/test_response.rb
@@ -53,7 +53,7 @@ module ActionDispatch
       # Returns the template of the file which was used to
       # render this response (or nil)
       def rendered
-        ActiveSupport::Deprecation.warn("response.rendered has been deprecated. Use tempate.rendered instead", caller)
+        ActiveSupport::Deprecation.warn("response.rendered has been deprecated. Use template.rendered instead", caller)
         @template.instance_variable_get(:@_rendered)
       end
 
@@ -89,7 +89,7 @@ module ActionDispatch
 
       # A shortcut to the template.assigns
       def template_objects
-        ActiveSupport::Deprecation.warn("response.template_objects has been deprecated. Use tempate.assigns instead", caller)
+        ActiveSupport::Deprecation.warn("response.template_objects has been deprecated. Use template.assigns instead", caller)
         @template.assigns || {}
       end
 
-- 
cgit v1.2.3