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.

1 files changed, 1 insertions, 1 deletions

diff --git a/UPGRADING b/UPGRADING
index 03d549920..4ac0ca3b5 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -39,7 +39,7 @@ it on a unix system, you need to do the following operations by hand:
 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.