Merge "Remove dead mime_content_type() code paths"

diff --combined includes/DefaultSettings.php
index f2042f9,f9e50f0..26ce83c
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1156,7 -1156,7 +1156,7 @@@ $wgMimeInfoFile = 'includes/mime.info'
   * Sets an external MIME detector program. The command must print only
   * the MIME type to standard output.
   * The name of the file to process will be appended to the command given here.
-  * If not set or NULL, mime_content_type will be used if available.
+  * If not set or NULL, PHP's fileinfo extension will be used if available.
   *
   * @par Example:
   * @code
@@@ -2075,28 -2075,6 +2075,28 @@@ $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).