tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6831 from robbieaverill/patch-6

Browse Source 
DOCS Remove tabs from JSON examples to fix code blocks
This commit is contained in:
Chris Joe 2017-04-27 13:44:05 +12:00 committed by GitHub
commit 16aebb83e4
1 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
docs/en/00_Getting_Started/02_Composer.md
View File

@ -129,18 +129,20 @@ Since SilverStripe modules are installed into their own folder, you have to mana
Here is the default SilverStripe [.gitignore](http://git-scm.com/docs/gitignore) with the forum module ignored Here is the default SilverStripe [.gitignore](http://git-scm.com/docs/gitignore) with the forum module ignored
```assets/* ```
.env assets/*
tools/phing-metadata .env
silverstripe-cache tools/phing-metadata
.buildpath silverstripe-cache
.project .buildpath
.settings .project
.idea .settings
.DS_Store .idea
vendor/ .DS_Store
# Don't include the forum module, as this will be installed with composer vendor/
forum``` # Don't include the forum module, as this will be installed with composer
forum
```
In large projects it can get difficult to manage your [.gitignore](http://git-scm.com/docs/gitignore) and ensure it contains all composer managed modules and themes. In large projects it can get difficult to manage your [.gitignore](http://git-scm.com/docs/gitignore) and ensure it contains all composer managed modules and themes.
@ -234,19 +236,19 @@ To remove dependencies, or if you prefer seeing all your dependencies in a text
```json ```json
{ {
"name": "silverstripe/installer", "name": "silverstripe/installer",
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"silverstripe/cms": "^4.0", "silverstripe/cms": "^4.0",
"silverstripe/framework": "^4.0", "silverstripe/framework": "^4.0",
"silverstripe-themes/simple": "~3.2.0" "silverstripe-themes/simple": "~3.2.0"
}, },
"require-dev": { "require-dev": {
"silverstripe/docsviewer": "^3.0" "silverstripe/docsviewer": "^3.0"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true
} }
``` ```
@ -297,15 +299,14 @@ This is how you do it:
```json ```json
{ {
"name": "silverstripe/installer", "name": "silverstripe/installer",
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"repositories": [
"repositories": [ {
{ "type": "vcs",
"type": "vcs", "url": "git@github.com:sminnee/silverstripe-cms.git"
"url": "git@github.com:sminnee/silverstripe-cms.git" }
} ]
]
} }
``` ```
@ -338,12 +339,12 @@ Open `composer.json`, and find the module's `require`. Then put `as (core versio
```json ```json
{ {
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"silverstripe/cms": "3.5.1.2", "silverstripe/cms": "3.5.1.2",
"silverstripe/framework": "dev-myproj as 4.0.x-dev", "silverstripe/framework": "dev-myproj as 4.0.x-dev",
"silverstripe-themes/simple": "~3.2.0" "silverstripe-themes/simple": "~3.2.0"
} }
} }
``` ```