Fix documentation errors (r61324)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f93d672..6cd34ec 100644 (file)
--- 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 56d60d4..04152ad 100644 (file)
--- 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
 /**@}*/
 
 /**