From 07ca70fce4a4bd7fe458acfa5fc4912f9ebffa3c Mon Sep 17 00:00:00 2001 From: Tim Snadden Date: Mon, 10 Mar 2014 11:13:19 +1300 Subject: [PATCH] Update composer.md --- docs/en/installation/composer.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/installation/composer.md b/docs/en/installation/composer.md index f020ebc62..4b11a6e27 100644 --- a/docs/en/installation/composer.md +++ b/docs/en/installation/composer.md @@ -116,7 +116,7 @@ So you want to contribute to SilverStripe? Fantastic! You can do this with compo You have to tell composer three things in order to be able to do this: - Keep the full git repository information - - Include dependancies marked as "developer" requirements + - Include dependencies marked as "developer" requirements - Use the development version, not the latest stable version The first two steps are done as part of the initial create project using additional arguments. @@ -233,7 +233,7 @@ For more information, read the ["Repositories" chapter of the Composer documenta ### Forks and branch names -Generally, you should keep using the same pattern of branch names as the main repositories does. If your version is a fork of 3.0, then call the branch `3.0`, not `3.0-myproj` or `myproj`. Otherwise, the depenency resolution gets confused. +Generally, you should keep using the same pattern of branch names as the main repositories does. If your version is a fork of 3.0, then call the branch `3.0`, not `3.0-myproj` or `myproj`. Otherwise, the dependency resolution gets confused. Sometimes, however, this isn't feasible. For example, you might have a number of project forks stored in a single repository, such as your personal github fork of a project. Or you might be testing/developing a feature branch. Or it might just be confusing to other team members to call the branch of your modified version `3.0`. @@ -312,4 +312,4 @@ You don't have to, Composer is designed to work on the constraints you set. You can declare the ["minimum-stability"](http://getcomposer.org/doc/04-schema.md#minimum-stability) on your project as suitable, or even whitelist specific modules as tracking a development branch while keeping others to their stable release. -Read up on [Composer "lock" files](http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file) on how this all fits together. \ No newline at end of file +Read up on [Composer "lock" files](http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file) on how this all fits together.