aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorlifo <lifo@null.lan>2009-04-17 14:28:46 +0100
committerlifo <lifo@null.lan>2009-04-17 14:28:46 +0100
commit5b92dcb6757e90da316bd0c7a8472b9fa737f268 (patch)
tree6893d7cff5e18862f2c419588656600a4dec1090 /actionpack/lib/action_controller/caching.rb
parentabb899c54e8777428b7a607774370ba29a5573bd (diff)
downloadrails-5b92dcb6757e90da316bd0c7a8472b9fa737f268.tar.gz
rails-5b92dcb6757e90da316bd0c7a8472b9fa737f268.tar.bz2
rails-5b92dcb6757e90da316bd0c7a8472b9fa737f268.zip
Merge docrails
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-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 80d13e25f1..ffd8081edc 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -13,7 +13,7 @@ module ActionController #:nodoc:
#
# == Caching stores
#
- # All the caching stores from ActiveSupport::Cache is available to be used as backends for Action Controller caching. This setting only
+ # All the caching stores from ActiveSupport::Cache are available to be used as backends for Action Controller caching. This setting only
# affects action and fragment caching as page caching is always written to disk.
#
# Configuration examples (MemoryStore is the default):