Merge branch 'master' of git://github.com/rails/rails

2 files changed, 2 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/base/http_authentication.rb b/actionpack/lib/action_controller/base/http_authentication.rb
index 2519f55269..525787bf92 100644
--- a/actionpack/lib/action_controller/base/http_authentication.rb
+++ b/actionpack/lib/action_controller/base/http_authentication.rb
@@ -276,7 +276,7 @@ module ActionController
       #
       # The nonce is opaque to the client. Composed of Time, and hash of Time with secret
       # key from the Rails session secret generated upon creation of project. Ensures
-      # the time cannot be modifed by client.
+      # the time cannot be modified by client.
       def nonce(time = Time.now)
         t = time.to_i
         hashed = [t, secret_key]
diff --git a/actionpack/lib/action_controller/base/request_forgery_protection.rb b/actionpack/lib/action_controller/base/request_forgery_protection.rb
index 6ba86cd0be..ad06657f86 100644
--- a/actionpack/lib/action_controller/base/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/base/request_forgery_protection.rb
@@ -106,8 +106,7 @@ module ActionController #:nodoc:
         !request.content_type.nil? && request.content_type.verify_request?
       end
     
-      # Sets the token value for the current session.  Pass a <tt>:secret</tt> option
-      # in +protect_from_forgery+ to add a custom salt to the hash.
+      # Sets the token value for the current session.
       def form_authenticity_token
         session[:_csrf_token] ||= ActiveSupport::SecureRandom.base64(32)
       end