Merge "DefaultSettings: Remove "~~~~" from comment to fix Doxygen parse error"

diff --combined includes/DefaultSettings.php
index a5d6605,9df0b6e..fe67adf
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -52,8 -52,6 +52,8 @@@ if ( !defined( 'MEDIAWIKI' ) ) 
        die( 1 );
  }
  
 +/** @endcond */
 +
  /**
   * wgConf hold the site configuration.
   * Not used for much in a default install.
@@@ -2147,6 -2145,28 +2147,6 @@@ $wgObjectCaches = array
        'hash' => array( 'class' => 'HashBagOStuff' ),
  );
  
 -/**
 - * Map of bloom filter store names to configuration arrays.
 - *
 - * Example:
 - * $wgBloomFilterStores['main'] = array(
 - *  'cacheId'      => 'main-v1',
 - *  'class'        => 'BloomCacheRedis',
 - *  'redisServers' => array( '127.0.0.1:6379' ),
 - *  'redisConfig'  => array( 'connectTimeout' => 2 )
 - * );
 - *
 - * A primary bloom filter must be created manually.
 - * Example in eval.php:
 - * <code>
 - *     BloomCache::get( 'main' )->init( 'shared', 1000000000, .001 );
 - * </code>
 - * The size should be as large as practical given wiki size and resources.
 - *
 - * @since 1.24
 - */
 -$wgBloomFilterStores = array();
 -
  /**
   * The expiry time for the parser cache, in seconds.
   * The default is 86400 (one day).
@@@ -3983,7 -4003,7 +3983,7 @@@ $wgUrlProtocols = array
  );
  
  /**
-  * If true, removes (substitutes) templates in "~~~~" signatures.
+  * If true, removes (by substituting) templates in signatures.
   */
  $wgCleanSignatures = true;
  
@@@ -5303,16 -5323,16 +5303,16 @@@ $wgDebugLogGroups = array()
   *
   * The value should be an array suitable for use with
   * ObjectFactory::getObjectFromSpec(). The created object is expected to
 - * implement the MWLoggerSpi interface. See ObjectFactory for additional
 + * implement the MediaWiki\Logger\Spi interface. See ObjectFactory for additional
   * details.
   *
 - * Alternately the MWLoggerFactory::registerProvider method can be called to
 - * inject an MWLoggerSpi instance into MWLoggerFactory and bypass the use of
 - * this configuration variable entirely.
 + * Alternately the MediaWiki\Logger\LoggerFactory::registerProvider method can
 + * be called to inject an MediaWiki\Logger\Spi instance into the LoggerFactory
 + * and bypass the use of this configuration variable entirely.
   *
   * @par To completely disable logging:
   * @code
 - * $wgMWLoggerDefaultSpi = array( 'class' => 'MWLoggerNullSpi' );
 + * $wgMWLoggerDefaultSpi = array( 'class' => '\\MediaWiki\\Logger\\NullSpi' );
   * @endcode
   *
   * @since 1.25
@@@ -5320,7 -5340,7 +5320,7 @@@
   * @see MwLogger
   */
  $wgMWLoggerDefaultSpi = array(
 -      'class' => 'MWLoggerLegacySpi',
 +      'class' => '\\MediaWiki\\Logger\\LegacySpi',
  );
  
  /**