diff --git a/README.md b/README.md
index 7214b9253b..7a202c5c53 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,11 @@ minutes by [installing the SDK through Composer][docs-installation] or by downlo
* Provides easy-to-use HTTP clients for all supported AWS [services][docs-services], [regions][docs-rande], and
authentication protocols.
-* Is built for PHP 5.3.3+ and is compliant with [PSR-0][], [PSR-1][], and [PSR-2][].
-* Is easy to install through [Composer][install-packagist], [PEAR][install-pear], or single download ([zip][install-zip]
- or [phar][install-phar]).
-* Is built on [Guzzle v3][guzzle], and utilizes many of its features including persistent connections, parallel requests,
- events and plugins (via [Symfony2 EventDispatcher][symfony2-events]), service descriptions, [over-the-wire
+* Is built for PHP 5.3.3+ and is compliant with [PSR-0], [PSR-1], and [PSR-2].
+* Is easy to install through [Composer][install-packagist], or by downloading the [phar][install-phar] or
+ [zip][install-zip].
+* Is built on [Guzzle v3][guzzle], and utilizes many of its features, including persistent connections, parallel
+ requests, events and plugins (via [Symfony2 EventDispatcher][symfony2-events]), service descriptions, [over-the-wire
logging][docs-wire-logging], caching, flexible batching, and request retrying with truncated exponential backoff.
* Provides convenience features including easy response pagination via [Iterators][docs-iterators], resource
[Waiters][docs-waiters], and simple [modelled responses][docs-models].
@@ -46,13 +46,12 @@ minutes by [installing the SDK through Composer][docs-installation] or by downlo
1. **Sign up for AWS** – Before you begin, you need to [sign up for an AWS account][docs-signup] and retrieve your AWS
credentials.
-1. **Minimum requirements** – To run the SDK, your system will need to meet the [minimum
- requirements][docs-requirements], including having **PHP 5.3.3+** compiled with the cURL extension and cURL 7.16.2+
- compiled with OpenSSL and zlib.
-1. **Install the SDK** – Using [Composer][] is the recommended way to install the AWS SDK for PHP. The SDK is available
- via [Packagist][] under the [`aws/aws-sdk-php`][install-packagist] package. Please see the
- [Installation section of the User Guide][docs-installation] for more detailed information about installing the SDK
- through Composer and other means (e.g., [Phar][install-phar], [Zip][install-zip], [PEAR][install-pear]).
+1. **Minimum requirements** – To run the SDK, your system will need to meet the [minimum requirements][docs-requirements],
+ including having **PHP 5.3.3+** compiled with the cURL extension and cURL 7.16.2+ compiled with OpenSSL and zlib.
+1. **Install the SDK** – Using [Composer] is the recommended way to install the AWS SDK for PHP. The SDK is available
+ via [Packagist] under the [`aws/aws-sdk-php`][install-packagist] package. Please see the [Installation section of
+ the User Guide][docs-installation] for more detailed information about installing the SDK through Composer and other
+ means.
1. **Using the SDK** – The best way to become familiar with how to use the SDK is to read the [User Guide][docs-guide].
The [Getting Started Guide][docs-quickstart] will help you become familiar with the basic concepts, and there are
also specific guides for each of the [supported services][docs-services].
@@ -105,7 +104,7 @@ try {
* [Put an item in your Amazon DynamoDB table][example-dynamodb-putitem]
* [Send a message to your Amazon SQS queue][example-sqs-sendmessage]
* Please browse the [User Guide][docs-guide] and [API docs][docs-api] or check out our [AWS SDK Development
- Blog][sdk-blog] for even more examples.
+ Blog][sdk-blog] for even more examples and tutorials.
### Related Projects
diff --git a/docs/installation.rst b/docs/installation.rst
index ee573002c3..99d79bcf92 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -105,7 +105,7 @@ following required and suggested libraries:
Using the zip file is great if you:
-1. Prefer not to or cannot use package managers like Composer and PEAR.
+1. Prefer not to or cannot use Composer.
2. Cannot use phar files due to environment limitations.
3. Want to use only specific files from the SDK.
@@ -122,6 +122,14 @@ If you have `phing `_ installed, you can clone the SDK a
Installing via PEAR
~~~~~~~~~~~~~~~~~~~
+.. admonition:: Installation via PEAR will soon be unsupported.
+
+ The use of PEAR as a dependency management system has declined in the PHP community in favor of Composer, and
+ notable projects like PHPUnit, Symfony, and Doctrine are all retiring their PEAR channels at various points
+ during this year. We will eventually stop updating our PEAR channel during this year, so we strongly recommend that
+ you switch to using Composer to install the AWS SDK for PHP.
+
+
`PEAR `_ packages are easy to install, and are available in your PHP environment path so that they
are accessible to any PHP project. PEAR packages are not specific to your project, but rather to the machine they're
installed on.
diff --git a/docs/migration-guide.rst b/docs/migration-guide.rst
index d20191f235..28bdad21a0 100644
--- a/docs/migration-guide.rst
+++ b/docs/migration-guide.rst
@@ -41,9 +41,7 @@ What's New?
- Plug-ins for over-the-wire logging and response caching
- "Waiter" objects that allow you to poll a resource until it is in a desired state
- Resource iterator objects for easily iterating over paginated responses
-- Service-specific sets of exceptions
- Modeled responses with a simpler interface
-- Grouped constants (Enums) for service parameter options
- Flexible request batching system
- Service builder/container that supports easy configuration and dependency injection
- Full unit test suite with extensive code coverage
@@ -450,8 +448,6 @@ From Version 2 of the SDK
require '/path/to/vendor/autoload.php';
use Aws\Common\Aws;
- use Aws\DynamoDb\Enum\ComparisonOperator;
- use Aws\DynamoDb\Enum\Type;
$aws = Aws::factory('/path/to/config.php');
$dynamodb = $aws->get('dynamodb');
@@ -462,9 +458,9 @@ From Version 2 of the SDK
'AttributesToGet' => array('id', 'age', 'name'),
'ScanFilter' => array(
'age' => array(
- 'ComparisonOperator' => ComparisonOperator::GE,
+ 'ComparisonOperator' => 'GE',
'AttributeValueList' => array(
- array(Type::NUMBER => '16')
+ array('N' => '16')
)
),
)
@@ -474,7 +470,7 @@ From Version 2 of the SDK
// that are 16 or older
$people = array();
foreach ($scan as $item) {
- $people[] = $item['name'][Type::STRING];
+ $people[] = $item['name']['N'];
}
print_r($people);
diff --git a/docs/quick-start.rst b/docs/quick-start.rst
index 2c84b9380e..c3326427ad 100644
--- a/docs/quick-start.rst
+++ b/docs/quick-start.rst
@@ -22,8 +22,6 @@ Using Composer ``require '/path/to/vendor/autoload.php';``
Using the Phar ``require '/path/to/aws.phar';``
-------------------------- ---------------------------------------------------------------------------------------------
Using the Zip ``require '/path/to/aws-autoloader.php';``
--------------------------- ---------------------------------------------------------------------------------------------
-Using PEAR ``require 'AWSSDKforPHP/aws.phar';``
========================== =============================================================================================
For the remainder of this guide, we will show examples that use the Composer installation method. If you are using a
diff --git a/docs/service-autoscaling.rst b/docs/service-autoscaling.rst
index ceed81433b..5bf1ffdc0b 100644
--- a/docs/service-autoscaling.rst
+++ b/docs/service-autoscaling.rst
@@ -1,5 +1,3 @@
.. service:: AutoScaling
-.. include:: _snippets/incomplete.txt
-
.. apiref:: AutoScaling
diff --git a/docs/service-cloudformation.rst b/docs/service-cloudformation.rst
index bc932f1cfd..4abbae27dc 100644
--- a/docs/service-cloudformation.rst
+++ b/docs/service-cloudformation.rst
@@ -1,5 +1,3 @@
.. service:: CloudFormation
-.. include:: _snippets/incomplete.txt
-
.. apiref:: CloudFormation
diff --git a/docs/service-cloudfront-20120505.rst b/docs/service-cloudfront-20120505.rst
index 1feb701b8e..b15f320797 100644
--- a/docs/service-cloudfront-20120505.rst
+++ b/docs/service-cloudfront-20120505.rst
@@ -129,6 +129,4 @@ The following is an example of how you could use the signed URL to construct a w