From 0ac69508958a06e566a51fb6a74802401ebe5eb5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 11 Oct 2012 13:26:47 +0100 Subject: changed local style.ini to be merged with standard one --- lib/tpl/default/style.ini | 6 ++++-- lib/tpl/dokuwiki/style.ini | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index b9e1e9424..726c2025d 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -1,8 +1,10 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here -; Please only make changes in style.local.ini. If it doesn't exist, -; just create it by copying style.ini. +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forgot to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index bcb5a1a2e..86066fa3b 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -1,8 +1,10 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here -; Please only make changes in style.local.ini. If it doesn't exist, -; just create it by copying style.ini. +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forgot to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently -- cgit v1.2.3