Merge "Allow floating point values for $wgJobBackoffThrottling"

diff --combined includes/DefaultSettings.php
index 64512c8,3ed71d1..e011d4a
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -104,13 -104,6 +104,13 @@@ $wgServer = WebRequest::detectServer()
   */
  $wgCanonicalServer = false;
  
 +/**
 + * Server name. This is automatically computed by parsing the bare
 + * hostname out of $wgCanonicalServer. It should not be customized.
 + * @since 1.24
 + */
 +$wgServerName = false;
 +
  /************************************************************************//**
   * @name   Script path settings
   * @{
@@@ -1311,22 -1304,21 +1311,22 @@@ $wgDjvuOutputExtension = 'jpg'
   * @{
   */
  
 -$serverName = substr( $wgServer, strrpos( $wgServer, '/' ) + 1 );
  
  /**
   * Site admin email address.
 + *
 + * Defaults to "wikiadmin@{$wgServerName}".
   */
 -$wgEmergencyContact = 'wikiadmin@' . $serverName;
 +$wgEmergencyContact = false;
  
  /**
   * Password reminder email address.
   *
   * The address we should use as sender when a user is requesting his password.
 + *
 + * Defaults to "apache@{$wgServerName}".
   */
 -$wgPasswordSender = 'apache@' . $serverName;
 -
 -unset( $serverName ); # Don't leak local variables to global scope
 +$wgPasswordSender = false;
  
  /**
   * Password reminder name
@@@ -2893,6 -2885,11 +2893,6 @@@ $wgShowIPinHeader = true
   */
  $wgSiteNotice = '';
  
 -/**
 - * A subtitle to add to the tagline, for skins that have it/
 - */
 -$wgExtraSubtitle = '';
 -
  /**
   * If this is set, a "donate" link will appear in the sidebar. Set it to a URL.
   */
@@@ -3608,9 -3605,6 +3608,9 @@@ $wgNamespacesWithSubpages = array
   * Tracking categories allow pages with certain characteristics to be tracked.
   * It works by adding any such page to a category automatically.
   *
 + * A message with the suffix '-desc' should be added as a description message
 + * to have extra information on Special:TrackingCategories.
 + *
   * @since 1.23
   */
  $wgTrackingCategories = array(
@@@ -3621,8 -3615,6 +3621,8 @@@
        'post-expand-template-inclusion-category',
        'hidden-category-category',
        'broken-file-category',
 +      'node-count-exceeded-category',
 +      'expansion-depth-exceeded-category',
  );
  
  /**
@@@ -4260,7 -4252,6 +4260,7 @@@ $wgGroupPermissions['*']['editmyoptions
  $wgGroupPermissions['user']['move'] = true;
  $wgGroupPermissions['user']['move-subpages'] = true;
  $wgGroupPermissions['user']['move-rootuserpages'] = true; // can move root userpages
 +$wgGroupPermissions['user']['move-categorypages'] = true;
  $wgGroupPermissions['user']['movefile'] = true;
  $wgGroupPermissions['user']['read'] = true;
  $wgGroupPermissions['user']['edit'] = true;
@@@ -4308,7 -4299,6 +4308,7 @@@ $wgGroupPermissions['sysop']['importupl
  $wgGroupPermissions['sysop']['move'] = true;
  $wgGroupPermissions['sysop']['move-subpages'] = true;
  $wgGroupPermissions['sysop']['move-rootuserpages'] = true;
 +$wgGroupPermissions['sysop']['move-categorypages'] = true;
  $wgGroupPermissions['sysop']['patrol'] = true;
  $wgGroupPermissions['sysop']['autopatrol'] = true;
  $wgGroupPermissions['sysop']['protect'] = true;
@@@ -6186,6 -6176,7 +6186,7 @@@ $wgJobTypesExcludedFromDefaultQueue = a
   * may have a variable number of work items, as is the case with batch jobs.
   * This is used by runJobs.php and not jobs run via $wgJobRunRate.
   * These settings should be global to all wikis.
+  * @var float[]
   */
  $wgJobBackoffThrottling = array();