From 412faba719fdd8a35707d42bbdbc66c0357b6648 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 27 May 2011 05:39:08 -0400
Subject: [PATCH] Removed the files favicon.ico and robots.txt from conf-custom directory as they are already present in conf directory. The conf-custom directory is only for local overrides of files from conf directory, so conf-custom must stay empty in the source tree to allow administrators to override files on their servers.

---
 interface/lib/config.inc.local.php |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/interface/lib/config.inc.local.php b/interface/lib/config.inc.local.php
index 492ec50..61bc351 100644
--- a/interface/lib/config.inc.local.php
+++ b/interface/lib/config.inc.local.php
@@ -4,7 +4,11 @@
 
 Example local config.  Here you can add your own custom
 settings to override the defaults. These will also be
-protected from updates.
+protected from updates. This is added at the end of the
+config.inc.php to allow you to override settings. Be 
+careful as this can override settings for the database.  
+
+** Check your config before using in production. **
 
 */
 
@@ -21,9 +25,11 @@
 // $conf['theme'] = 'mycustom_theme'; // Must be installed.
 // $conf['logo'] = 'themes/default/images/ispc_logo.png';
 
-// $conf['language'] = 'en';
+// $conf['templates'] = '/opt/tecnoera/templates';
+
+// $conf['language'] = 'es';
 
 // $conf['interface_logout_url'] = 'http://www.mycompany.com';
-*/
+
 
 ?>
\ No newline at end of file

--
Gitblit v1.9.1