diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-14 23:15:23 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-14 23:15:23 +0200 |
| commit | 13f7f89bda503ccb1abc8dc78fbe36c44d902c49 (patch) | |
| tree | 5359a0c9b0d21e4b1b2e44239db6457b6e21c4e5 /actionpack | |
| parent | 01ab6f961bff150d50c99f03fa3946f48ac29b17 (diff) | |
| parent | cfb1ba023b11f82d776f9744ddbe7c826c8d7fbc (diff) | |
| download | rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.tar.gz rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.tar.bz2 rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.zip | |
Merge branch 'master' of git://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 8930c13a68..a5e37172c9 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -66,7 +66,7 @@ module ActionController # Examples: # expires_in 20.minutes # expires_in 3.hours, :public => true - # expires in 3.hours, 'max-stale' => 5.hours, :public => 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. |