Merge remote-tracking branch 'origin/3'

Conflicts:
	composer.json

.editorconfig

@@ -0,0 +1,26 @@
+# For more information about the properties used in
+# this file, please see the EditorConfig documentation:
+# http://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
+indent_style = space
+
+[{.travis.yml,package.json}]
+# The indent size used in the `package.json` file cannot be changed
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
+indent_size = 2
+indent_style = space

.htaccess

@@ -1,38 +1,44 @@
 ### SILVERSTRIPE START ###
+
+# Deny access to templates (but allow from localhost)
 <Files *.ss>
 	Order deny,allow
 	Deny from all
 	Allow from 127.0.0.1
 </Files>
 
+# Deny access to IIS configuration
 <Files web.config>
 	Order deny,allow
 	Deny from all
 </Files>
 
-# This denies access to all yml files, since developers might include sensitive
-# information in them. See the docs for work-arounds to serve some yaml files
+# Deny access to YAML configuration files which might include sensitive information
 <Files ~ "\.ya?ml$">
 	Order allow,deny
 	Deny from all
 </Files>
 
+# Route errors to static pages automatically generated by SilverStripe
 ErrorDocument 404 /assets/error-404.html
 ErrorDocument 500 /assets/error-500.html
 
 <IfModule mod_rewrite.c>
 	SetEnv HTTP_MOD_REWRITE On
-	RewriteEngine On	
+	RewriteEngine On
 
+	# Deny access to potentially sensitive files and folders
 	RewriteRule ^vendor(/|$) - [F,L,NC]
 	RewriteRule silverstripe-cache(/|$) - [F,L,NC]
 	RewriteRule composer\.(json|lock) - [F,L,NC]
-
+	
+	# Process through SilverStripe if no file with the requested name exists.
+	# Pass through the original path as a query parameter, and retain the existing parameters.
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_URI} !\.php$
 	RewriteRule .* framework/main.php?url=%1 [QSA]
-
+	
+	# If framework isn't in a subdirectory, rewrite to installer
 	RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteRule . %1/install.php? [R,L]

assets/.htaccess

@@ -10,20 +10,19 @@
 #
 # For example, to add *.exe files to list of downloadable assets, change this line: 
 #
-#   <FilesMatch "\.(html|htm|xhtml...
+#   <FilesMatch "\.(?i:html|htm|xhtml...
 #
 # To this:
 #
-#   <FilesMatch "\.(exe|html|htm|xhtml...
+#   <FilesMatch "\.(?i:exe|html|htm|xhtml...
 #
 # Once you do this, visitors will be able to download *.exe files that are uploaded to the assets
 # directory.
 #
-# For compatibility reasons, we include uppercase versions of allowed extensions, as Apache 1.3
-# does not support regular expression case insensitive matches using PCRE style.
+# Please note Apache 1.3 does not support regular expression case insensitive matches using PCRE style.
 #
 Deny from all
-<FilesMatch "\.(?i:html|htm|xhtml|js|css|bmp|png|gif|jpg|jpeg|ico|pcx|tif|tiff|au|mid|midi|mpa|mp3|ogg|m4a|ra|wma|wav|cda|avi|mpg|mpeg|asf|wmv|m4v|mov|mkv|mp4|ogv|webm|swf|flv|ram|rm|doc|docx|txt|rtf|xls|xlsx|pages|ppt|pptx|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf|gpx|kml)$">
+<FilesMatch "\.(?i:html|htm|xhtml|js|css|bmp|png|gif|jpg|jpeg|ico|pcx|tif|tiff|au|mid|midi|mpa|mp3|ogg|m4a|ra|wma|wav|cda|avi|mpg|mpeg|asf|wmv|m4v|mov|mkv|mp4|ogv|webm|swf|flv|ram|rm|doc|docx|dotx|dotm|txt|rtf|xls|xlsx|xltx|xltm|pages|ppt|pptx|potx|potm|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf|gpx|kml)$">
 	Allow from all
 </FilesMatch>
 

install-frameworkmissing.html

@@ -20,7 +20,7 @@
 						<p>If you downloaded a pre-packaged zip or tar.gz, something might have gone wrong with the packaging
 						process. Please try re-downloading, or try an older version.</p>
 
-						<p>If you downloaded this from <a href="https://github.com/silverstripe">github</a>, you need to install the <strong>framework</strong> module. You can do this manually, or by running the tools/new-project script from the command line.</p>
+						<p>If you downloaded this from <a href="https://github.com/silverstripe">GitHub</a>, you need to install the <strong>framework</strong> module. You can do this manually, or by running the tools/new-project script from the command line.</p>
 					</div>
 				</div>
 				<div class="clear"><!-- --></div>