Merge pull request #585 from AdamMerrifield/working

Guzzle Backoff Correction

Author: Jamie Hannaford

doc/services/object-store/migrating-containers.rst

@@ -37,13 +37,13 @@ Requirements
 
     use Guzzle\Plugin\Backoff\BackoffPlugin;
 
-    // set timeout in secs
-    $timeout = 10;
+    // maximum number of retries
+    $maxRetries = 10;
 
     // set HTTP error codes
     $httpErrors = array(500, 503, 408);
 
-    $backoffPlugin = BackoffPlugin::getExponentialBackoff($timeout, $httpErrors);
+    $backoffPlugin = BackoffPlugin::getExponentialBackoff($maxRetries, $httpErrors);
     $client->addSubscriber($backoffPlugin);
 
 

doc/services/object-store/objects.rst

@@ -259,7 +259,7 @@ Get content of file
 .. code-block:: php
 
   /** @param $content Guzzle\Http\EntityBody */
-  $content = $object->getContainer();
+  $content = $object->getContent();
 
 
 Get type of file