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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8b9e7a5..c09f2af 100644 (file)
--- 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
  */