aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-07-13 22:41:45 +0200
committerRobin Dupret <robin.dupret@gmail.com>2015-07-13 22:41:45 +0200
commit48609420b814a66d263e19dd95064186de57cc40 (patch)
treecce6367d028bdb1a79bb794ce668eb3f6da9eb8d /guides
parent0e8c04529159522aadbfe4fe71ea3d326df07d52 (diff)
parent89a55edd59ef23029fac3ceb9dbefc60505b8d89 (diff)
downloadrails-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
Diffstat (limited to 'guides')
-rw-r--r--guides/source/caching_with_rails.md5
-rw-r--r--guides/source/configuring.md2
2 files changed, 6 insertions, 1 deletions
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`.