diff options
| author | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
| commit | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (patch) | |
| tree | 199ef3554f731c980ea5726e67e34af4ea057c2e /actionpack/lib/action_controller/caching.rb | |
| parent | c8451aeeea200043d8a3e6eae9c49def3a154ddb (diff) | |
| parent | a7ea06b4ebe252e258f83e7de945b4baa30ec3bc (diff) | |
| download | rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.gz rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.bz2 rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.zip | |
fix merge conflict with actionpack changelog
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 08cbd13876..c4063dfb4b 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -20,7 +20,8 @@ module ActionController #:nodoc: # # == Caching stores # - # All the caching stores from ActiveSupport::Cache is available to be used as backends for Action Controller caching. + # All the caching stores from ActiveSupport::Cache is available to be used as backends for Action Controller caching. This setting only + # affects action and fragment caching as page caching is always written to disk. # # Configuration examples (MemoryStore is the default): # |