Merge "jquery.textSelection: Implement 'encapsulateSelection' in terms of the other...

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 27177cb..bdbeb70 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2255,7 +2255,7 @@ $wgCacheDirectory = false;
  *   - CACHE_NONE:       Do not cache
  *   - CACHE_DB:         Store cache objects in the DB
  *   - CACHE_MEMCACHED:  MemCached, must specify servers in $wgMemCachedServers
- *   - CACHE_ACCEL:      APC, APCU, XCache or WinCache
+ *   - CACHE_ACCEL:      APC, APCU or WinCache
  *   - (other):          A string may be used which identifies a cache
  *                       configuration in $wgObjectCaches.
  *
@@ -2333,7 +2333,6 @@ $wgObjectCaches = [
 
        'apc' => [ 'class' => APCBagOStuff::class, 'reportDupes' => false ],
        'apcu' => [ 'class' => APCUBagOStuff::class, 'reportDupes' => false ],
-       'xcache' => [ 'class' => XCacheBagOStuff::class, 'reportDupes' => false ],
        'wincache' => [ 'class' => WinCacheBagOStuff::class, 'reportDupes' => false ],
        'memcached-php' => [ 'class' => MemcachedPhpBagOStuff::class, 'loggroup' => 'memcached' ],
        'memcached-pecl' => [ 'class' => MemcachedPeclBagOStuff::class, 'loggroup' => 'memcached' ],
@@ -3783,10 +3782,11 @@ $wgResourceLoaderValidateStaticJS = false;
  */
 $wgResourceLoaderLESSVars = [
        /**
-        * Minimum available screen width at which a device can be considered a tablet/desktop
+        * Minimum available screen width at which a device can be considered a tablet
         * The number is currently based on the device width of a Samsung Galaxy S5 mini and is low
         * enough to cover iPad (768px). Number is prone to change with new information.
         * @since 1.27
+        * @deprecated 1.31 Use mediawiki.ui/variables instead
         */
        'deviceWidthTablet' => '720px',
 ];