Merge pull request #10883 from ifeelgoods/3-2-stable

The default cache store is :file_store in caching_with_rails.textile

railties/guides/source/caching_with_rails.textile

@@ -301,8 +301,6 @@ config.cache_store = :memory_store, :size => 64.megabytes
 
 If you're running multiple Ruby on Rails server processes (which is the case if you're using mongrel_cluster or Phusion Passenger), then your Rails server process instances won't be able to share cache data with each other. This cache store is not appropriate for large application deployments, but can work well for small, low traffic sites with only a couple of server processes or for development and test environments.
 
-This is the default cache store implementation.
-
 h4. ActiveSupport::Cache::FileStore
 
 This cache store uses the file system to store entries. The path to the directory where the store files will be stored must be specified when initializing the cache.
@@ -315,6 +313,8 @@ With this cache store, multiple server processes on the same host can share a ca
 
 Note that the cache will grow until the disk is full unless you periodically clear out old entries.
 
+This is the default cache store if config.cache_store is not defined and tmp/cache is writable.
+
 h4. ActiveSupport::Cache::MemCacheStore
 
 This cache store uses Danga's +memcached+ server to provide a centralized cache for your application. Rails uses the bundled +memcache-client+ gem by default. This is currently the most popular cache store for production websites. It can be used to provide a single, shared cache cluster with very a high performance and redundancy.