aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-12-05 10:33:50 +0100
committerXavier Noria <fxn@hashref.com>2010-12-05 10:33:50 +0100
commit48386d245bc169d3a36e5f305927bd968b108fea (patch)
tree9156d3535c42e7f56af6e69fbbd5164ccb4fcc95 /activesupport/lib/active_support/cache.rb
parentb696dd70db651c6cb4a096dd0d5762416acd9917 (diff)
parente1d0d5ae81d2b02eebb1afbfb79edf0a2da2d48e (diff)
downloadrails-48386d245bc169d3a36e5f305927bd968b108fea.tar.gz
rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.bz2
rails-48386d245bc169d3a36e5f305927bd968b108fea.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/cache.rb')
-rw-r--r--activesupport/lib/active_support/cache.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 9098ffbfec..b4f0c42e37 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -210,11 +210,11 @@ module ActiveSupport
# be specified as an option to the construction in which call all entries will be
# affected. Or it can be supplied to the +fetch+ or +write+ method for just one entry.
#
- # cache = ActiveSupport::Cache::MemoryStore.new(:expire_in => 5.minutes)
- # cache.write(key, value, :expire_in => 1.minute) # Set a lower value for one entry
+ # cache = ActiveSupport::Cache::MemoryStore.new(:expires_in => 5.minutes)
+ # cache.write(key, value, :expires_in => 1.minute) # Set a lower value for one entry
#
# Setting <tt>:race_condition_ttl</tt> is very useful in situations where a cache entry
- # is used very frequently unver heavy load. If a cache expires and due to heavy load
+ # is used very frequently and is under heavy load. If a cache expires and due to heavy load
# seven different processes will try to read data natively and then they all will try to
# write to cache. To avoid that case the first process to find an expired cache entry will
# bump the cache expiration time by the value set in <tt>:race_condition_ttl</tt>. Yes