Merge remote-tracking branch 'origin/feature/httpclient_multiple_baseuri' into feature/httpclient_multiple_baseuri

Author: Tiriel

http_client.rst

@@ -731,7 +731,11 @@ The ``RetryableHttpClient`` uses a
 decide if the request should be retried, and to define the waiting time between
 each retry.
 
+<<<<<<< HEAD
 Retry over different URIs
+=======
+Retry Over Different URIs
+>>>>>>> origin/feature/httpclient_multiple_baseuri
 .........................
 
 .. versionadded:: 6.3
@@ -747,13 +751,13 @@ request::
         'base_uri' => [
             // first request will use this base URI
             'http://example.com/a/',
-            // if first request fails, this second base URI will be used
+            // if first request fails, the following base URI will be used
             'http://example.com/b/',
         ],
     ]);
 
 When the number of retries is higher than the number of base URIs, the 
-last base URI will be used for remaining retries.
+last base URI will be used for the remaining retries.
 
 If you want to shuffle the order of base URIs for each retry attempt, nest the
 base URIs you want to shuffle in an additional array::