From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 17 Mar 2016 10:04:59 +0000 (+0000)
Subject: Merge "Fix documentation lies about debug toolbar / cache interaction"
X-Git-Tag: 1.31.0-rc.0~7590
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=92a52ddc527d5aeb2e7e2e931c23b4a15061378a;hp=dd6d1762ecf6aa9b5f93794bc383111b93e6cd25;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8b9e7a5742..c09f2afe14 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5955,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
  */