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

laravel · Oct 14, 2016 · 98a18dd · 98a18dd
2 parents 6b69fb8 + b3fd611
commit 98a18dd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG-5.2.md b/CHANGELOG-5.2.md
@@ -259,7 +259,7 @@
 - Simplified calling `Model::replicate()` with `$except` argument ([#13676](https://github.com/laravel/framework/pull/13676))
 - Allow auth events to be serialized ([#13704](https://github.com/laravel/framework/pull/13704))
 - Added `for` and `id` attributes to auth scaffold ([#13689](https://github.com/laravel/framework/pull/13689))
-- Aquire lock before deleting reserved job ([4b502dc](https://github.com/laravel/framework/commit/4b502dc6eecd80efad01e845469b9a2bac26dae0#diff-b05083dc38b4e45d38d28c676abbad83))
+- Acquire lock before deleting reserved job ([4b502dc](https://github.com/laravel/framework/commit/4b502dc6eecd80efad01e845469b9a2bac26dae0#diff-b05083dc38b4e45d38d28c676abbad83))
 
 ### Fixed
 - Prefix timestamps when updating many-to-many relationships ([#13519](https://github.com/laravel/framework/pull/13519))

diff --git a/src/Illuminate/Database/Events/QueryExecuted.php b/src/Illuminate/Database/Events/QueryExecuted.php
@@ -26,7 +26,7 @@ class QueryExecuted
     public $time;
 
     /**
-     * The databse connection instance.
+     * The database connection instance.
      *
      * @var \Illuminate\Database\Connection
      */

diff --git a/src/Illuminate/Queue/SyncQueue.php b/src/Illuminate/Queue/SyncQueue.php
@@ -52,7 +52,7 @@ public function push($job, $data = '', $queue = null)
     }
 
     /**
-     * Handle an exception that occured while processing a job.
+     * Handle an exception that occurred while processing a job.
      *
      * @param  \Illuminate\Queue\Jobs\Job  $queueJob
      * @param  \Exception  $e