From d4a820ed2b47d43c57aa16e65dee778be2426ba6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sun, 09 Nov 2014 09:43:57 -0500
Subject: [PATCH] Better wording about composer dependency

---
 INSTALL   |    2 +-
 UPGRADING |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 918be88..ef1c59b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@
   or SQLite support in PHP
 * One of the above databases with permission to create tables
 * An SMTP server (recommended) or PHP configured for mail delivery
-* Composer installed either locally or globally
+* Composer installed either locally or globally (https://getcomposer.org)
 
 
 INSTALLATION
diff --git a/UPGRADING b/UPGRADING
index 193a73c..358e266 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -40,6 +40,7 @@
    directory into the target folder:
    ./skins/
    ./plugins/
+   ./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'
@@ -47,7 +48,8 @@
    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.
-5. Update dependencies by running `php composer.phar update --no-dev`
+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.
 

--
Gitblit v1.9.1