Merge branch 'EronHennessey-doc_updates_ses' into develop

* EronHennessey-doc_updates_ses:
  Updates to SES topics and some fixes for autoscaling and rds.

awscli/examples/ses/get-identity-notification-attributes.rst

@@ -11,18 +11,19 @@ Output::
         "[email protected]": {
             "ForwardingEnabled": false,
             "ComplaintTopic": "arn:aws:sns:us-east-1:EXAMPLE65304:MyTopic",
-            "BounceTopic": "arn:aws:sns:us-east-1:EXAMPLE65304:MyTopic"
+            "BounceTopic": "arn:aws:sns:us-east-1:EXAMPLE65304:MyTopic",
+            "DeliveryTopic": "arn:aws:sns:us-east-1:EXAMPLE65304:MyTopic"
         },
         "[email protected]": {
             "ForwardingEnabled": true
         }
     }
  }
 
-If email feedback forwarding is disabled, then this command returns the Amazon Resource Names (ARNs) of the SNS topics that bounce and complaint notifications are sent to.
+This command returns the status of email feedback forwarding and, if applicable, the Amazon Resource Names (ARNs) of the Amazon SNS topics that bounce, complaint, and delivery notifications are sent to.
 
 If you call this command with an identity that you have never submitted for verification, that identity won't appear in the output.
 
-For more information about bounce and complaint notifications, see `Bounce and Complaint Notifications in Amazon SES`_ in the *Amazon Simple Email Service Developer Guide*.
+For more information about notifications, see `Using Notifications With Amazon SES`_ in the *Amazon Simple Email Service Developer Guide*.
 
-.. _`Bounce and Complaint Notifications in Amazon SES`: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/bounce-complaint-notifications.html
+.. _`Using Notifications With Amazon SES`: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/notifications.html

awscli/examples/ses/set-identity-feedback-forwarding-enabled.rst

@@ -1,10 +1,12 @@
-**To enable or disable email feedback forwarding for an Amazon SES verified identity**
+**To enable or disable bounce and complaint email feedback forwarding for an Amazon SES verified identity**
 
-The following example uses the ``set-identity-feedback-forwarding-enabled`` command to enable a verified email address to receive feedback notifications by email::
+The following example uses the ``set-identity-feedback-forwarding-enabled`` command to enable a verified email address to receive bounce and complaint notifications by email::
 
     aws ses set-identity-feedback-forwarding-enabled --identity [email protected] --forwarding-enabled
 
-For more information about feedback notifications, see `Bounce and Complaint Notifications in Amazon SES`_ in the *Amazon Simple Email Service Developer Guide*.
+You are required to receive bounce and complaint notifications via either Amazon SNS or email feedback forwarding, so you can only disable email feedback forwarding if you select an Amazon SNS topic for both bounce and complaint notifications.
 
-.. _`Bounce and Complaint Notifications in Amazon SES`: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/bounce-complaint-notifications.html
+For more information about notifications, see `Using Notifications With Amazon SES`_ in the *Amazon Simple Email Service Developer Guide*.
+
+.. _`Using Notifications With Amazon SES`: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/notifications.html
 

awscli/examples/ses/set-identity-notification-topic.rst

@@ -1,10 +1,10 @@
-**To set the Amazon SNS topic to which Amazon SES will publish bounce and complaint notifications for a verified identity**
+**To set the Amazon SNS topic to which Amazon SES will publish bounce, complaint, and/or delivery notifications for a verified identity**
 
 The following example uses the ``set-identity-notification-topic`` command to specify the Amazon SNS topic to which a verified email address will receive bounce notifications::
 
     aws ses set-identity-notification-topic --identity [email protected] --notification-type Bounce --sns-topic arn:aws:sns:us-east-1:EXAMPLE65304:MyTopic
 
-For more information about feedback notifications, see `Bounce and Complaint Notifications in Amazon SES`_ in the *Amazon Simple Email Service Developer Guide*.
+For more information about notifications, see `Using Notifications With Amazon SES`_ in the *Amazon Simple Email Service Developer Guide*.
 
-.. _`Bounce and Complaint Notifications in Amazon SES`: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/bounce-complaint-notifications.html
+.. _`Using Notifications With Amazon SES`: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/notifications.html