Merge "Declare and document $wgStatsdServer and $wgStatsdMetricPrefix"

diff --combined includes/DefaultSettings.php
index a239e68,69fb2e5..7dbe35a
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -884,7 -884,6 +884,7 @@@ $wgMediaHandlers = array
        'image/png' => 'PNGHandler',
        'image/gif' => 'GIFHandler',
        'image/tiff' => 'TiffHandler',
 +      'image/webp' => 'WebPHandler',
        'image/x-ms-bmp' => 'BmpHandler',
        'image/x-bmp' => 'BmpHandler',
        'image/x-xcf' => 'XCFHandler',
@@@ -5693,6 -5692,29 +5693,29 @@@ $wgAggregateStatsID = false
   */
  $wgStatsFormatString = "stats/%s - %s 1 1 1 1 %s\n";
  
+ /**
+  * Destination of statsd metrics.
+  *
+  * A host or host:port of a statsd server. Port defaults to 8125.
+  *
+  * If not set, statsd metrics will not be collected.
+  *
+  * @see wfLogProfilingData
+  * @since 1.25
+  */
+ $wgStatsdServer = false;
+ 
+ /**
+  * Prefix for metric names sent to wgStatsdServer.
+  *
+  * Defaults to "MediaWiki".
+  *
+  * @see RequestContext::getStats
+  * @see BufferingStatsdDataFactory
+  * @since 1.25
+  */
+ $wgStatsdMetricPrefix = false;
+ 
  /**
   * InfoAction retrieves a list of transclusion links (both to and from).
   * This number puts a limit on that query in the case of highly transcluded
@@@ -6025,21 -6047,6 +6048,21 @@@ $wgGitRepositoryViewers = array
   */
  $wgRCMaxAge = 90 * 24 * 3600;
  
 +/**
 + * Page watchers inactive for more than this many seconds are considered inactive.
 + * Used mainly by action=info. Default: 180 days = about six months.
 + * @since 1.26
 + */
 +$wgWatchersMaxAge = 180 * 24 * 3600;
 +
 +/**
 + * If active watchers (per above) are this number or less, do not disclose it.
 + * Left to 1, prevents unprivileged users from knowing for sure that there are 0.
 + * Set to -1 if you want to always complement watchers count with this info.
 + * @since 1.26
 + */
 +$wgUnwatchedPageSecret = 1;
 +
  /**
   * Filter $wgRCLinkDays by $wgRCMaxAge to avoid showing links for numbers
   * higher than what will be stored. Note that this is disabled by default
@@@ -6825,7 -6832,6 +6848,7 @@@ $wgLogTypes = array
        'suppress',
        'tag',
        'managetags',
 +      'contentmodel',
  );
  
  /**
@@@ -6960,7 -6966,6 +6983,7 @@@ $wgLogActionsHandlers = array
        'suppress/reblock' => 'BlockLogFormatter',
        'import/upload' => 'LogFormatter',
        'import/interwiki' => 'LogFormatter',
 +      'contentmodel/change' => 'ContentModelLogFormatter',
  );
  
  /**
@@@ -6986,6 -6991,14 +7009,6 @@@ $wgAllowSpecialInclusion = true
   */
  $wgDisableQueryPageUpdate = false;
  
 -/**
 - * List of special pages, followed by what subtitle they should go under
 - * at Special:SpecialPages
 - *
 - * @deprecated since 1.21 Override SpecialPage::getGroupName instead
 - */
 -$wgSpecialPageGroups = array();
 -
  /**
   * On Special:Unusedimages, consider images "used", if they are put
   * into a category. Default (false) is not to count those as used.