Skip to content
This repository
Browse code

MINOR Fixed spacing in docs

  • Loading branch information...
commit 753a4549bca56efd6475e2981fd04a2b47ebbacc 1 parent 5bfc722
Ingo Schommer authored February 12, 2011

Showing 1 changed file with 12 additions and 12 deletions. Show diff stats Hide diff stats

  1. 24  docs/en/installation/from-source.md
24  docs/en/installation/from-source.md
Source Rendered
@@ -80,12 +80,12 @@ of the modules that won't be updated frequently.
80 80
 
81 81
 	cd my-silverstripe-project/
82 82
 	tools/new-project -m flat
83  
-	
  83
+
84 84
 <div class="notice" markdown="1">
85 85
 The `tools` scripts are just getting you started - to maintain your installation,
86 86
 you will need to learn how to add and update modules via the `git` commandline utility.
87 87
 </div>
88  
-	
  88
+
89 89
 ### Step 3: Committing the modules ###
90 90
 
91 91
 Regardless of using Piston or not, all files in your project will be unversioned,
@@ -95,12 +95,12 @@ and need to be added to your own repository. The commands depend on your reposit
95 95
 	cd my-silverstripe-project/
96 96
 	svn add *
97 97
 	svn commit -m "adding dependencies"
98  
-	
  98
+
99 99
 	# for git
100 100
 	cd my-silverstripe-project/
101 101
 	git add *
102 102
 	git commit -m "adding dependencies"
103  
-	
  103
+
104 104
 ### Step 4: Switch branches ###
105 105
 
106 106
 The `tools/new-project` script doesn't allow you to switch branches easily,
@@ -111,7 +111,7 @@ create your own `template.php` and adjust the paths:
111 111
 `tools/new-project --template /path/to/template.php`
112 112
 
113 113
 If your project is managed by piston, you can run a `piston import --force` to switch branches.
114  
-	
  114
+
115 115
 ### Step 5: Running the web-based installer ###
116 116
 
117 117
 You can now run through the web-based installer for your operating system of choice ([instructions](/installation)).
@@ -150,7 +150,7 @@ Please replace `<username>` below with your github username.
150 150
 	git clone git@github.com:<username>/sapphire.git sapphire
151 151
 	git clone git@github.com:<username>/silverstripe-cms.git cms
152 152
 	git clone git@github.com:<username>/silverstripe-blackcandy.git themes/blackcandy
153  
-	
  153
+
154 154
 Now you need to add the original repository as `upstream`, so you can keep your fork updated later on.
155 155
 
156 156
 	cd my-silverstripe-project
@@ -158,7 +158,7 @@ Now you need to add the original repository as `upstream`, so you can keep your
158 158
 	(cd sapphire && git remote add upstream git://github.com/silverstripe/sapphire.git && git fetch upstream)
159 159
 	(cd cms && git remote add upstream git://github.com/silverstripe/silverstripe-cms.git && git fetch upstream)
160 160
 	(cd themes/blackcandy && git remote add upstream git://github.com/silverstripe/silverstripe-blackcandy.git)
161  
-	
  161
+
162 162
 Now you can learn how to [update your fork](http://help.github.com/forking/) from the `upstream` repository. You should do this regularly, at least before submitting any pull requests.
163 163
 
164 164
 Please read ["Module installation"](/topics/modules) to find out how to install additional modules like `blog` or `forum`.
@@ -167,7 +167,7 @@ Please read ["Module installation"](/topics/modules) to find out how to install
167 167
 
168 168
 You don't need to commit the module code into the repository, as our project is only for local development.
169 169
 Changes within the module code are committed back directly to their own repository, not into the `installer` project. To the `installer` project, these modules are unversioned files (although you can explicitly add them to `.gitignore` as well).
170  
-	
  170
+
171 171
 ### Step 4: Switch branches ###
172 172
 
173 173
 By default, the "master" is checked out, which contains the latest code.
@@ -179,7 +179,7 @@ You can optionally select a ["release branch"](https://github.com/silverstripe/s
179 179
 	(cd cms && git checkout -b 2.4 origin/2.4)
180 180
 	(cd themes/blackcandy && git checkout -b 2.4 origin/2.4)
181 181
 	# repeat for all modules in your project...
182  
-	
  182
+
183 183
 After creating the local branch, you can simply switch between branches:
184 184
 
185 185
 	cd my-silverstripe-project
@@ -188,7 +188,7 @@ After creating the local branch, you can simply switch between branches:
188 188
 	(cd cms && git checkout 2.4)
189 189
 	(cd themes/blackcandy && git checkout 2.4)
190 190
 	# repeat for all modules in your project...
191  
-	
  191
+
192 192
 To switch back to master:
193 193
 
194 194
 	cd my-silverstripe-project
@@ -197,7 +197,7 @@ To switch back to master:
197 197
 	(cd cms && git checkout master)
198 198
 	(cd themes/blackcandy && git checkout master)
199 199
 	# repeat for all modules in your project...
200  
-	
  200
+
201 201
 You can't switch branches if your working copy has local changes (typically in `mysite/_config.php`).
202 202
 Either revert these changes before switching, or temporarily store them with `git stash`.
203 203
 Once you switch back you can retrieve these changes via `git stash pop` (see further [instructions on `git stash`](http://progit.org/book/ch6-3.html)).
@@ -240,7 +240,7 @@ If these plain files are managed by piston, the update process is simple:
240 240
 	# Use "svn" instead of "git" for subversion repositories
241 241
 	git add sapphire/*
242 242
 	git commit -m "udpated dependencies"
243  
-	
  243
+
244 244
 For file downloads without piston, you can simply download the source code again and replace it.
245 245
 
246 246
 ## Contributing changes from piston ##

0 notes on commit 753a454

Please sign in to comment.
Something went wrong with that request. Please try again.