Merge remote-tracking branch 'origin/5.3' into 5.3

laravelhungary · Sep 1, 2016 · 2e958e2 · 2e958e2
2 parents 1886738 + 0b6eb7c
commit 2e958e2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/broadcasting.md b/broadcasting.md
@@ -185,7 +185,7 @@ The `ShouldBroadcast` interface requires you to implement a single method: `broa
     use Illuminate\Broadcasting\InteractsWithSockets;
     use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
-    class ServerCreated extends Event implements ShouldBroadcast
+    class ServerCreated implements ShouldBroadcast
     {
         use SerializesModels;
 

diff --git a/database.md b/database.md
@@ -7,7 +7,6 @@
 - [Running Raw SQL Queries](#running-queries)
     - [Listening For Query Events](#listening-for-query-events)
 - [Database Transactions](#database-transactions)
-- [Using Multiple Database Connections](#accessing-connections)
 
 <a name="introduction"></a>
 ## Introduction

diff --git a/eloquent.md b/eloquent.md
@@ -304,7 +304,7 @@ Updates can also be performed against any number of models that match a given qu
 
 The `update` method expects an array of column and value pairs representing the columns that should be updated.
 
-> {note} When issuing a mass update via Eloquent, the `saved` and `updated` model events will be not be fired for the updated models. This is because the models are never actually retrieved when issuing a mass update.
+> {note} When issuing a mass update via Eloquent, the `saved` and `updated` model events will not be fired for the updated models. This is because the models are never actually retrieved when issuing a mass update.
 
 <a name="mass-assignment"></a>
 ### Mass Assignment

diff --git a/helpers.md b/helpers.md
@@ -39,6 +39,7 @@ Laravel includes a variety of global "helper" PHP functions. Many of these funct
 [array_last](#method-array-last)
 [array_only](#method-array-only)
 [array_pluck](#method-array-pluck)
+[array_prepend](#method-array-prepend)
 [array_pull](#method-array-pull)
 [array_set](#method-array-set)
 [array_sort](#method-array-sort)

diff --git a/session.md b/session.md
@@ -59,7 +59,7 @@ You may use the `session:table` Artisan command to generate this migration:
 
 #### Redis
 
-Before using Redis sessions with Laravel, you will need to install the `predis/predis` package (~1.0) via Composer. You may configure your Redis connections in the `database` configuration file. In the `session` configuration file, the `database` option may be used to specify which Redis connection is used by the session.
+Before using Redis sessions with Laravel, you will need to install the `predis/predis` package (~1.0) via Composer. You may configure your Redis connections in the `database` configuration file. In the `session` configuration file, the `connection` option may be used to specify which Redis connection is used by the session.
 
 <a name="using-the-session"></a>
 ## Using The Session

diff --git a/structure.md b/structure.md
@@ -115,7 +115,7 @@ The `Console` directory contains all of the custom Artisan commands for your app
 <a name="the-events-directory"></a>
 #### The Events Directory
 
-This directory does not exist by default, but will be created for you by the `event:generate` and `event:make` Artisan commands. The `Events` directory, as you might expect, houses [event classes](/docs/{{version}}/events). Events may be used to alert other parts of your application that a given action has occurred, providing a great deal of flexibility and decoupling.
+This directory does not exist by default, but will be created for you by the `event:generate` and `make:event` Artisan commands. The `Events` directory, as you might expect, houses [event classes](/docs/{{version}}/events). Events may be used to alert other parts of your application that a given action has occurred, providing a great deal of flexibility and decoupling.
 
 <a name="the-exceptions-directory"></a>
 #### The Exceptions Directory