From 0703bfecd0b9efca36caee4f7b9c64c4135d57af Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 10 Jul 2013 16:49:12 -0400
Subject: [PATCH] Merged configuration refactoring from 'dev_config' branch back into master (#1487311)

---
 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