diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2014-02-17 23:27:54 +0400 |
|---|---|---|
| committer | Thomas Steur <tsteur@users.noreply.github.com> | 2014-02-17 23:27:54 +0400 |
| commit | b150893ba245a5b43ef8033c199e3ec3a5dfeada (patch) | |
| tree | 58d82ebd70bbf862bfb863e12b67009a1c770228 /core/AssetManager.php | |
| parent | 2a00eb6b5980cab2a7a9a8c58a1081478f319106 (diff) | |
refs #4655 updated description of merged assets option
Diffstat (limited to 'core/AssetManager.php')
| -rw-r--r-- | core/AssetManager.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/AssetManager.php b/core/AssetManager.php index ce5ef7aa0a..7e60f5ed2b 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -35,10 +35,9 @@ use Piwik\Config as PiwikConfig; * * 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 the css will be regenerated from the less - * files when they change. - * When set to 0, files will be included within a pair of files: 1 JavaScript - * and 1 css file. + * 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. * * @method static \Piwik\AssetManager getInstance() */ |