aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
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 /actionpack
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 'actionpack')
-rw-r--r--actionpack/lib/action_controller/caching.rb2
1 files changed, 1 insertions, 1 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