diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-22 15:26:03 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-22 15:26:03 +0100 |
| commit | 5f3f100ce2d689480da85abc88e5e940cf90189e (patch) | |
| tree | 15c1a05a5308a9eea56d7f0889ac46d9cac5b57c /actionpack/lib/action_controller/caching.rb | |
| parent | d758d996d1b66e2a65640f79f01ce2ac674d7ed5 (diff) | |
| parent | ca49299434bc764b667cd86846d892e91a150ef3 (diff) | |
| download | rails-5f3f100ce2d689480da85abc88e5e940cf90189e.tar.gz rails-5f3f100ce2d689480da85abc88e5e940cf90189e.tar.bz2 rails-5f3f100ce2d689480da85abc88e5e940cf90189e.zip | |
Merge branch 'master' into active_model
Conflicts:
activeresource/lib/active_resource/validations.rb
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 80d13e25f1..ffd8081edc 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -13,7 +13,7 @@ module ActionController #:nodoc: # # == Caching stores # - # All the caching stores from ActiveSupport::Cache is available to be used as backends for Action Controller caching. This setting only + # All the caching stores from ActiveSupport::Cache are 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): |