From 4dc94d2ea51b272a717dd602c013d5279938023d Mon Sep 17 00:00:00 2001
From: Adam Engebretson <adam@enge.me>
Date: Thu, 5 Dec 2013 19:12:35 -0600
Subject: [PATCH] Enhancements to the 4.0>4.1 upgrade guide.

---
 upgrade.md | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/upgrade.md b/upgrade.md
index 29038675..945b451d 100644
--- a/upgrade.md
+++ b/upgrade.md
@@ -3,21 +3,24 @@ # Laravel Upgrade Guide
 ## Upgrading From 4.0 to 4.1
 
 - Update `composer.json` to require `"laravel/framework": "4.1.*"`
-- Remove call to `redirectIfTrailingSlash` in `bootstrap/start.php` file.
-- `composer update`.
-- Replace `public/index.php`, `artisan.php`.
-- Add new `app/config/remote.php` file.
-- Add new `expire_on_close` and `secure` options to `session` configuration file.
-- Add new `failed` queue job option to `queue` configuration file.
+- Remove call to `redirectIfTrailingSlash` in `/bootstrap/start.php` file.
+- Replace `/public/index.php` with [this](https://github.com/laravel/laravel/blob/develop/public/index.php) file, and `/artisan` with [this](https://github.com/laravel/laravel/blob/develop/artisan) file.
+- Add new `app/config/remote.php` file from [here](https://github.com/laravel/laravel/blob/develop/app/config/remote.php)
+- Add new `expire_on_close` and `secure` options to `session` configuration file to match [this](https://github.com/laravel/laravel/blob/develop/app/config/session.php) file.
+- Add new `failed` queue job option to `queue` configuration file to match [this](https://github.com/laravel/laravel/blob/develop/app/config/queue.php) file.
 - Edit `app/config/database.php` and update `redis.cluster` option to `false` to turn Redis clustering off by default.
-- Edit `app/config/view.php` and update `pagination` option to use bootstrap 3 as default pagination view.
-- Edit `app/config/app.php`; 
+- Edit `app/config/view.php` and update `pagination` option to use bootstrap 3 as default pagination view (optional).
+- Edit `app/config/app.php` so the `aliases` and `providers` array match [this](https://github.com/laravel/laravel/blob/develop/app/config/app.php) file:
   - in `aliases` change `'Controller' => 'Illuminate\Routing\Controllers\Controller',`
   to use `Illuminate\Routing\Controller`.
   - in `providers` add `'Illuminate\Remote\RemoteServiceProvider',`.
   - in `aliases` add `'SSH' => 'Illuminate\Support\Facades\SSH',`.
-- Edit `app/controllers/BaseController.php` change `use Illuminate\Routing\Controllers\Controller;` to `use Illuminate\Routing\Controller;`.
+- If `app/controllers/BaseController.php` has a use statement at the top, change `use Illuminate\Routing\Controllers\Controller;` to `use Illuminate\Routing\Controller;`. You may also remove this use statament, for you have registered a class alias for this.
 - If you are overriding `missingMethod` in your controllers, add $method as the first parameter.
 - Password reminder system tweaked for greater developer freedom. Inspect stub controller by running `auth:reminders-controller` Artisan command.
-- Update `reminders.php` language file.
+- Update `reminders.php` language file to match [this](https://github.com/laravel/laravel/blob/master/app/lang/en/reminders.php) file.
 - If you are using http hosts to set the $env variable in bootstrap/start.php, these should be changed to machine names (as returned by PHP's gethostname() function).
+
+Finally,
+
+- Run `composer update`