aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base
diff options
context:
space:
mode:
authorEvan Farrar <evanfarrar@gmail.com>2009-05-07 12:35:38 -0500
committerEvan Farrar <evanfarrar@gmail.com>2009-05-07 12:35:38 -0500
commita97f3bdfa960738cc12c26a502b00daed3900167 (patch)
tree2387df24932ae01241d5cee438efc45592a877ff /actionpack/lib/action_controller/base
parent1135e29bab052c7f0987d168b989d6621fc85311 (diff)
downloadrails-a97f3bdfa960738cc12c26a502b00daed3900167.tar.gz
rails-a97f3bdfa960738cc12c26a502b00daed3900167.tar.bz2
rails-a97f3bdfa960738cc12c26a502b00daed3900167.zip
Some spelling changes.
Diffstat (limited to 'actionpack/lib/action_controller/base')
-rw-r--r--actionpack/lib/action_controller/base/base.rb2
-rw-r--r--actionpack/lib/action_controller/base/http_authentication.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 14c4339c94..4429b8f0b7 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -330,7 +330,7 @@ module ActionController #:nodoc:
cattr_accessor :use_accept_header
self.use_accept_header = true
- # Controls whether request forgergy protection is turned on or not. Turned off by default only in test mode.
+ # Controls whether request forgery protection is turned on or not. Turned off by default only in test mode.
class_inheritable_accessor :allow_forgery_protection
self.allow_forgery_protection = true
diff --git a/actionpack/lib/action_controller/base/http_authentication.rb b/actionpack/lib/action_controller/base/http_authentication.rb
index b6b5267c66..9219847cd0 100644
--- a/actionpack/lib/action_controller/base/http_authentication.rb
+++ b/actionpack/lib/action_controller/base/http_authentication.rb
@@ -271,7 +271,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]