From bc92da5ba9f19d6f6f201be8b618698f9731df09 Mon Sep 17 00:00:00 2001 From: Eron Hennessey Date: Mon, 23 Jun 2014 14:11:06 -0700 Subject: [PATCH] Updates to SES topics and some fixes for autoscaling and rds. --- .../autoscaling/put-scheduled-update-group-action.rst | 4 ++-- awscli/examples/rds/create-db-instance.rst | 4 ---- .../ses/get-identity-notification-attributes.rst | 9 +++++---- .../ses/set-identity-feedback-forwarding-enabled.rst | 10 ++++++---- .../examples/ses/set-identity-notification-topic.rst | 6 +++--- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/awscli/examples/autoscaling/put-scheduled-update-group-action.rst b/awscli/examples/autoscaling/put-scheduled-update-group-action.rst index fea18260856a..81e1c0f0949c 100644 --- a/awscli/examples/autoscaling/put-scheduled-update-group-action.rst +++ b/awscli/examples/autoscaling/put-scheduled-update-group-action.rst @@ -2,11 +2,11 @@ The following ``put-scheduled-update-group-action`` command adds a scheduled action to an Auto Scaling group:: - aws autoscaling put-scheduled-update-group-action --auto-scaling-group-name basic-auto-scaling-group --scheduled-action-name sample-scheduled-action --start-time "2014-05-12T08:00:00Z" --end-time "2014-05-12T08:00:00Z" --min-size 2 --max-size 6 --desired-capacity 4 + aws autoscaling put-scheduled-update-group-action --auto-scaling-group-name basic-auto-scaling-group --scheduled-action-name sample-scheduled-action --start-time "2014-05-12T08:00:00Z" --end-time "2014-05-12T08:00:00Z" --min-size 2 --max-size 6 --desired-capacity 4 The following example creates a scheduled action to scale on a recurring schedule that is scheduled to execute at 00:30 hours on the first of January, June, and December every year:: - aws autoscaling put-scheduled-update-group-action --auto-scaling-group-name basic-auto-scaling-group --scheduled-action-name sample-scheduled-action --recurrence "30 0 1 1,6,12 0" --min-size 2 --max-size 6 --desired-capacity 4 + aws autoscaling put-scheduled-update-group-action --auto-scaling-group-name basic-auto-scaling-group --scheduled-action-name sample-scheduled-action --recurrence "30 0 1 1,6,12 0" --min-size 2 --max-size 6 --desired-capacity 4 For more information, see `Scheduled Scaling`_ in the *Auto Scaling Developer Guide*. diff --git a/awscli/examples/rds/create-db-instance.rst b/awscli/examples/rds/create-db-instance.rst index ecac070e5483..966cb4fc1a10 100644 --- a/awscli/examples/rds/create-db-instance.rst +++ b/awscli/examples/rds/create-db-instance.rst @@ -53,7 +53,3 @@ This command outputs a JSON block that indicates that the DB instance was create } } -For more information, see `Create an Amazon RDS DB Instance`_ in the *AWS Command Line Interface User Guide*. - -.. _`Create an Amazon RDS DB Instance`: http://docs.aws.amazon.com/cli/latest/userguide/cli-rds-create-instance.html - diff --git a/awscli/examples/ses/get-identity-notification-attributes.rst b/awscli/examples/ses/get-identity-notification-attributes.rst index 0d2921ca2993..5d06778da8cc 100644 --- a/awscli/examples/ses/get-identity-notification-attributes.rst +++ b/awscli/examples/ses/get-identity-notification-attributes.rst @@ -11,7 +11,8 @@ Output:: "user1@example.com": { "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" }, "user2@example.com": { "ForwardingEnabled": true @@ -19,10 +20,10 @@ Output:: } } -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 diff --git a/awscli/examples/ses/set-identity-feedback-forwarding-enabled.rst b/awscli/examples/ses/set-identity-feedback-forwarding-enabled.rst index 0e21e0416eb7..c3000fdf3cd8 100644 --- a/awscli/examples/ses/set-identity-feedback-forwarding-enabled.rst +++ b/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 user@example.com --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 diff --git a/awscli/examples/ses/set-identity-notification-topic.rst b/awscli/examples/ses/set-identity-notification-topic.rst index 41e2889b233f..2e5c8bacb786 100644 --- a/awscli/examples/ses/set-identity-notification-topic.rst +++ b/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 user@example.com --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