diff options
| author | Robin Dupret <robin.dupret@gmail.com> | 2015-07-13 22:41:45 +0200 |
|---|---|---|
| committer | Robin Dupret <robin.dupret@gmail.com> | 2015-07-13 22:41:45 +0200 |
| commit | 48609420b814a66d263e19dd95064186de57cc40 (patch) | |
| tree | cce6367d028bdb1a79bb794ce668eb3f6da9eb8d | |
| parent | 0e8c04529159522aadbfe4fe71ea3d326df07d52 (diff) | |
| parent | 89a55edd59ef23029fac3ceb9dbefc60505b8d89 (diff) | |
| download | rails-48609420b814a66d263e19dd95064186de57cc40.tar.gz rails-48609420b814a66d263e19dd95064186de57cc40.tar.bz2 rails-48609420b814a66d263e19dd95064186de57cc40.zip | |
Merge pull request #20736 from antoine-lizee/docs
[ci skip] docs: making clear that perform_caching has a limited impact
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 | ||||
| -rw-r--r-- | guides/source/caching_with_rails.md | 5 | ||||
| -rw-r--r-- | guides/source/configuring.md | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index de85e0c1a7..a4e4992cfe 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -8,7 +8,7 @@ module ActionController # # You can read more about each approach by clicking the modules below. # - # Note: To turn off all caching, set + # Note: To turn off all caching provided by Action Controller, set # config.action_controller.perform_caching = false # # == \Caching stores diff --git a/guides/source/caching_with_rails.md b/guides/source/caching_with_rails.md index d6ad8f7db3..20f11c2bc2 100644 --- a/guides/source/caching_with_rails.md +++ b/guides/source/caching_with_rails.md @@ -31,6 +31,11 @@ the relevant `config/environments/*.rb` file: config.action_controller.perform_caching = true ``` +NOTE: Changing the value of `config.action_controller.perform_caching` will +only have an effect on the caching provided by the Action Controller component. +For instance, it will not impact low-level caching, that we address +[below](#low-level-caching). + ### Page Caching Page caching is a Rails mechanism which allows the request for a generated page diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 79a80de3cc..167cc549e2 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -326,7 +326,7 @@ The schema dumper adds one additional configuration option: * `config.action_controller.asset_host` sets the host for the assets. Useful when CDNs are used for hosting assets rather than the application server itself. -* `config.action_controller.perform_caching` configures whether the application should perform caching or not. Set to false in development mode, true in production. +* `config.action_controller.perform_caching` configures whether the application should perform the caching features provided by the Action Controller component or not. Set to false in development mode, true in production. * `config.action_controller.default_static_extension` configures the extension used for cached pages. Defaults to `.html`. |