aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-11-11 17:12:42 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-11-11 17:12:42 +0530
commit9fd0cd3a12f969ca0c5c7ce6163e9e451637506d (patch)
treea8bd9971ae8abb2146099b038200755ba1c2e029 /activesupport
parentdf5c9fd9f42e9bebb02bb61acf70de3d17bc8152 (diff)
downloadrails-9fd0cd3a12f969ca0c5c7ce6163e9e451637506d.tar.gz
rails-9fd0cd3a12f969ca0c5c7ce6163e9e451637506d.tar.bz2
rails-9fd0cd3a12f969ca0c5c7ce6163e9e451637506d.zip
Revert "Fix "in memory" where it should be "in-memory"."
This reverts commit e34e4d43301618307f94123d3710f094297f91f3. Reason: code changes are not allowed in docrails.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/cache/file_store.rb2
-rw-r--r--activesupport/lib/active_support/cache/mem_cache_store.rb2
-rw-r--r--activesupport/lib/active_support/cache/strategy/local_cache.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 9460532af0..85e7e21624 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -8,7 +8,7 @@ module ActiveSupport
# A cache store implementation which stores everything on the filesystem.
#
# FileStore implements the Strategy::LocalCache strategy which implements
- # an in-memory cache inside of a block.
+ # an in memory cache inside of a block.
class FileStore < Store
attr_reader :cache_path
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 530839b24d..ba37f3e871 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
# server goes down, then MemCacheStore will ignore it until it comes back up.
#
# MemCacheStore implements the Strategy::LocalCache strategy which implements
- # an in-memory cache inside of a block.
+ # an in memory cache inside of a block.
class MemCacheStore < Store
module Response # :nodoc:
STORED = "STORED\r\n"
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index db5f228a70..0649a058aa 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
module ActiveSupport
module Cache
module Strategy
- # Caches that implement LocalCache will be backed by an in-memory cache for the
+ # Caches that implement LocalCache will be backed by an in memory cache for the
# duration of a block. Repeated calls to the cache for the same key will hit the
- # in-memory cache for faster access.
+ # in memory cache for faster access.
module LocalCache
# Simple memory backed cache. This cache is not thread safe and is intended only
# for serving as a temporary memory cache for a single thread.