Merge branch '3'

This commit is contained in:
Daniel Hensby 2016-09-14 11:49:07 +01:00
commit 4e1d38c209
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 5 additions and 10 deletions

5
.gitattributes vendored
View File

@ -1,4 +1,7 @@
docs/ export-ignore docs/ export-ignore
# Line endings
sake text eol=lf
# Hide diffs # Hide diffs
admin/client/dist/js/ -diff admin/client/dist/js/ -diff

View File

@ -11,15 +11,7 @@ We also have separate instructions for [installing modules with Composer](/devel
Before installing Composer you should ensure your system has the version control system, [Git installed](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git). Composer uses Git to check out the code dependancies you need to run your SilverStripe CMS website from the code repositories maintained on GitHub. Before installing Composer you should ensure your system has the version control system, [Git installed](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git). Composer uses Git to check out the code dependancies you need to run your SilverStripe CMS website from the code repositories maintained on GitHub.
Next, to install Composer, run the following commands from your command-line. Next, [install composer](https://getcomposer.org/download/). For our documentation we assume composer is installed globally.
# Download composer.phar
curl -s https://getcomposer.org/installer | php
# Move to your path
sudo mv composer.phar /usr/local/bin/composer
Or [download composer.phar](http://getcomposer.org/composer.phar) manually, and rename `composer.phar` as `composer`, and put it in your path. On Windows, you should call the file `composer.bat`.
You can then run Composer commands by calling `composer`. For example: You can then run Composer commands by calling `composer`. For example: