X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=docs%2Fmemcached.txt;h=1e68fb7cc367497ce7a0e2f4df5b93a89a4e0bdc;hb=87ec822c343ca246bcea7369f271092991395702;hp=8c59e72dd69db1450db4838391936fb8d6847fd1;hpb=57eaa2bf04ce1b48bd89c10defe4de5b7d31f047;p=lhc%2Fweb%2Fwiklou.git

diff --git a/docs/memcached.txt b/docs/memcached.txt
index 8c59e72dd6..1e68fb7cc3 100644
--- a/docs/memcached.txt
+++ b/docs/memcached.txt
@@ -80,18 +80,15 @@ usage evenly), make its entry a subarray:
 MediaWiki uses a fork of Ryan T. Dean's pure-PHP memcached client.
 It also supports the PECL PHP extension for memcached.
 
-MediaWiki uses three object for object caching:
-* $wgMemc, controlled by $wgMainCacheType
-* $parserMemc, controlled by $wgParserCacheType
-* $messageMemc, controlled by $wgMessageCacheType
-If you set CACHE_NONE to one of the three control variable, (default
-value for $wgMainCacheType), MediaWiki still create a MemCacheClient,
-but requests to it are no-ops and we always fall through to the
-database. If the cache daemon can't be contacted, it should also
-disable itself fairly smoothly.
-
-By default, $wgMemc is used but when it is $parserMemc or $messageMemc
-this is mentioned below.
+MediaWiki uses the ObjectCache class to retrieve instances of
+BagOStuff by purpose, controlled by the following variables:
+* $wgMainCacheType
+* $wgParserCacheType
+* $wgMessageCacheType
+
+If you set one of these to CACHE_NONE, MediaWiki still creates a
+BagOStuff object, but calls it to it are no-ops. If the cache daemon
+can't be contacted, it should also disable itself fairly smoothly.
 
 == Keys used ==
 
@@ -134,7 +131,7 @@ Localisation:
 	cleared by: Language::loadLocalisation()
 
 Message Cache:
-	stored in: $messageMemc
+	backend: $wgMessageCacheType
 	key: $wgDBname:messages, $wgDBname:messages-hash, $wgDBname:messages-status
 	ex: wikidb:messages, wikidb:messages-hash, wikidb:messages-status
 	stores: an array where the keys are DB keys and the values are messages
@@ -151,7 +148,8 @@ Newtalk:
 	expiry: 30 minutes
 
 Parser Cache:
-	stored in: $parserMemc
+	access: ParserCache
+	backend: $wgParserCacheType
 	key: $wgDBname:pcache:idhash:$pageid-$renderkey!$hash
 		$pageid: id of the page
 		$renderkey: 1 if action=render, 0 otherwise
@@ -205,7 +203,7 @@ Sessions:
 	cleared by: session_destroy()
 
 Sidebar:
-	stored in: $parserMemc
+	access: WANObjectCache
 	controlled by: $wgEnableSidebarCache
 	key: $wgDBname:sidebar
 	ex: wikidb:sidebar
@@ -221,7 +219,7 @@ Special:Allpages:
 	cleared by: nothing
 
 Special:Recentchanges (feed):
-	stored in: $messageMemc
+	backend: $wgMessageCacheType
 	key: $wgDBname:rcfeed:$format:$limit:$hideminor:$target and
 		rcfeed:$format:timestamp
 	ex: wikidb:rcfeed:rss:50:: and rcfeed:rss:timestamp