Merge commit 'upstream/0.2_alpha' into experimental-import

[roundcube.git] / UPGRADING

diff --git a/UPGRADING b/UPGRADING
index 9b5ac453264856071d04ddc19619088abf056119..996b4f258592e0dbcd4ed6db2994c6ee28862dc3 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,9 +1,25 @@
 UPDATE instructions
 ===================
 
-Follow these instructions if upgrading from a previous version
+First you should remove all subfolders from /program/localization/
+because most language codes have changed in 0.2-alpha. This way you
+can make sure that no old localization files remain on your disk.
+
+Then follow these instructions if upgrading from a previous version
 of RoundCube Webmail.
 
+from version 0.1.1
+----------------------------------------
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql
+  below the line "-- Updates from version 0.1.1"
+* check the config/main.inc.php.dist for new configuration 
+  options and add them to your config 
+
+
 from version 0.1-stable
 ----------------------------------------
 * replace index.php
@@ -11,6 +27,8 @@ from version 0.1-stable
 * replace all files in folder /program/
 * replace all files in folder /skins/default/
 * run all commands in SQL/[yourdbtype].update.sql
+* check the config/main.inc.php.dist for new configuration options
+  and add them to your config 
 
 
 from version 0.1-rc2
@@ -28,7 +46,6 @@ from version 0.1-rc1
 * replace all files in folder /bin/
 * replace all files in folder /program/
 * replace all files in folder /skins/default/
-* run all commands in SQL/[yourdbtype].update.sql
 * If you have LDAP servers configured you should re-configure
   the config entries using the template given in /config/main.inc.php.dist
 
@@ -39,7 +56,8 @@ from version 0.1-beta2
 * replace all files in folder /bin/
 * replace all files in folder /program/
 * replace all files in folder /skins/default/
-* re-initalize the database with [yourdbtype].initial.sql
+* run all commands in SQL/[yourdbtype].update.sql or
+  re-initalize the database with [yourdbtype].initial.sql
 * add these lines to /config/main.inc.php
    $rcmail_config['draft_autosave'] = 300;
    $rcmail_config['date_today'] = 'H:i';
@@ -53,7 +71,8 @@ form version 0.1-beta
 * replace all files in folder /bin/
 * replace all files in folder /program/
 * replace all files in folder /skins/default/
-* re-initalize the database with [yourdbtype].initial.sql
+* run all commands in SQL/[yourdbtype].update.sql or
+  re-initalize the database with [yourdbtype].initial.sql
 * add this line to /config/db.inc.php
    $rcmail_config['db_persistent'] = false;
 * add these lines to /config/main.inc.php