Merge "Fix documentation lies about debug toolbar / cache interaction"

diff --combined includes/DefaultSettings.php
index 8b9e7a5,c208f08..c09f2af
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -3574,6 -3574,24 +3574,6 @@@ $wgResourceLoaderMinifierMaxLineLength 
   */
  $wgIncludeLegacyJavaScript = true;
  
 -/**
 - * Whether to ensure the mediawiki.util is loaded before other modules.
 - *
 - * Before MediaWiki 1.19, modules used to load less asynchronous which allowed
 - * modules to lack dependencies on 'popular' modules that were likely loaded already.
 - *
 - * This setting is to aid scripts during migration by providing mediawiki.util
 - * unconditionally (which was the most commonly missed dependency). It doesn't
 - * cover all missing dependencies obviously but should fix most of them.
 - *
 - * This should be removed at some point after site/user scripts have been fixed.
 - * Enable this if your wiki has a large amount of user/site scripts that are
 - * lacking dependencies.
 - *
 - * @deprecated since 1.26: Always declare dependencies.
 - */
 -$wgPreloadJavaScriptMwUtil = false;
 -
  /**
   * Whether or not to assign configuration variables to the global window object.
   *
@@@ -5955,7 -5973,7 +5955,7 @@@ $wgCachePrefix = false
  /**
   * Display the new debugging toolbar. This also enables profiling on database
   * queries and other useful output.
-  * Will disable file cache.
+  * Will be ignored if $wgUseFileCache or $wgUseSquid is enabled.
   *
   * @since 1.19
   */