summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-11-09 15:43:57 +0100
committerThomas Bruederli <bruederli@kolabsys.com>2014-11-09 15:43:57 +0100
commitd4a820ed2b47d43c57aa16e65dee778be2426ba6 (patch)
tree91075304b9885b91e10c79ebb562ea149f93fd03
parent0c137f7dace052015757ad49ff82bdbfb5f089d5 (diff)
Better wording about composer dependency
-rw-r--r--INSTALL2
-rw-r--r--UPGRADING4
2 files changed, 4 insertions, 2 deletions
diff --git a/INSTALL b/INSTALL
index 918be8815..ef1c59b85 100644
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@ REQUIREMENTS
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 193a73c92..358e2669f 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -40,6 +40,7 @@ it on a unix system, you need to do the following operations by hand:
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 @@ it on a unix system, you need to do the following operations by hand:
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.