X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=docs%2Fmemcached.txt;h=1e68fb7cc367497ce7a0e2f4df5b93a89a4e0bdc;hb=e1a706dbf77668428a90954de4b23d2d6682f467;hp=e914a3a6a7be3d9dfc5f03e12db32711bafca014;hpb=c340c41b37b5079ba90489f6b212bb8e4642031a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/docs/memcached.txt b/docs/memcached.txt
index e914a3a6a7..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 ==
 
@@ -122,7 +119,7 @@ Lag time of the databases:
 	key: $wgDBname:lag_times
 	ex: wikidb:lag_times
 	stores: array mapping the database id to its lag time
-	expriy: 5 secondes
+	expiry: 5 secondes
 	cleared by: nothing
 
 Localisation:
@@ -134,12 +131,12 @@ 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
 	set in: wfMessage(), Article::editUpdates() and Title::moveTo()
-	expriy: $wgMsgCacheExpiry
+	expiry: $wgMsgCacheExpiry
 	cleared by: nothing
 
 Newtalk:
@@ -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
@@ -194,23 +192,23 @@ Revision text:
 	ex: wikidb:revisiontext:textid:1012
 	stores: text of a revision
 	cleared by: nothing
-	expriry: $wgRevisionCacheExpiry
+	expiry: $wgRevisionCacheExpiry
 
 Sessions:
 	controlled by: $wgSessionsInObjectCache
 	key: $wgBDname:session:$id
 	ex: wikidb:session:38d7c5b8d3bfc51egf40c69bc40f8be3
 	stores: $SESSION, useful when using a multi-sever wiki
-	expriy: one hour
+	expiry: one hour
 	cleared by: session_destroy()
 
 Sidebar:
-	stored in: $parserMemc
+	access: WANObjectCache
 	controlled by: $wgEnableSidebarCache
 	key: $wgDBname:sidebar
 	ex: wikidb:sidebar
 	stores: the html output of the sidebar
-	expriy: $wgSidebarCacheExpiry
+	expiry: $wgSidebarCacheExpiry
 	cleared by: MessageCache::replace()
 
 Special:Allpages:
@@ -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