Polished cache_mem description by adding some shared memory cache specifics.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 2b3f195aeafb206e29bc1882ec34139b192dbeee..a7247a0513a04dac6bd9f66cb081302857e76e44 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2560,6 +2560,11 @@ DOC_START
        decreases, blocks will be freed until the high-water mark is
        reached.  Thereafter, blocks will be used to store hot
        objects.
+
+       If shared memory caching is enabled, Squid does not use the shared
+       cache space for in-transit objects, but they still consume as much
+       local memory as they need. For more details about the shared memory
+       cache, see memory_cache_shared.
 DOC_END
 
 NAME: maximum_object_size_in_memory

diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc
index 085abd7a7e837c98e0e31c001e248d9d1225a2cc..deecbf90792ed518cc82a76fbb461a8362f23f65 100644 (file)
--- a/src/ipc/mem/Pages.cc
+++ b/src/ipc/mem/Pages.cc
@@ -62,10 +62,6 @@ Ipc::Mem::PageLimit(const int purpose)
 {
     switch (purpose) {
     case PageId::cachePage:
-        // TODO: adjust cache_mem description to say that in SMP mode,
-        // in-transit objects are not allocated using cache_mem. Eventually,
-        // they should not use cache_mem even if shared memory is not used:
-        // in-transit objects have nothing to do with caching.
         return Config.memMaxSize > 0 ? Config.memMaxSize / PageSize() : 0;
     case PageId::ioPage:
         // XXX: this should be independent from memory cache pages