diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
| commit | d8f1ee4b41352b870f617b01099b2877f754d32c (patch) | |
| tree | dd6bdf1d1ded6aab7bb926109a24e942fc740b73 /actionpack/lib/action_controller/cookies.rb | |
| parent | 8ba1fc18e13c03966d411947180022c1730e81ff (diff) | |
| parent | 7c0e008973e594ebf53607362c1dfbe34b693600 (diff) | |
| download | rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.gz rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.bz2 rails-d8f1ee4b41352b870f617b01099b2877f754d32c.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/cookies.rb')
| -rw-r--r-- | actionpack/lib/action_controller/cookies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb index 840ceb5abd..ca380e98d0 100644 --- a/actionpack/lib/action_controller/cookies.rb +++ b/actionpack/lib/action_controller/cookies.rb @@ -41,7 +41,7 @@ module ActionController #:nodoc: # * <tt>:expires</tt> - The time at which this cookie expires, as a Time object. # * <tt>:secure</tt> - Whether this cookie is a only transmitted to HTTPS servers. # Default is +false+. - # * <tt>:http_only</tt> - Whether this cookie is accessible via scripting or + # * <tt>:httponly</tt> - Whether this cookie is accessible via scripting or # only HTTP. Defaults to +false+. module Cookies def self.included(base) |