Merge "Inject "srvCache" and local DB connections into LockManagerDB"

diff --combined includes/DefaultSettings.php
index aa54629,be858c2..8180443
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -644,6 -644,10 +644,10 @@@ $wgFileBackends = []
   * See LockManager::__construct() for more details.
   * Additional parameters are specific to the lock manager class used.
   * These settings should be global to all wikis.
+  *
+  * When using DBLockManager, the 'dbsByBucket' map can reference 'localDBMaster' as
+  * a peer database in each bucket. This will result in an extra connection to the domain
+  * that the LockManager services, which must also be a valid wiki ID.
   */
  $wgLockManagers = [];
  
@@@ -2085,7 -2089,7 +2089,7 @@@ $wgExternalStores = []
   * Create a cluster named 'cluster1' containing three servers:
   * @code
   * $wgExternalServers = [
 - *     'cluster1' => [ 'srv28', 'srv29', 'srv30' ]
 + *     'cluster1' => <array in the same format as $wgDBservers>
   * ];
   * @endcode
   *
@@@ -5427,30 -5431,11 +5431,30 @@@ $wgDeleteRevisionsLimit = 0
  $wgHideUserContribLimit = 1000;
  
  /**
 - * Number of accounts each IP address may create, 0 to disable.
 + * Number of accounts each IP address may create per specified period(s).
 + *
 + * @par Example:
 + * @code
 + * $wgAccountCreationThrottle = [
 + *  // no more than 100 per month
 + *  [
 + *   'count' => 100,
 + *   'seconds' => 30*86400,
 + *  ],
 + *  // no more than 10 per day
 + *  [
 + *   'count' => 10,
 + *   'seconds' => 86400,
 + *  ],
 + * ];
 + * @endcode
   *
   * @warning Requires $wgMainCacheType to be enabled
   */
 -$wgAccountCreationThrottle = 0;
 +$wgAccountCreationThrottle = [ [
 +      'count' => 0,
 +      'seconds' => 86400,
 +] ];
  
  /**
   * Edits matching these regular expressions in body text