Merge branch '5.0'

laravel-china · Mar 14, 2015 · acd29f5 · acd29f5
2 parents 88cf17a + 800c995
commit acd29f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/contributing.md b/contributing.md
@@ -1,3 +1,3 @@
 # Contribution Guidelines
 
-If you are submitting documentation for the **current stable release**, submit it to the corresponding branch. For example, documentation for Laravel 4.2 would be submitted to the `4.2` branch. Documentation intended for the next release of Laravel should be submitted to the `master` branch.
+If you are submitting documentation for the **current stable release**, submit it to the corresponding branch. For example, documentation for Laravel 5.0 would be submitted to the `5.0` branch. Documentation intended for the next release of Laravel should be submitted to the `master` branch.
diff --git a/homestead.md b/homestead.md
@@ -18,7 +18,7 @@ Homestead runs on any Windows, Mac, or Linux system, and includes the Nginx web
 
 > **Note:** If you are using Windows, you may need to enable hardware virtualization (VT-x). It can usually be enabled via your BIOS.
 
-Homestead is currently built and tested using Vagrant 1.6.
+Homestead is currently built and tested using Vagrant 1.7.
 
 <a name="included-software"></a>
 ## Included Software

diff --git a/routing.md b/routing.md
@@ -100,7 +100,7 @@ Laravel also stores the CSRF token in a `XSRF-TOKEN` cookie. You can use the coo
 <a name="method-spoofing"></a>
 ## Method Spoofing
 
-HTML forms do not support `PUT` or `DELETE` actions. So, when defining `PUT` or `DELETE` routes that are called from an HTML form, you will need to add a hidden `_method` field to the form.
+HTML forms do not support `PUT`, `PATCH` or `DELETE` actions. So, when defining `PUT`, `PATCH` or `DELETE` routes that are called from an HTML form, you will need to add a hidden `_method` field to the form.
 
 The value sent with the `_method` field will be used as the HTTP request method. For example:
 

diff --git a/upgrade.md b/upgrade.md
@@ -1,11 +1,19 @@
 # Upgrade Guide
 
+- [Upgrading To 5.0.16](#upgrade-5.0.16)
 - [Upgrading To 5.0 From 4.2](#upgrade-5.0)
 - [Upgrading To 4.2 From 4.1](#upgrade-4.2)
 - [Upgrading To 4.1.29 From <= 4.1.x](#upgrade-4.1.29)
 - [Upgrading To 4.1.26 From <= 4.1.25](#upgrade-4.1.26)
 - [Upgrading To 4.1 From 4.0](#upgrade-4.1)
 
+<a name="upgrade-5.0.16"></a>
+## Upgrading To 5.0.16
+
+In your `bootstrap/autoload.php` file, update the `$compiledPath` variable to:
+
+ $compiledPath = __DIR__.'/../vendor/compiled.php';
+
 <a name="upgrade-5.0"></a>
 ## Upgrading To 5.0 From 4.2