From 0c137f7dace052015757ad49ff82bdbfb5f089d5 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sun, 09 Nov 2014 09:36:57 -0500
Subject: [PATCH] Consider composer.json dependencies in installation and upgrading instructions and scripts

---
 UPGRADING |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 86ddde6..193a73c 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -40,15 +40,16 @@
    directory into the target folder:
    ./skins/
    ./plugins/
-4. Run ./bin/update.sh from the commandline OR
+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.
 5. Let the update script/installer check your configuration and
    update your config files and database schema as suggested by the updater.
-6. Make sure 'enable_installer' is set to false again.
-7. See Post-Upgrade Activities section.
+5. 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