| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -793,7 +793,7 @@ |
| 794 | 794 | $wgMemCachedDebug = false; ///< Will be set to false in Setup.php, if the server isn't working |
| 795 | 795 | $wgMemCachedServers = array( '127.0.0.1:11000' ); |
| 796 | 796 | $wgMemCachedPersistent = false; |
| 797 | | -$wgMemCachedTimeout = 100000; //Server connection timeout in microseconds |
| | 797 | +$wgMemCachedTimeout = 100000; //Data timeout in microseconds |
| 798 | 798 | /**@}*/ |
| 799 | 799 | |
| 800 | 800 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -94,8 +94,8 @@ |
| 95 | 95 | * Added $wgAdvertisedFeedTypes to decide what feed types (RSS, Atom, both, or |
| 96 | 96 | neither) MediaWiki advertises. Default is array( 'atom' ), so RSS is no |
| 97 | 97 | longer advertised by default (but it still works). |
| 98 | | -* Added $wgMemCachedTimeout to configure connection timeouts for communicating |
| 99 | | - with a memcached server |
| | 98 | +* Added $wgMemCachedTimeout, controls how long to wait for data from the |
| | 99 | + memcached servers. |
| 100 | 100 | * New configuration variables $wgDebugTimestamps and $wgDebugPrintHttpHeaders |
| 101 | 101 | for controlling debug output. |
| 102 | 102 | |