diff options
| author | Aditya Sanghi <asanghi@me.com> | 2010-10-17 02:09:47 +0530 |
|---|---|---|
| committer | Aditya Sanghi <asanghi@me.com> | 2010-10-17 02:09:47 +0530 |
| commit | 5a36f9f89d7ea58c36b486411fc887f9fe6dfc63 (patch) | |
| tree | d89eece0f72931a5c1c92d46e31916ef7b85618b /actionpack/lib | |
| parent | 40398a1f47e4fd83c4b5c4346c8ba9685bb0bd2d (diff) | |
| parent | a38e653a6d512de3d22137cebc239d51f2513502 (diff) | |
| download | rails-5a36f9f89d7ea58c36b486411fc887f9fe6dfc63.tar.gz rails-5a36f9f89d7ea58c36b486411fc887f9fe6dfc63.tar.bz2 rails-5a36f9f89d7ea58c36b486411fc887f9fe6dfc63.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib')
| -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. |