aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorantoine.lizee <antoine.lizee@gmail.com>2015-06-29 22:22:14 +0200
committerantoine.lizee <antoine.lizee@gmail.com>2015-07-13 11:35:18 -0700
commit89a55edd59ef23029fac3ceb9dbefc60505b8d89 (patch)
tree03305cb05d76251b2f35a08d79280ff9c580fdff /guides/source
parent5aee168e7351bf63e2c9f5a1ad0d43dd7fbe0aba (diff)
downloadrails-89a55edd59ef23029fac3ceb9dbefc60505b8d89.tar.gz
rails-89a55edd59ef23029fac3ceb9dbefc60505b8d89.tar.bz2
rails-89a55edd59ef23029fac3ceb9dbefc60505b8d89.zip
[ci skip] doc: making clear that perform_caching has a limited impact
Diffstat (limited to 'guides/source')
-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 b0103c9af4..a514f89d5f 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 bb6c395c96..496000d637 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`.