fix conflicts

kieran-paddle · Sep 8, 2020 · 523acb3 · 523acb3
2 parents ac49156 + c02cd9a
commit 523acb3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/queries.md b/queries.md
@@ -575,6 +575,13 @@ The `orderBy` method allows you to sort the result of the query by a given colum
     $users = DB::table('users')
                     ->orderBy('name', 'desc')
                     ->get();
+                    
+If you need to sort by multiple columns, you may invoke `orderBy` as many times as needed:
+
+    $users = DB::table('users')
+                    ->orderBy('name', 'desc')
+                    ->orderBy('email', 'asc')
+                    ->get();
 
 #### latest / oldest
 

diff --git a/queues.md b/queues.md
@@ -612,6 +612,8 @@ However, you may also define the maximum number of seconds a job should be allow
         public $timeout = 120;
     }
 
+Sometimes, IO blocking processes such as sockets or outgoing HTTP connections may not respect your specified timeout. Therefore, when using these features, you should always attempt to specify a timeout using their APIs as well. For example, when using Guzzle, you should always specify a connection and request timeout value.
+
 <a name="rate-limiting"></a>
 ### Rate Limiting
 

diff --git a/session.md b/session.md
@@ -218,7 +218,7 @@ To mitigate this, Laravel provides functionality that allows you to limit concur
 
 The `block` method accepts two optional arguments. The first argument accepted by the `block` method is the maximum number of seconds the session lock should be held for before it is released. Of course, if the request finishes executing before this time the lock will be released earlier.
 
-The second argument accepted by the `block` method is the number of seconds a request should wait while attempting to obtain a session lock. A `Illuminate\Contracts\Cache\LockTimoutException` will be thrown if the request is unable to obtain a session lock within the given number of seconds.
+The second argument accepted by the `block` method is the number of seconds a request should wait while attempting to obtain a session lock. A `Illuminate\Contracts\Cache\LockTimeoutException` will be thrown if the request is unable to obtain a session lock within the given number of seconds.
 
 If neither of these arguments are passed, the lock will be obtained for a maximum of 10 seconds and requests will wait a maximum of 10 seconds while attempting to obtain a lock:
 

diff --git a/telescope.md b/telescope.md
@@ -133,7 +133,9 @@ Telescope exposes a dashboard at `/telescope`. By default, you will only be able
 <a name="upgrading-telescope"></a>
 ## Upgrading Telescope
 
-When upgrading to a new version of Telescope, you should re-publish Telescope's assets:
+When upgrading to a new major version of Telescope, it's important that you carefully review [the upgrade guide](https://github.com/laravel/telescope/blob/master/UPGRADE.md).
+
+In addition, when upgrading to any new Telescope version, you should re-publish Telescope's assets:
 
     php artisan telescope:publish