From 9c6b58d206a31b60c85974497faf54f165e63992 Mon Sep 17 00:00:00 2001 From: CheeseSucker Date: Sat, 15 Jun 2013 00:28:02 +0200 Subject: [PATCH 1/6] Fixed typo. --- docs/en/misc/contributing/documentation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/misc/contributing/documentation.md b/docs/en/misc/contributing/documentation.md index eb51b27bb..7be876150 100644 --- a/docs/en/misc/contributing/documentation.md +++ b/docs/en/misc/contributing/documentation.md @@ -41,7 +41,7 @@ getting out of date. SilverStripe project that uses the ["docsviewer" module](https://github.com/silverstripe/silverstripe-docsviewer) to convert Markdown formatted files into searchable HTML pages with index lists. Its contents are fetched from different releases automatically every couple of minutes. -* Developer API Docuumentation: [api.silverstripe.org](http://api.silverstripe.org) - powered by a customized +* Developer API Documentation: [api.silverstripe.org](http://api.silverstripe.org) - powered by a customized [phpDocumentor](http://www.phpdoc.org/) template, and is regenerated automatically every night. ## Source Control From c4408163eebcd213316e2ab4dec862261e7dcd33 Mon Sep 17 00:00:00 2001 From: CheeseSucker Date: Sat, 15 Jun 2013 00:57:29 +0200 Subject: [PATCH 2/6] Should fix an issue where the .htaccess file was split into several 
 tags.

This error is not reproducible by the github preview tab, so I am not 100% sure it is fixed. Added whitespace on the empty lines.
---
 docs/en/reference/execution-pipeline.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/reference/execution-pipeline.md b/docs/en/reference/execution-pipeline.md
index f7c508a6c..c048aa150 100644
--- a/docs/en/reference/execution-pipeline.md
+++ b/docs/en/reference/execution-pipeline.md
@@ -13,18 +13,18 @@ The basic .htaccess file after installing SilverStripe look like this:
 
 	
 	### SILVERSTRIPE START ###
-
+	
 	
 	Order deny,allow
 	Deny from all
 	Allow from 127.0.0.1
 	
-
+	
 	
 	RewriteEngine On
-
+	
 	RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
-
+	
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L]

From 40ef81286139d4f27b2563b0ad0d68ce91fd2495 Mon Sep 17 00:00:00 2001
From: CheeseSucker 
Date: Sat, 15 Jun 2013 00:58:45 +0200
Subject: [PATCH 3/6] [MINOR] Fixed a markup error.

---
 docs/en/reference/execution-pipeline.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/reference/execution-pipeline.md b/docs/en/reference/execution-pipeline.md
index c048aa150..09966de01 100644
--- a/docs/en/reference/execution-pipeline.md
+++ b/docs/en/reference/execution-pipeline.md
@@ -47,7 +47,7 @@ mod_rewrite works.
 
 ## main.php
 
-All requests go through `main.`php, which sets up the environment and then hands control over to `Director`.
+All requests go through `main.php`, which sets up the environment and then hands control over to `Director`.
 
 ## Director and URL patterns
 

From 23cd824426f59653426a723f46b314e968c31680 Mon Sep 17 00:00:00 2001
From: CheeseSucker 
Date: Sat, 15 Jun 2013 02:18:01 +0300
Subject: [PATCH 4/6] Rewrote a nonsensical paragraph about rewriting.

---
 docs/en/reference/execution-pipeline.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/en/reference/execution-pipeline.md b/docs/en/reference/execution-pipeline.md
index 09966de01..43c4bf74a 100644
--- a/docs/en/reference/execution-pipeline.md
+++ b/docs/en/reference/execution-pipeline.md
@@ -34,12 +34,14 @@ The basic .htaccess file after installing SilverStripe look like this:
 
 The `` section denies direct access to the template files from anywhere but the server itself.
 
-The next section enables the rewriting engine and rewrites requests to `framework/main.php` if they meet the following
+The `` section enables the rewriting engine. Requests will be rewritten if they meet the following
 criteria:
 
 *  URI doesn't end in .gif, .jpg, .png, .css, or .js
-*  The requested file doesn't exist on the filesystem `framework/main.php` is called with the REQUEST_FILENAME (%1) as the `url` parameter and also appends the original
-QUERY_STRING.
+*  The requested file doesn't exist on the filesystem
+ 
+The rewriting engine then calls `framework/main.php` with the REQUEST_FILENAME (%1) as the `url` parameter and also appends the original
+QUERY_STRING. **Example:** *"myblog/cakes?page=2"* is rewritten as *"framework/main.php?url=myblog/cakes&page=2"*.
 
 See the [mod_rewrite documentation](http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html) for more information on how
 mod_rewrite works.

From 9b881e5f92e07f06d9179e34fd04667896ef25ce Mon Sep 17 00:00:00 2001
From: CheeseSucker 
Date: Sat, 15 Jun 2013 02:19:29 +0300
Subject: [PATCH 5/6] [MINOR] build -> built

---
 docs/en/reference/execution-pipeline.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/reference/execution-pipeline.md b/docs/en/reference/execution-pipeline.md
index 43c4bf74a..f48cd3fcb 100644
--- a/docs/en/reference/execution-pipeline.md
+++ b/docs/en/reference/execution-pipeline.md
@@ -56,7 +56,7 @@ All requests go through `main.php`, which sets up the environment and then hands
 main.php relies on `[api:Director]` to work out which controller should handle this request.  `[api:Director]` will instantiate that
 controller object and then call `[api:Controller::run()]`.
 
-In general, the URL is build up as follows: `page/action/ID/otherID` - e.g. http://www.mysite.com/mypage/addToCart/12. 
+In general, the URL is built up as follows: `page/action/ID/otherID` - e.g. http://www.mysite.com/mypage/addToCart/12. 
 This will add an object with ID 12 to the cart.
 
 When you create a function, you can access the ID like this:

From 89a272b291d3a8b24de8519eace8b23b4f8bfba1 Mon Sep 17 00:00:00 2001
From: CheeseSucker 
Date: Sat, 15 Jun 2013 02:23:01 +0300
Subject: [PATCH 6/6] =?UTF-8?q?[MINOR]=20Changed=20so=20that=20=C3=A4=20is?=
 =?UTF-8?q?=20displayed=20as=20ä=20as=20intended=20by=20author.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en/misc/contributing/translation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/misc/contributing/translation.md b/docs/en/misc/contributing/translation.md
index 48c3fb92b..b1af61c62 100644
--- a/docs/en/misc/contributing/translation.md
+++ b/docs/en/misc/contributing/translation.md
@@ -37,7 +37,7 @@ but makes its intent clearer, and allows reordering of placeholders in your tran
 
 ### Do I need to convert special characters (e.g. HTML-entities)?
 
-Special characters (such as german umlauts) need to be entered in their native form. Please don't use HTML-entities ("ä" instead of "ä"). Silverstripe stores and renders most strings in UTF8 (Unicode) format.
+Special characters (such as german umlauts) need to be entered in their native form. Please don't use HTML-entities ("ä" instead of "ä"). Silverstripe stores and renders most strings in UTF8 (Unicode) format.
 
 ### How can I check out my translation in the interface?