From 823bc3b9ce3f26c5d16fd77e73bc757db93a9f00 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <me@chillu.com>
Date: Tue, 10 Oct 2017 10:26:11 +0200
Subject: [PATCH 1/2] Simplified upgrading docs around index.php

No need to paste the file there if we're auto upgrading it.
The guide is long enough already :)
---
 docs/en/04_Changelogs/4.0.0.md | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md
index 43eea3d5e..3a4c41bf7 100644
--- a/docs/en/04_Changelogs/4.0.0.md
+++ b/docs/en/04_Changelogs/4.0.0.md
@@ -99,29 +99,6 @@ cd ~/Project/Root
 This will ensure that your `.htaccess` and `index.php` are set to a reasonable default value
 for a clean installation.
 
-After upgrade the `index.php` should look something similar to the below:
-
-```php
-<?php
-
-use SilverStripe\Control\HTTPApplication;
-use SilverStripe\Control\HTTPRequestBuilder;
-use SilverStripe\Core\CoreKernel;
-use SilverStripe\Core\Startup\ErrorControlChainMiddleware;
-
-require __DIR__ . '/vendor/autoload.php';
-
-// Build request and detect flush
-$request = HTTPRequestBuilder::createFromEnvironment();
-
-// Default application
-$kernel = new CoreKernel(BASE_PATH);
-$app = new HTTPApplication($kernel);
-$app->addMiddleware(new ErrorControlChainMiddleware($app));
-$response = $app->handle($request);
-$response->output();
-```
-
 #### Upgrade references to renamed and namespaced classes
 
 Nearly all core PHP classes have been namespaced. For example, `DataObject` is now called `SilverStripe\ORM\DataObject`.

From feadca875cf0fda8f133e033de68bb4f9b5ec1a4 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <me@chillu.com>
Date: Tue, 10 Oct 2017 10:28:02 +0200
Subject: [PATCH 2/2] Clearer .htaccess upgrading instructions

---
 docs/en/04_Changelogs/4.0.0.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md
index 3a4c41bf7..ef7c73dd8 100644
--- a/docs/en/04_Changelogs/4.0.0.md
+++ b/docs/en/04_Changelogs/4.0.0.md
@@ -97,7 +97,9 @@ cd ~/Project/Root
 ```
 
 This will ensure that your `.htaccess` and `index.php` are set to a reasonable default value
-for a clean installation.
+for a clean installation. If you have applied customisations to your `.htaccess`
+file (e.g. a custom `main.php`, HTTP header configuration, deny file access),
+you'll need to manually reapply these to the copied default file.
 
 #### Upgrade references to renamed and namespaced classes