diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-03 22:08:24 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-03 22:08:24 +0530 |
| commit | f9e26940b3f76a80ce0dc9f10fc49061abee6c41 (patch) | |
| tree | 779ed181cd67bb3af0ff704e1af0d620503a85a1 /actionpack | |
| parent | 9975d533059b125bd00ce34c8f4961a4dd6404b5 (diff) | |
| parent | f097f5a51a35598dcf72d62f3bae63663a05182b (diff) | |
| download | rails-f9e26940b3f76a80ce0dc9f10fc49061abee6c41.tar.gz rails-f9e26940b3f76a80ce0dc9f10fc49061abee6c41.tar.bz2 rails-f9e26940b3f76a80ce0dc9f10fc49061abee6c41.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index 2a8e4c575e..5b25a0d303 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -110,8 +110,8 @@ module ActionController # # Examples: # expires_in 20.minutes + # expires_in 3.hours, :public => true # expires_in 3.hours, :public => true, :must_revalidate => true - # expires_in 3.hours, 'max-stale' => 5.hours, :public => true # # This method will overwrite an existing Cache-Control header. # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities. |