aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-05-03 04:59:49 -0700
committerVijay Dev <vijaydev.cse@gmail.com>2012-05-03 04:59:49 -0700
commitab7b5501c66336a5c67946cc18db7cc2b377d071 (patch)
treedc25c06c24f64362637e1ed30712e97278c91bec /guides
parent5c0cbb3d2f0aa3bf73bb628ea720fa08beb701b6 (diff)
parent7273adabed9a3a7aa04014e50ec0ad077ee364aa (diff)
downloadrails-ab7b5501c66336a5c67946cc18db7cc2b377d071.tar.gz
rails-ab7b5501c66336a5c67946cc18db7cc2b377d071.tar.bz2
rails-ab7b5501c66336a5c67946cc18db7cc2b377d071.zip
Merge pull request #6137 from FLOChip/cache_documentation
cache_store has an extra option of :null_store.
Diffstat (limited to 'guides')
-rw-r--r--guides/source/configuring.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.textile b/guides/source/configuring.textile
index 68426221bf..66e453c3ff 100644
--- a/guides/source/configuring.textile
+++ b/guides/source/configuring.textile
@@ -70,7 +70,7 @@ NOTE. The +config.asset_path+ configuration is ignored if the asset pipeline is
* +config.action_view.cache_template_loading+ controls whether or not templates should be reloaded on each request. Defaults to whatever is set for +config.cache_classes+.
-* +config.cache_store+ configures which cache store to use for Rails caching. Options include one of the symbols +:memory_store+, +:file_store+, +:mem_cache_store+, or an object that implements the cache API. Defaults to +:file_store+ if the directory +tmp/cache+ exists, and to +:memory_store+ otherwise.
+* +config.cache_store+ configures which cache store to use for Rails caching. Options include one of the symbols +:memory_store+, +:file_store+, +:mem_cache_store+, +:null_store+, or an object that implements the cache API. Defaults to +:file_store+ if the directory +tmp/cache+ exists, and to +:memory_store+ otherwise.
* +config.colorize_logging+ specifies whether or not to use ANSI color codes when logging information. Defaults to true.