From 0b36d151572e050b51d82e7429fee847ebb33e22 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 20 Nov 2014 06:03:22 -0500
Subject: [PATCH] Add method to display operation (uploading) progress in UI message

---
 UPGRADING |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 4ac0ca3..358e266 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -32,19 +32,26 @@
    - ./bin/
    - ./SQL/
    - ./program/
-2. rsync the contents of the following folders from your installation
+   - ./installer/
+2. Replace the configuration defaults files:
+   - config/defaults.inc.php
+   - config/mimetypes.php
+3. rsync the contents of the following folders from your installation
    directory into the target folder:
    ./skins/
    ./plugins/
-3. Run ./bin/update.sh from the commandline OR
+   ./vendor/
+4. 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/config.inc.php file.
    WARNING: See SQLite database upgrade below.
-4. Let the update script/installer check your configuration and
+5. Let the update script/installer check your configuration and
    update your config files and database schema as suggested by the updater.
-5. Make sure 'enable_installer' is set to false again.
-6. See Post-Upgrade Activities section.
+5. If you previously installed plugins through composer, update dependencies
+   by running `php composer.phar update --no-dev`
+7. Make sure 'enable_installer' is set to false again.
+8. See Post-Upgrade Activities section.
 
 
 Post-Upgrade Activities

--
Gitblit v1.9.1