From 62eb5cd6b0859dee266cddc240f3e1e788f871fa Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 29 May 2014 17:43:59 +0200 Subject: [PATCH 1/2] Add a warning to the configuration file Some people believe that they should copy the sample config to the "real" config. I noticed this several times in IRC and on the bugtracker. I guess this warning should be enough to avoid this in the future. --- config/config.sample.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/config.sample.php b/config/config.sample.php index 80694837ed..bf0ec468ad 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1,5 +1,11 @@ Date: Fri, 30 May 2014 16:00:57 +0200 Subject: [PATCH 2/2] fix wording --- config/config.sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.sample.php b/config/config.sample.php index bf0ec468ad..590aba714e 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -3,7 +3,7 @@ /** * This configuration file is only provided to document the different configuration options and their usage. * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK YOUR INSTANCE. - * Instead copy configurations switches that you consider important for your instance manually to your configuration. + * Instead, manually copy configurations' switches that you consider important for your instance to your configuration. */ /* Only enable this for local development and not in productive environments */