Merge branch 'master' of git://github.com/lifo/docrails

Conflicts:
	activerecord/RUNNING_UNIT_TESTS

3 files changed, 5 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 2ad571b2b5..6d0c163a9e 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -106,7 +106,7 @@ module ActionController
 
       module ControllerMethods
         extend ActiveSupport::Concern
-        
+
         module ClassMethods
           def http_basic_authenticate_with(options = {})
             before_filter(options.except(:name, :password, :realm)) do
@@ -116,7 +116,7 @@ module ActionController
             end
           end
         end
-        
+
         def authenticate_or_request_with_http_basic(realm = "Application", &login_procedure)
           authenticate_with_http_basic(&login_procedure) || request_http_basic_authentication(realm)
         end
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 5500f88930..2d8afc3a78 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -64,7 +64,7 @@ module ActionController
   #     end
   #
   # will try to check if +Admin::User+ or +User+ model exists, and use it to
-  # determine the wrapper key respectively. If both of the model doesn't exists,
+  # determine the wrapper key respectively. If both models don't exist,
   # it will then fallback to use +user+ as the key.
   module ParamsWrapper
     extend ActiveSupport::Concern
@@ -88,14 +88,14 @@ module ActionController
       #     # wraps parameters into +params[:person]+ hash
       #
       #   wrap_parameters Person
-      #     # wraps parameters by determine the wrapper key from Person class
+      #     # wraps parameters by determining the wrapper key from Person class
       #     (+person+, in this case) and the list of attribute names
       #
       #   wrap_parameters :include => [:username, :title]
       #     # wraps only +:username+ and +:title+ attributes from parameters.
       #
       #   wrap_parameters false
-      #     # disable parameters wrapping for this controller altogether.
+      #     # disables parameters wrapping for this controller altogether.
       #
       # ==== Options
       # * <tt>:format</tt> - The list of formats in which the parameters wrapper
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 3892a12407..0bb436a476 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -260,4 +260,3 @@ module ActionController #:nodoc:
     end
   end
 end
-      
\ No newline at end of file