From 5c12352ae91a9a3e5c1dfa224d80d05b66f98b45 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Tue, 18 Feb 2014 08:30:33 +1300
Subject: [PATCH] refs #4655 actually here we can refer to the comment in the
 config

---
 core/AssetManager.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/AssetManager.php b/core/AssetManager.php
index 7e60f5ed2b..8868cab18e 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -34,10 +34,8 @@ use Piwik\Config as PiwikConfig;
  *  - Manages server-side cache
  *
  * Whether assets are included individually or as merged files is defined by
- * the global option 'disable_merged_assets'. When set to 1, JavaScript files will 
- * be included individually and neither merged nor minified.
- * When set to 0, files will be merged together to 3 files: 2 JavaScript files
- * (core and non-core) and 1 css file.
+ * the global option 'disable_merged_assets'. See the documentation in the global
+ * config for more information.
  *
  * @method static \Piwik\AssetManager getInstance()
  */
-- 
GitLab