Remove conflicts

Author: Jamie Hannaford

README.md

@@ -19,7 +19,7 @@ Requirements
 * PHP >=5.4
 * cURL extension for PHP
 
-**Note**: Since PHP 5.3 has reached [end of life](http://php.net/eol.php) and is no longer officially supported, we are moving to 5.4 as a minimum requirement. If upgrading is not an option and you still need a stable version of the SDK for 5.3, please follow [this guide](http://docs.php-opencloud.com/en/latest/using-php-5.3).
+**Note**: Since PHP 5.3 has reached [end of life](http://php.net/eol.php) and is no longer officially supported, we are moving to 5.4 as a minimum requirement. If upgrading is not an option and you still need a stable version of the SDK for 5.3, please follow [this guide](http://docs.php-opencloud.com/en/latest/using-php-5.3.html).
 
 Installation
 ------------

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