From c540f66c12bba0fe517c1ab2b3502dc819f81d91 Mon Sep 17 00:00:00 2001 From: OverlordQ Date: Thu, 28 Jan 2010 06:41:38 +0000 Subject: [PATCH] Fix documentation errors (r61324) --- RELEASE-NOTES | 4 ++-- includes/DefaultSettings.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f93d672094..6cd34ecf1c 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -94,8 +94,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Added $wgAdvertisedFeedTypes to decide what feed types (RSS, Atom, both, or neither) MediaWiki advertises. Default is array( 'atom' ), so RSS is no longer advertised by default (but it still works). -* Added $wgMemCachedTimeout to configure connection timeouts for communicating - with a memcached server +* Added $wgMemCachedTimeout, controls how long to wait for data from the + memcached servers. * New configuration variables $wgDebugTimestamps and $wgDebugPrintHttpHeaders for controlling debug output. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 56d60d4823..04152adef6 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -793,7 +793,7 @@ $wgUseMemCached = false; $wgMemCachedDebug = false; ///< Will be set to false in Setup.php, if the server isn't working $wgMemCachedServers = array( '127.0.0.1:11000' ); $wgMemCachedPersistent = false; -$wgMemCachedTimeout = 100000; //Server connection timeout in microseconds +$wgMemCachedTimeout = 100000; //Data timeout in microseconds /**@}*/ /** -- 2.20.1