From 461a30d771edd8bc6606f2c92dfde363514b93b1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 14 Jun 2013 06:09:08 -0400
Subject: [PATCH] Merge config files (#1487311). Now we have defaults.inc.php and config.inc.php. Renamed $rcmail_config to $config. Old naming and old files are supported for backward compatibility.

---
 UPGRADING |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 03d5499..4ac0ca3 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -39,7 +39,7 @@
 3. Run ./bin/update.sh from the commandline OR
    open http://url-to-roundcube/installer/ in a browser and choose "3 Test config".
    To enable the latter one, you have to temporary set 'enable_installer'
-   to true in your local config/main.inc.php file.
+   to true in your local config/config.inc.php file.
    WARNING: See SQLite database upgrade below.
 4. Let the update script/installer check your configuration and
    update your config files and database schema as suggested by the updater.

--
Gitblit v1.9.1