Repository: boto/botocore
Pull request #689 (2015-10-16 16:44:52)

Adds the count ability to paginator
Paginator's result_key used to expect list value only.
Now, if a result_key's value is an integer (or a float),
paginator can aggregate them.


Patch:
diff --git a/botocore/__init__.py b/botocore/__init__.py
index 0ebdc3e9a..80c5e411b 100644
--- a/botocore/__init__.py
+++ b/botocore/__init__.py
@@ -16,7 +16,7 @@ import os
 import re
 import logging
 
-__version__ = '1.2.11'
+__version__ = '1.2.10'
 
 
 class NullHandler(logging.Handler):
diff --git a/botocore/data/kms/2014-11-01/service-2.json b/botocore/data/kms/2014-11-01/service-2.json
index 72cb9b1c2..575f39245 100644
--- a/botocore/data/kms/2014-11-01/service-2.json
+++ b/botocore/data/kms/2014-11-01/service-2.json
@@ -10,69 +10,8 @@
     "targetPrefix":"TrentService",
     "protocol":"json"
   },
-  "documentation":"<fullname>AWS Key Management Service</fullname> <p>AWS Key Management Service (AWS KMS) is an encryption and key management web service. This guide describes the AWS KMS operations that you can call programmatically. For general information about AWS KMS, see the <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/\">AWS Key Management Service Developer Guide</a>.</p> <note> <p>AWS provides SDKs that consist of libraries and sample code for various programming languages and platforms (Java, Ruby, .Net, iOS, Android, etc.). The SDKs provide a convenient way to create programmatic access to AWS KMS and other AWS services. For example, the SDKs take care of tasks such as signing requests (see below), managing errors, and retrying requests automatically. For more information about the AWS SDKs, including how to download and install them, see <a href=\"http://aws.amazon.com/tools/\">Tools for Amazon Web Services</a>.</p> </note> <p>We recommend that you use the AWS SDKs to make programmatic API calls to AWS KMS.</p> <p>Clients must support TLS (Transport Layer Security) 1.0. We recommend TLS 1.2. Clients must also support cipher suites with Perfect Forward Secrecy (PFS) such as Ephemeral Diffie-Hellman (DHE) or Elliptic Curve Ephemeral Diffie-Hellman (ECDHE). Most modern systems such as Java 7 and later support these modes. </p> <p><b>Signing Requests</b></p> <p>Requests must be signed by using an access key ID and a secret access key. We strongly recommend that you <i>do not</i> use your AWS account access key ID and secret key for everyday work with AWS KMS. Instead, use the access key ID and secret access key for an IAM user, or you can use the AWS Security Token Service to generate temporary security credentials that you can use to sign requests.</p> <p>All AWS KMS operations require <a href=\"http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4</a>.</p> <p><b>Logging API Requests</b></p> <p>AWS KMS supports AWS CloudTrail, a service that logs AWS API calls and related events for your AWS account and delivers them to an Amazon S3 bucket that you specify. By using the information collected by CloudTrail, you can determine what requests were made to AWS KMS, who made the request, when it was made, and so on. To learn more about CloudTrail, including how to turn it on and find your log files, see the <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/\">AWS CloudTrail User Guide</a>.</p> <p><b>Additional Resources</b></p> <p>For more information about credentials and request signing, see the following:</p> <ul> <li> <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-security-credentials.html\">AWS Security Credentials</a> - This topic provides general information about the types of credentials used for accessing AWS. </li> <li> <a href=\"http://docs.aws.amazon.com/STS/latest/UsingSTS/\">AWS Security Token Service</a> - This guide describes how to create and use temporary security credentials. </li> <li> <a href=\"http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html\">Signing AWS API Requests</a> - This set of topics walks you through the process of signing a request using an access key ID and a secret access key. </li> </ul> <p><b>Commonly Used APIs</b></p> <p> Of the APIs discussed in this guide, the following will prove the most useful for most applications. You will likely perform actions other than these, such as creating keys and assigning policies, by using the console.</p> <ul> <li><a>Encrypt</a></li> <li><a>Decrypt</a></li> <li><a>GenerateDataKey</a></li> <li><a>GenerateDataKeyWithoutPlaintext</a></li> </ul>",
+  "documentation":"<fullname>AWS Key Management Service</fullname> <p> AWS Key Management Service (KMS) is an encryption and key management web service. This guide describes the KMS actions that you can call programmatically. For general information about KMS, see the <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/overview.html\"> AWS Key Management Service Developer Guide </a> </p> <note> AWS provides SDKs that consist of libraries and sample code for various programming languages and platforms (Java, Ruby, .Net, iOS, Android, etc.). The SDKs provide a convenient way to create programmatic access to KMS and AWS. For example, the SDKs take care of tasks such as signing requests (see below), managing errors, and retrying requests automatically. For more information about the AWS SDKs, including how to download and install them, see <a href=\"http://aws.amazon.com/tools/\">Tools for Amazon Web Services</a>. </note> <p> We recommend that you use the AWS SDKs to make programmatic API calls to KMS. </p> <p>Clients must support TLS (Transport Layer Security) 1.0. We recommend TLS 1.2. Clients must also support cipher suites with Perfect Forward Secrecy (PFS) such as Ephemeral Diffie-Hellman (DHE) or Elliptic Curve Ephemeral Diffie-Hellman (ECDHE). Most modern systems such as Java 7 and later support these modes. </p> <p><b>Signing Requests</b></p> <p> Requests must be signed by using an access key ID and a secret access key. We strongly recommend that you do not use your AWS account access key ID and secret key for everyday work with KMS. Instead, use the access key ID and secret access key for an IAM user, or you can use the AWS Security Token Service to generate temporary security credentials that you can use to sign requests. </p> <p> All KMS operations require <a href=\"http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4</a>. </p> <p><b>Recording API Requests</b></p> <p> KMS supports AWS CloudTrail, a service that records AWS API calls and related events for your AWS account and delivers them to an Amazon S3 bucket that you specify. By using the information collected by CloudTrail, you can determine what requests were made to KMS, who made the request, when it was made, and so on. To learn more about CloudTrail, including how to turn it on and find your log files, see the <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/whatiscloudtrail.html\">AWS CloudTrail User Guide</a> </p> <p><b>Additional Resources</b></p> <p>For more information about credentials and request signing, see the following:</p> <ul> <li> <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-security-credentials.html\">AWS Security Credentials</a>. This topic provides general information about the types of credentials used for accessing AWS. </li> <li> <a href=\"http://docs.aws.amazon.com/STS/latest/UsingSTS/\">AWS Security Token Service</a>. This guide describes how to create and use temporary security credentials. </li> <li> <a href=\"http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html\">Signing AWS API Requests</a>. This set of topics walks you through the process of signing a request using an access key ID and a secret access key. </li> </ul> <p><b>Commonly Used APIs</b></p> <p> Of the APIs discussed in this guide, the following will prove the most useful for most applications. You will likely perform actions other than these, such as creating keys and assigning policies, by using the console. <ul> <li><a>Encrypt</a></li> <li><a>Decrypt</a></li> <li><a>GenerateDataKey</a></li> <li><a>GenerateDataKeyWithoutPlaintext</a></li> </ul> </p>",
   "operations":{
-    "CancelKeyDeletion":{
-      "name":"CancelKeyDeletion",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"CancelKeyDeletionRequest"},
-      "output":{"shape":"CancelKeyDeletionResponse"},
-      "errors":[
-        {
-          "shape":"NotFoundException",
-          "error":{
-            "code":"NotFound",
-            "httpStatusCode":404,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the specified entity or resource could not be found. </p>"
-        },
-        {
-          "shape":"InvalidArnException",
-          "error":{
-            "code":"InvalidArn",
-            "httpStatusCode":400,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a specified ARN was not valid.</p>"
-        },
-        {
-          "shape":"DependencyTimeoutException",
-          "error":{
-            "code":"DependencyTimeout",
-            "httpStatusCode":503
-          },
-          "exception":true,
-          "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInternalException",
-          "error":{
-            "code":"KMSInternal",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        }
-      ],
-      "documentation":"<p>Cancels the deletion of a customer master key (CMK). When this operation is successful, the CMK is set to the <code>Disabled</code> state. To enable a CMK, use <a>EnableKey</a>.</p> <p>For more information about scheduling and canceling deletion of a CMK, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/deleting-keys.html\">Deleting Customer Master Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-    },
     "CreateAlias":{
       "name":"CreateAlias",
       "http":{
@@ -89,7 +28,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"AlreadyExistsException",
@@ -128,7 +67,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         },
         {
           "shape":"LimitExceededException",
@@ -138,20 +77,10 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a limit was exceeded. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Limits</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because a quota was exceeded.</p>"
         }
       ],
-      "documentation":"<p>Creates a display name for a customer master key. An alias can be used to identify a key and should be unique. The console enforces a one-to-one mapping between the alias and a key. An alias name can contain only alphanumeric characters, forward slashes (/), underscores (_), and dashes (-). An alias must start with the word \"alias\" followed by a forward slash (alias/). An alias that begins with \"aws\" after the forward slash (alias/aws...) is reserved by Amazon Web Services (AWS). </p> <p>The alias and the key it is mapped to must be in the same AWS account and the same region.</p> <p>To map an alias to a different key, call <a>UpdateAlias</a>.</p>"
+      "documentation":"<p> Creates a display name for a customer master key. An alias can be used to identify a key and should be unique. The console enforces a one-to-one mapping between the alias and a key. An alias name can contain only alphanumeric characters, forward slashes (/), underscores (_), and dashes (-). An alias must start with the word \"alias\" followed by a forward slash (alias/). An alias that begins with \"aws\" after the forward slash (alias/aws...) is reserved by Amazon Web Services (AWS). </p> <p>To associate an alias with a different key, call <a>UpdateAlias</a>.</p> <p>Note that you cannot create or update an alias that represents a key in another account.</p>"
     },
     "CreateGrant":{
       "name":"CreateGrant",
@@ -180,7 +109,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"DependencyTimeoutException",
@@ -190,7 +119,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidArnException",
@@ -209,7 +138,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         },
         {
           "shape":"InvalidGrantTokenException",
@@ -219,7 +148,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
+          "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
         },
         {
           "shape":"LimitExceededException",
@@ -229,20 +158,10 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a limit was exceeded. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Limits</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because a quota was exceeded.</p>"
         }
       ],
-      "documentation":"<p>Adds a grant to a key to specify who can use the key and under what conditions. Grants are alternate permission mechanisms to key policies.</p> <p>For more information about grants, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/grants.html\">Grants</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Adds a grant to a key to specify who can access the key and under what conditions. Grants are alternate permission mechanisms to key policies. For more information about grants, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/grants.html\">Grants</a> in the developer guide. If a grant is absent, access to the key is evaluated based on IAM policies attached to the user. <ol> <li><a>ListGrants</a></li> <li><a>RetireGrant</a></li> <li><a>RevokeGrant</a></li> </ol> </p>"
     },
     "CreateKey":{
       "name":"CreateKey",
@@ -271,7 +190,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidArnException",
@@ -300,7 +219,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         },
         {
           "shape":"LimitExceededException",
@@ -310,7 +229,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a limit was exceeded. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Limits</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because a quota was exceeded.</p>"
         }
       ],
       "documentation":"<p>Creates a customer master key. Customer master keys can be used to encrypt small amounts of data (less than 4K) directly, but they are most commonly used to encrypt or envelope data keys that are then used to encrypt customer data. For more information about data keys, see <a>GenerateDataKey</a> and <a>GenerateDataKeyWithoutPlaintext</a>.</p>"
@@ -342,7 +261,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"InvalidCiphertextException",
@@ -362,7 +281,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The request was rejected because the key was not available. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because the key was disabled, not found, or otherwise not available.</p>"
         },
         {
           "shape":"DependencyTimeoutException",
@@ -372,7 +291,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidGrantTokenException",
@@ -382,7 +301,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
+          "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -391,17 +310,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Decrypts ciphertext. Ciphertext is plaintext that has been previously encrypted by using any of the following functions: <ul> <li><a>GenerateDataKey</a></li> <li><a>GenerateDataKeyWithoutPlaintext</a></li> <li><a>Encrypt</a></li> </ul> </p> <p>Note that if a caller has been granted access permissions to all keys (through, for example, IAM user policies that grant <code>Decrypt</code> permission on all resources), then ciphertext encrypted by using keys in other accounts where the key grants access to the caller can be decrypted. To remedy this, we recommend that you do not grant <code>Decrypt</code> access in an IAM user policy. Instead grant <code>Decrypt</code> access only in key policies. If you must grant <code>Decrypt</code> access in an IAM user policy, you should scope the resource to specific keys or to specific trusted accounts. </p>"
@@ -422,7 +331,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"NotFoundException",
@@ -441,20 +350,10 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
-      "documentation":"<p>Deletes the specified alias. To map an alias to a different key, call <a>UpdateAlias</a>.</p>"
+      "documentation":"<p>Deletes the specified alias. To associate an alias with a different key, call <a>UpdateAlias</a>.</p>"
     },
     "DescribeKey":{
       "name":"DescribeKey",
@@ -493,7 +392,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -502,7 +401,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Provides detailed information about the specified customer master key.</p>"
@@ -543,7 +442,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -552,20 +451,10 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
-      "documentation":"<p>Sets the state of a master key to disabled, thereby preventing its use for cryptographic operations. For more information about how key state affects the use of a master key, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Marks a key as disabled, thereby preventing its use.</p>"
     },
     "DisableKeyRotation":{
       "name":"DisableKeyRotation",
@@ -593,7 +482,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"InvalidArnException",
@@ -613,7 +502,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -622,20 +511,10 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
-      "documentation":"<p>Disables rotation of the specified key.</p>"
+      "documentation":"Disables rotation of the specified key."
     },
     "EnableKey":{
       "name":"EnableKey",
@@ -673,7 +552,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -682,7 +561,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         },
         {
           "shape":"LimitExceededException",
@@ -692,20 +571,10 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a limit was exceeded. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Limits</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because a quota was exceeded.</p>"
         }
       ],
-      "documentation":"<p>Marks a key as enabled, thereby permitting its use.</p>"
+      "documentation":"Marks a key as enabled, thereby permitting its use. You can have up to 25 enabled keys at one time."
     },
     "EnableKeyRotation":{
       "name":"EnableKeyRotation",
@@ -733,7 +602,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"InvalidArnException",
@@ -753,7 +622,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -762,20 +631,10 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
-      "documentation":"<p>Enables rotation of the specified customer master key.</p>"
+      "documentation":"Enables rotation of the specified customer master key."
     },
     "Encrypt":{
       "name":"Encrypt",
@@ -804,7 +663,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"KeyUnavailableException",
@@ -814,7 +673,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The request was rejected because the key was not available. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because the key was disabled, not found, or otherwise not available.</p>"
         },
         {
           "shape":"DependencyTimeoutException",
@@ -824,7 +683,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidKeyUsageException",
@@ -844,7 +703,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
+          "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -853,17 +712,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Encrypts plaintext into ciphertext by using a customer master key. The <code>Encrypt</code> function has two primary use cases: <ul> <li>You can encrypt up to 4 KB of arbitrary data such as an RSA key, a database password, or other sensitive customer information.</li> <li>If you are moving encrypted data from one region to another, you can use this API to encrypt in the new region the plaintext data key that was used to encrypt the data in the original region. This provides you with an encrypted copy of the data key that can be decrypted in the new region and used there to decrypt the encrypted data. </li> </ul> </p> <p>Unless you are moving encrypted data from one region to another, you don't use this function to encrypt a generated data key within a region. You retrieve data keys already encrypted by calling the <a>GenerateDataKey</a> or <a>GenerateDataKeyWithoutPlaintext</a> function. Data keys don't need to be encrypted again by calling <code>Encrypt</code>. </p> <p>If you want to encrypt data locally in your application, you can use the <code>GenerateDataKey</code> function to return a plaintext data encryption key and a copy of the key encrypted under the customer master key (CMK) of your choosing. </p>"
@@ -895,7 +744,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"KeyUnavailableException",
@@ -905,7 +754,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The request was rejected because the key was not available. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because the key was disabled, not found, or otherwise not available.</p>"
         },
         {
           "shape":"DependencyTimeoutException",
@@ -915,7 +764,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidKeyUsageException",
@@ -935,7 +784,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
+          "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -944,17 +793,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Generates a data key that you can use in your application to locally encrypt data. This call returns a plaintext version of the key in the <code>Plaintext</code> field of the response object and an encrypted copy of the key in the <code>CiphertextBlob</code> field. The key is encrypted by using the master key specified by the <code>KeyId</code> field. To decrypt the encrypted key, pass it to the <code>Decrypt</code> API. </p> <p>We recommend that you use the following pattern to locally encrypt data: call the <code>GenerateDataKey</code> API, use the key returned in the <code>Plaintext</code> response field to locally encrypt data, and then erase the plaintext data key from memory. Store the encrypted data key (contained in the <code>CiphertextBlob</code> field) alongside of the locally encrypted data. </p> <note>You should not call the <code>Encrypt</code> function to re-encrypt your data keys within a region. <code>GenerateDataKey</code> always returns the data key encrypted and tied to the customer master key that will be used to decrypt it. There is no need to decrypt it twice. </note> <p>If you decide to use the optional <code>EncryptionContext</code> parameter, you must also store the context in full or at least store enough information along with the encrypted data to be able to reconstruct the context when submitting the ciphertext to the <code>Decrypt</code> API. It is a good practice to choose a context that you can reconstruct on the fly to better secure the ciphertext. For more information about how this parameter is used, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/encrypt-context.html\">Encryption Context</a>. </p> <p>To decrypt data, pass the encrypted data key to the <code>Decrypt</code> API. <code>Decrypt</code> uses the associated master key to decrypt the encrypted data key and returns it as plaintext. Use the plaintext data key to locally decrypt your data and then erase the key from memory. You must specify the encryption context, if any, that you specified when you generated the key. The encryption context is logged by CloudTrail, and you can use this log to help track the use of particular data. </p>"
@@ -986,7 +825,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"KeyUnavailableException",
@@ -996,7 +835,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The request was rejected because the key was not available. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because the key was disabled, not found, or otherwise not available.</p>"
         },
         {
           "shape":"DependencyTimeoutException",
@@ -1006,7 +845,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidKeyUsageException",
@@ -1026,7 +865,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
+          "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1035,17 +874,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Returns a data key encrypted by a customer master key without the plaintext copy of that key. Otherwise, this API functions exactly like <a>GenerateDataKey</a>. You can use this API to, for example, satisfy an audit requirement that an encrypted key be made available without exposing the plaintext copy of that key. </p>"
@@ -1067,7 +896,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1076,7 +905,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Generates an unpredictable byte string. </p>"
@@ -1118,7 +947,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1127,17 +956,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Retrieves a policy attached to the specified key.</p>"
@@ -1179,7 +998,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1188,20 +1007,10 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
-      "documentation":"<p>Retrieves a Boolean value that indicates whether key rotation is enabled for the specified key.</p>"
+      "documentation":"Retrieves a Boolean value that indicates whether key rotation is enabled for the specified key."
     },
     "ListAliases":{
       "name":"ListAliases",
@@ -1220,7 +1029,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidMarkerException",
@@ -1239,7 +1048,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Lists all of the key aliases in the account.</p>"
@@ -1253,16 +1062,6 @@
       "input":{"shape":"ListGrantsRequest"},
       "output":{"shape":"ListGrantsResponse"},
       "errors":[
-        {
-          "shape":"NotFoundException",
-          "error":{
-            "code":"NotFound",
-            "httpStatusCode":404,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the specified entity or resource could not be found. </p>"
-        },
         {
           "shape":"DependencyTimeoutException",
           "error":{
@@ -1271,7 +1070,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidMarkerException",
@@ -1300,17 +1099,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>List the grants for a specified key.</p>"
@@ -1352,7 +1141,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1361,17 +1150,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Retrieves a list of policies attached to a key.</p>"
@@ -1393,7 +1172,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1402,72 +1181,11 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Lists the customer master keys.</p>"
     },
-    "ListRetirableGrants":{
-      "name":"ListRetirableGrants",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ListRetirableGrantsRequest"},
-      "output":{"shape":"ListGrantsResponse"},
-      "errors":[
-        {
-          "shape":"DependencyTimeoutException",
-          "error":{
-            "code":"DependencyTimeout",
-            "httpStatusCode":503
-          },
-          "exception":true,
-          "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
-        },
-        {
-          "shape":"InvalidMarkerException",
-          "error":{
-            "code":"InvalidMarker",
-            "httpStatusCode":400,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the marker that specifies where pagination should next begin is not valid. </p>"
-        },
-        {
-          "shape":"InvalidArnException",
-          "error":{
-            "code":"InvalidArn",
-            "httpStatusCode":400,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a specified ARN was not valid.</p>"
-        },
-        {
-          "shape":"NotFoundException",
-          "error":{
-            "code":"NotFound",
-            "httpStatusCode":404,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the specified entity or resource could not be found. </p>"
-        },
-        {
-          "shape":"KMSInternalException",
-          "error":{
-            "code":"KMSInternal",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        }
-      ],
-      "documentation":"<p>Returns a list of all grants for which the grant's <code>RetiringPrincipal</code> matches the one specified.</p> <p>A typical use is to list all grants that you are able to retire. To retire a grant, use <a>RetireGrant</a>.</p>"
-    },
     "PutKeyPolicy":{
       "name":"PutKeyPolicy",
       "http":{
@@ -1514,7 +1232,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidArnException",
@@ -1543,7 +1261,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         },
         {
           "shape":"LimitExceededException",
@@ -1553,17 +1271,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a limit was exceeded. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Limits</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because a quota was exceeded.</p>"
         }
       ],
       "documentation":"<p>Attaches a policy to the specified key.</p>"
@@ -1595,7 +1303,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+          "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
         },
         {
           "shape":"InvalidCiphertextException",
@@ -1615,7 +1323,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The request was rejected because the key was not available. The request can be retried.</p>"
+          "documentation":"<p>The request was rejected because the key was disabled, not found, or otherwise not available.</p>"
         },
         {
           "shape":"DependencyTimeoutException",
@@ -1625,7 +1333,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidKeyUsageException",
@@ -1645,7 +1353,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
+          "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1654,17 +1362,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Encrypts data on the server side with a new customer master key without exposing the plaintext of the data on the client side. The data is first decrypted and then encrypted. This operation can also be used to change the encryption context of a ciphertext. </p> <p>Unlike other actions, <code>ReEncrypt</code> is authorized twice - once as <code>ReEncryptFrom</code> on the source key and once as <code>ReEncryptTo</code> on the destination key. We therefore recommend that you include the <code>\"action\":\"kms:ReEncrypt*\"</code> statement in your key policies to permit re-encryption from or to the key. The statement is included automatically when you authorize use of the key through the console but must be included manually when you set a policy by using the <a>PutKeyPolicy</a> function. </p>"
@@ -1685,17 +1383,7 @@
             "senderFault":true
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
-        },
-        {
-          "shape":"InvalidGrantIdException",
-          "error":{
-            "code":"InvalidGrantId",
-            "httpStatusCode":400,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the specified <code>GrantId</code> is not valid.</p>"
+          "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
         },
         {
           "shape":"NotFoundException",
@@ -1715,7 +1403,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1724,17 +1412,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Retires a grant. You can retire a grant when you're done using it to clean up. You should revoke a grant when you intend to actively deny operations that depend on it. The following are permitted to call this API: <ul> <li>The account that created the grant</li> <li>The <code>RetiringPrincipal</code>, if present</li> <li>The <code>GranteePrincipal</code>, if <code>RetireGrant</code> is a grantee operation</li> </ul> The grant to retire must be identified by its grant token or by a combination of the key ARN and the grant ID. A grant token is a unique variable-length base64-encoded string. A grant ID is a 64 character unique identifier of a grant. Both are returned by the <code>CreateGrant</code> function. </p>"
@@ -1765,68 +1443,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
-        },
-        {
-          "shape":"InvalidArnException",
-          "error":{
-            "code":"InvalidArn",
-            "httpStatusCode":400,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a specified ARN was not valid.</p>"
-        },
-        {
-          "shape":"InvalidGrantIdException",
-          "error":{
-            "code":"InvalidGrantId",
-            "httpStatusCode":400,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the specified <code>GrantId</code> is not valid.</p>"
-        },
-        {
-          "shape":"KMSInternalException",
-          "error":{
-            "code":"KMSInternal",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        }
-      ],
-      "documentation":"<p>Revokes a grant. You can revoke a grant to actively deny operations that depend on it.</p>"
-    },
-    "ScheduleKeyDeletion":{
-      "name":"ScheduleKeyDeletion",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ScheduleKeyDeletionRequest"},
-      "output":{"shape":"ScheduleKeyDeletionResponse"},
-      "errors":[
-        {
-          "shape":"NotFoundException",
-          "error":{
-            "code":"NotFound",
-            "httpStatusCode":404,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the specified entity or resource could not be found. </p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"InvalidArnException",
@@ -1838,16 +1455,6 @@
           "exception":true,
           "documentation":"<p>The request was rejected because a specified ARN was not valid.</p>"
         },
-        {
-          "shape":"DependencyTimeoutException",
-          "error":{
-            "code":"DependencyTimeout",
-            "httpStatusCode":503
-          },
-          "exception":true,
-          "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
-        },
         {
           "shape":"KMSInternalException",
           "error":{
@@ -1855,20 +1462,10 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
-      "documentation":"<p>Schedules the deletion of a customer master key (CMK). You may provide a waiting period, specified in days, before deletion occurs. If you do not provide a waiting period, the default period of 30 days is used. When this operation is successful, the state of the CMK changes to <code>PendingDeletion</code>. Before the waiting period ends, you can use <a>CancelKeyDeletion</a> to cancel the deletion of the CMK. After the waiting period ends, AWS KMS deletes the CMK and all AWS KMS data associated with it, including all aliases that point to it.</p> <important> <p>Deleting a CMK is a destructive and potentially dangerous operation. When a CMK is deleted, all data that was encrypted under the CMK is rendered unrecoverable. To restrict the use of a CMK without deleting it, use <a>DisableKey</a>.</p> </important> <p>For more information about scheduling a CMK for deletion, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/deleting-keys.html\">Deleting Customer Master Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"Revokes a grant. You can revoke a grant to actively deny operations that depend on it."
     },
     "UpdateAlias":{
       "name":"UpdateAlias",
@@ -1886,7 +1483,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"NotFoundException",
@@ -1905,20 +1502,10 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
-      "documentation":"<p>Updates an alias to map it to a different key.</p> <p>An alias is not a property of a key. Therefore, an alias can be mapped to and unmapped from an existing key without changing the properties of the key. </p> <p>An alias name can contain only alphanumeric characters, forward slashes (/), underscores (_), and dashes (-). An alias must start with the word \"alias\" followed by a forward slash (alias/). An alias that begins with \"aws\" after the forward slash (alias/aws...) is reserved by Amazon Web Services (AWS). </p> <p>The alias and the key it is mapped to must be in the same AWS account and the same region.</p>"
+      "documentation":"<p>Updates an alias to associate it with a different key.</p> <p>An alias name can contain only alphanumeric characters, forward slashes (/), underscores (_), and dashes (-). An alias must start with the word \"alias\" followed by a forward slash (alias/). An alias that begins with \"aws\" after the forward slash (alias/aws...) is reserved by Amazon Web Services (AWS). </p> <p>An alias is not a property of a key. Therefore, an alias can be associated with and disassociated from an existing key without changing the properties of the key. </p> <p>Note that you cannot create or update an alias that represents a key in another account.</p>"
     },
     "UpdateKeyDescription":{
       "name":"UpdateKeyDescription",
@@ -1956,7 +1543,7 @@
           },
           "exception":true,
           "fault":true,
-          "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+          "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
         },
         {
           "shape":"KMSInternalException",
@@ -1965,17 +1552,7 @@
             "httpStatusCode":500
           },
           "exception":true,
-          "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-        },
-        {
-          "shape":"KMSInvalidStateException",
-          "error":{
-            "code":"KMSInvalidStateException",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
         }
       ],
       "documentation":"<p>Updates the description of a key.</p>"
@@ -2003,7 +1580,7 @@
           "documentation":"<p>String that contains the key identifier pointed to by the alias.</p>"
         }
       },
-      "documentation":"<p>Contains information about an alias.</p>"
+      "documentation":"Contains information about an alias."
     },
     "AliasNameType":{
       "type":"string",
@@ -2030,25 +1607,6 @@
       "max":2048
     },
     "BooleanType":{"type":"boolean"},
-    "CancelKeyDeletionRequest":{
-      "type":"structure",
-      "required":["KeyId"],
-      "members":{
-        "KeyId":{
-          "shape":"KeyIdType",
-          "documentation":"<p>The unique identifier for the customer master key (CMK) for which to cancel deletion.</p> <p>To specify this value, use the unique key ID or the Amazon Resource Name (ARN) of the CMK. Examples: <ul> <li>Unique key ID: 1234abcd-12ab-34cd-56ef-1234567890ab</li> <li>Key ARN: arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</li> </ul> </p> <p>To obtain the unique key ID and key ARN for a given CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
-        }
-      }
-    },
-    "CancelKeyDeletionResponse":{
-      "type":"structure",
-      "members":{
-        "KeyId":{
-          "shape":"KeyIdType",
-          "documentation":"<p>The unique identifier of the master key for which deletion is canceled.</p>"
-        }
-      }
-    },
     "CiphertextType":{
       "type":"blob",
       "min":1,
@@ -2080,31 +1638,27 @@
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>The unique identifier for the customer master key (CMK) that the grant applies to.</p> <p>To specify this value, use the globally unique key ID or the Amazon Resource Name (ARN) of the key. Examples: <ul> <li>Globally unique key ID: 12345678-1234-1234-1234-123456789012</li> <li>Key ARN: arn:aws:kms:us-west-2:123456789012:key/12345678-1234-1234-1234-123456789012</li> </ul> </p>"
+          "documentation":"<p>A unique identifier for the customer master key. This value can be a globally unique identifier or the fully specified ARN to a key. <ul> <li>Key ARN Example - arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012</li> <li>Globally Unique Key ID Example - 12345678-1234-1234-1234-123456789012</li> </ul> </p>"
         },
         "GranteePrincipal":{
           "shape":"PrincipalIdType",
-          "documentation":"<p>The principal that is given permission to perform the operations that the grant permits.</p> <p>To specify the principal, use the <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of an AWS principal. Valid AWS principals include AWS accounts (root), IAM users, federated users, and assumed role users. For examples of the ARN syntax to use for specifying a principal, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam\">AWS Identity and Access Management (IAM)</a> in the Example ARNs section of the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>Principal given permission by the grant to use the key identified by the <code>keyId</code> parameter.</p>"
         },
         "RetiringPrincipal":{
           "shape":"PrincipalIdType",
-          "documentation":"<p>The principal that is given permission to retire the grant by using <a>RetireGrant</a> operation.</p> <p>To specify the principal, use the <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of an AWS principal. Valid AWS principals include AWS accounts (root), IAM users, federated users, and assumed role users. For examples of the ARN syntax to use for specifying a principal, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam\">AWS Identity and Access Management (IAM)</a> in the Example ARNs section of the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>Principal given permission to retire the grant. For more information, see <a>RetireGrant</a>.</p>"
         },
         "Operations":{
           "shape":"GrantOperationList",
-          "documentation":"<p>A list of operations that the grant permits. The list can contain any combination of one or more of the following values: <ul> <li>Decrypt</li> <li>Encrypt</li> <li>GenerateDataKey</li> <li>GenerateDataKeyWithoutPlaintext</li> <li>ReEncryptFrom</li> <li>ReEncryptTo</li> <li>CreateGrant</li> <li>RetireGrant</li> </ul> </p>"
+          "documentation":"<p>List of operations permitted by the grant. This can be any combination of one or more of the following values: <ol> <li>Decrypt</li> <li>Encrypt</li> <li>GenerateDataKey</li> <li>GenerateDataKeyWithoutPlaintext</li> <li>ReEncryptFrom</li> <li>ReEncryptTo</li> <li>CreateGrant</li> <li>RetireGrant</li> </ol> </p>"
         },
         "Constraints":{
           "shape":"GrantConstraints",
-          "documentation":"<p>The conditions under which the operations permitted by the grant are allowed.</p> <p>You can use this value to allow the operations permitted by the grant only when a specified encryption context is present. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/encrypt-context.html\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>Specifies the conditions under which the actions specified by the <code>Operations</code> parameter are allowed. </p>"
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
-          "documentation":"<p>A list of grant tokens.</p> <p>For more information, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        },
-        "Name":{
-          "shape":"GrantNameType",
-          "documentation":"<p>A friendly name for identifying the grant. Use this value to prevent unintended creation of duplicate grants when retrying this request.</p> <p>When this value is absent, all <code>CreateGrant</code> requests result in a new grant with a unique <code>GrantId</code> even if all the supplied parameters are identical. This can result in unintended duplicates when you retry the <code>CreateGrant</code> request.</p> <p>When this value is present, you can retry a <code>CreateGrant</code> request with identical parameters; if the grant already exists, the original <code>GrantId</code> is returned without creating a new grant. Note that the returned grant token is unique with every <code>CreateGrant</code> request, even when a duplicate <code>GrantId</code> is returned. All grant tokens obtained in this way can be used interchangeably.</p>"
+          "documentation":"<p>For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a>. </p>"
         }
       }
     },
@@ -2113,11 +1667,11 @@
       "members":{
         "GrantToken":{
           "shape":"GrantTokenType",
-          "documentation":"<p>The grant token.</p> <p>For more information about using grant tokens, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>. </p>"
+          "documentation":"<p>For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a>. </p>"
         },
         "GrantId":{
           "shape":"GrantIdType",
-          "documentation":"<p>The unique identifier for the grant.</p> <p>You can use the <code>GrantId</code> in a subsequent <a>RetireGrant</a> or <a>RevokeGrant</a> operation.</p>"
+          "documentation":"<p>Unique grant identifier. You can use the <i>GrantId</i> value to revoke a grant.</p>"
         }
       }
     },
@@ -2126,7 +1680,7 @@
       "members":{
         "Policy":{
           "shape":"PolicyType",
-          "documentation":"<p>Policy to attach to the key. This is required and delegates back to the account. The key is the root of trust. The policy size limit is 32 KiB (32768 bytes). </p>"
+          "documentation":"<p>Policy to be attached to the key. This is required and delegates back to the account. The key is the root of trust. </p>"
         },
         "Description":{
           "shape":"DescriptionType",
@@ -2169,7 +1723,7 @@
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
-          "documentation":"<p>A list of grant tokens.</p> <p>For more information, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a>. </p>"
         }
       }
     },
@@ -2207,7 +1761,7 @@
       },
       "exception":true,
       "fault":true,
-      "documentation":"<p>The system timed out while trying to fulfill the request. The request can be retried.</p>"
+      "documentation":"<p>The system timed out while trying to fulfill the request.</p>"
     },
     "DescribeKeyRequest":{
       "type":"structure",
@@ -2216,10 +1770,6 @@
         "KeyId":{
           "shape":"KeyIdType",
           "documentation":"<p>A unique identifier for the customer master key. This value can be a globally unique identifier, a fully specified ARN to either an alias or a key, or an alias name prefixed by \"alias/\". <ul> <li>Key ARN Example - arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012</li> <li>Alias ARN Example - arn:aws:kms:us-east-1:123456789012:alias/MyAliasName</li> <li>Globally Unique Key ID Example - 12345678-1234-1234-1234-123456789012</li> <li>Alias Name Example - alias/MyAliasName</li> </ul> </p>"
-        },
-        "GrantTokens":{
-          "shape":"GrantTokenList",
-          "documentation":"<p>A list of grant tokens.</p> <p>For more information, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         }
       }
     },
@@ -2268,7 +1818,7 @@
         "senderFault":true
       },
       "exception":true,
-      "documentation":"<p>The request was rejected because the specified key was marked as disabled.</p>"
+      "documentation":"<p>A request was rejected because the specified key was marked as disabled.</p>"
     },
     "EnableKeyRequest":{
       "type":"structure",
@@ -2311,7 +1861,7 @@
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
-          "documentation":"<p>A list of grant tokens.</p> <p>For more information, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a>. </p>"
         }
       }
     },
@@ -2358,7 +1908,7 @@
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
-          "documentation":"<p>A list of grant tokens.</p> <p>For more information, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a>. </p>"
         }
       }
     },
@@ -2401,7 +1951,7 @@
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
-          "documentation":"<p>A list of grant tokens.</p> <p>For more information, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a>. </p>"
         }
       }
     },
@@ -2477,7 +2027,7 @@
       "members":{
         "KeyRotationEnabled":{
           "shape":"BooleanType",
-          "documentation":"<p>A Boolean value that specifies whether key rotation is enabled.</p>"
+          "documentation":"A Boolean value that specifies whether key rotation is enabled."
         }
       }
     },
@@ -2486,14 +2036,14 @@
       "members":{
         "EncryptionContextSubset":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>Contains a list of key-value pairs, a subset of which must be present in the encryption context of a subsequent operation permitted by the grant. When a subsequent operation permitted by the grant includes an encryption context that matches this list or is a subset of this list, the grant allows the operation. Otherwise, the operation is not allowed.</p>"
+          "documentation":"The constraint equals the full encryption context."
         },
         "EncryptionContextEquals":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>Contains a list of key-value pairs that must be present in the encryption context of a subsequent operation permitted by the grant. When a subsequent operation permitted by the grant includes an encryption context that matches this list, the grant allows the operation. Otherwise, the operation is not allowed.</p>"
+          "documentation":"The constraint contains additional key/value pairs that serve to further limit the grant."
         }
       },
-      "documentation":"<p>A structure for specifying the conditions under which the operations permitted by the grant are allowed.</p> <p>You can use this structure to allow the operations permitted by the grant only when a specified encryption context is present. For more information about encryption context, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/encrypt-context.html\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"Contains constraints on the grant."
     },
     "GrantIdType":{
       "type":"string",
@@ -2507,50 +2057,32 @@
     "GrantListEntry":{
       "type":"structure",
       "members":{
-        "KeyId":{
-          "shape":"KeyIdType",
-          "documentation":"<p>The unique identifier for the customer master key (CMK) to which the grant applies.</p>"
-        },
         "GrantId":{
           "shape":"GrantIdType",
-          "documentation":"<p>The unique identifier for the grant.</p>"
-        },
-        "Name":{
-          "shape":"GrantNameType",
-          "documentation":"<p>The friendly name that identifies the grant. If a name was provided in the <a>CreateGrant</a> request, that name is returned. Otherwise this value is null.</p>"
-        },
-        "CreationDate":{
-          "shape":"DateType",
-          "documentation":"<p>The date and time when the grant was created.</p>"
+          "documentation":"<p>Unique grant identifier.</p>"
         },
         "GranteePrincipal":{
           "shape":"PrincipalIdType",
-          "documentation":"<p>The principal that receives the grant's permissions.</p>"
+          "documentation":"<p>The principal that receives the grant permission.</p>"
         },
         "RetiringPrincipal":{
           "shape":"PrincipalIdType",
-          "documentation":"<p>The principal that can retire the grant.</p>"
+          "documentation":"<p>The principal that can retire the account.</p>"
         },
         "IssuingAccount":{
           "shape":"PrincipalIdType",
-          "documentation":"<p>The AWS account under which the grant was issued.</p>"
+          "documentation":"<p>The account under which the grant was issued.</p>"
         },
         "Operations":{
           "shape":"GrantOperationList",
-          "documentation":"<p>The list of operations permitted by the grant.</p>"
+          "documentation":"<p>List of operations permitted by the grant. This can be any combination of one or more of the following values: <ol> <li>Decrypt</li> <li>Encrypt</li> <li>GenerateDataKey</li> <li>GenerateDataKeyWithoutPlaintext</li> <li>ReEncryptFrom</li> <li>ReEncryptTo</li> <li>CreateGrant</li> </ol></p>"
         },
         "Constraints":{
           "shape":"GrantConstraints",
-          "documentation":"<p>The conditions under which the grant's operations are allowed.</p>"
+          "documentation":"<p>Specifies the conditions under which the actions specified by the <code>Operations</code> parameter are allowed. </p>"
         }
       },
-      "documentation":"<p>Contains information about an entry in a list of grants.</p>"
-    },
-    "GrantNameType":{
-      "type":"string",
-      "min":1,
-      "max":256,
-      "pattern":"^[a-zA-Z0-9:/_-]+$"
+      "documentation":"<p>Contains information about each entry in the grant list.</p>"
     },
     "GrantOperation":{
       "type":"string",
@@ -2562,8 +2094,7 @@
         "ReEncryptFrom",
         "ReEncryptTo",
         "CreateGrant",
-        "RetireGrant",
-        "DescribeKey"
+        "RetireGrant"
       ]
     },
     "GrantOperationList":{
@@ -2620,19 +2151,6 @@
       "exception":true,
       "documentation":"<p>The request was rejected because the specified ciphertext has been corrupted or is otherwise invalid.</p>"
     },
-    "InvalidGrantIdException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessageType"}
-      },
-      "error":{
-        "code":"InvalidGrantId",
-        "httpStatusCode":400,
-        "senderFault":true
-      },
-      "exception":true,
-      "documentation":"<p>The request was rejected because the specified <code>GrantId</code> is not valid.</p>"
-    },
     "InvalidGrantTokenException":{
       "type":"structure",
       "members":{
@@ -2644,7 +2162,7 @@
         "senderFault":true
       },
       "exception":true,
-      "documentation":"<p>The request was rejected because a grant token provided as part of the request is invalid.</p>"
+      "documentation":"<p>A grant token provided as part of the request is invalid.</p>"
     },
     "InvalidKeyUsageException":{
       "type":"structure",
@@ -2682,20 +2200,7 @@
         "httpStatusCode":500
       },
       "exception":true,
-      "documentation":"<p>The request was rejected because an internal exception occurred. The request can be retried.</p>"
-    },
-    "KMSInvalidStateException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessageType"}
-      },
-      "error":{
-        "code":"KMSInvalidStateException",
-        "httpStatusCode":409,
-        "senderFault":true
-      },
-      "exception":true,
-      "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a customer master key (CMK), go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>The request was rejected because an internal exception occurred. This error can be retried.</p>"
     },
     "KeyIdType":{
       "type":"string",
@@ -2726,50 +2231,34 @@
       "members":{
         "AWSAccountId":{
           "shape":"AWSAccountIdType",
-          "documentation":"<p>The twelve-digit account ID of the AWS account that owns the key.</p>"
+          "documentation":"<p>Account ID number.</p>"
         },
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>The globally unique identifier for the key.</p>"
+          "documentation":"<p>Unique identifier for the key.</p>"
         },
         "Arn":{
           "shape":"ArnType",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the key. For examples, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-kms\">AWS Key Management Service (AWS KMS)</a> in the Example ARNs section of the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>Key ARN (Amazon Resource Name).</p>"
         },
         "CreationDate":{
           "shape":"DateType",
-          "documentation":"<p>The date and time when the key was created.</p>"
+          "documentation":"<p>Date the key was created.</p>"
         },
         "Enabled":{
           "shape":"BooleanType",
-          "documentation":"<p>Specifies whether the key is enabled. When <code>KeyState</code> is <code>Enabled</code> this value is true, otherwise it is false.</p>"
+          "documentation":"<p>Value that specifies whether the key is enabled.</p>"
         },
         "Description":{
           "shape":"DescriptionType",
-          "documentation":"<p>The friendly description of the key.</p>"
+          "documentation":"<p>The description of the key.</p>"
         },
         "KeyUsage":{
           "shape":"KeyUsageType",
-          "documentation":"<p>The cryptographic operations for which you can use the key. Currently the only allowed value is <code>ENCRYPT_DECRYPT</code>, which means you can use the key for the <a>Encrypt</a> and <a>Decrypt</a> operations.</p>"
-        },
-        "KeyState":{
-          "shape":"KeyState",
-          "documentation":"<p>The state of the customer master key (CMK).</p> <p>For more information about how key state affects the use of a CMK, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
-        },
-        "DeletionDate":{
-          "shape":"DateType",
-          "documentation":"<p>The date and time after which AWS KMS deletes the customer master key (CMK). This value is present only when <code>KeyState</code> is <code>PendingDeletion</code>, otherwise this value is null.</p>"
+          "documentation":"<p>A value that specifies what operation(s) the key can perform.</p>"
         }
       },
-      "documentation":"<p>Contains metadata about a customer master key (CMK).</p> <p>This data type is used as a response element for the <a>CreateKey</a> and <a>DescribeKey</a> operations.</p>"
-    },
-    "KeyState":{
-      "type":"string",
-      "enum":[
-        "Enabled",
-        "Disabled",
-        "PendingDeletion"
-      ]
+      "documentation":"Contains metadata associated with a specific key."
     },
     "KeyUnavailableException":{
       "type":"structure",
@@ -2782,7 +2271,7 @@
       },
       "exception":true,
       "fault":true,
-      "documentation":"<p>The request was rejected because the key was not available. The request can be retried.</p>"
+      "documentation":"<p>The request was rejected because the key was disabled, not found, or otherwise not available.</p>"
     },
     "KeyUsageType":{
       "type":"string",
@@ -2799,7 +2288,7 @@
         "senderFault":true
       },
       "exception":true,
-      "documentation":"<p>The request was rejected because a limit was exceeded. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Limits</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>The request was rejected because a quota was exceeded.</p>"
     },
     "LimitType":{
       "type":"integer",
@@ -2811,11 +2300,11 @@
       "members":{
         "Limit":{
           "shape":"LimitType",
-          "documentation":"<p>When paginating results, specify the maximum number of items to return in the response. If additional items exist beyond the number you specify, the <code>Truncated</code> element in the response is set to true.</p><p>This value is optional. If you include a value, it must be between 1 and 100, inclusive. If you do not include a value, it defaults to 50.</p>"
+          "documentation":"<p>Specify this parameter when paginating results to indicate the maximum number of aliases you want in each response. If there are additional aliases beyond the maximum you specify, the <code>Truncated</code> response element will be set to <code>true.</code> </p>"
         },
         "Marker":{
           "shape":"MarkerType",
-          "documentation":"<p>Use this parameter only when paginating results and only in a subsequent request after you've received a response with truncated results. Set it to the value of <code>NextMarker</code> from the response you just received.</p>"
+          "documentation":"<p>Use this parameter when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>NextMarker</code> element in the response you just received. </p>"
         }
       }
     },
@@ -2828,11 +2317,11 @@
         },
         "NextMarker":{
           "shape":"MarkerType",
-          "documentation":"<p>When <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> parameter in a subsequent pagination request.</p>"
+          "documentation":"<p>If <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> request parameter in a subsequent pagination request. </p>"
         },
         "Truncated":{
           "shape":"BooleanType",
-          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can use the <code>Marker</code> parameter to make a subsequent pagination request to retrieve more items in the list.</p>"
+          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can make a subsequent pagination request using the <code>Marker</code> request parameter to retrieve more aliases in the list. </p>"
         }
       }
     },
@@ -2840,17 +2329,17 @@
       "type":"structure",
       "required":["KeyId"],
       "members":{
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>A unique identifier for the customer master key. This value can be a globally unique identifier or the fully specified ARN to a key. <ul> <li>Key ARN Example - arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012</li> <li>Globally Unique Key ID Example - 12345678-1234-1234-1234-123456789012</li> </ul> </p>"
+        },
         "Limit":{
           "shape":"LimitType",
-          "documentation":"<p>When paginating results, specify the maximum number of items to return in the response. If additional items exist beyond the number you specify, the <code>Truncated</code> element in the response is set to true.</p><p>This value is optional. If you include a value, it must be between 1 and 100, inclusive. If you do not include a value, it defaults to 50.</p>"
+          "documentation":"<p>Specify this parameter only when paginating results to indicate the maximum number of grants you want listed in the response. If there are additional grants beyond the maximum you specify, the <code>Truncated</code> response element will be set to <code>true.</code> </p>"
         },
         "Marker":{
           "shape":"MarkerType",
-          "documentation":"<p>Use this parameter only when paginating results and only in a subsequent request after you've received a response with truncated results. Set it to the value of <code>NextMarker</code> from the response you just received.</p>"
-        },
-        "KeyId":{
-          "shape":"KeyIdType",
-          "documentation":"<p>A unique identifier for the customer master key. This value can be a globally unique identifier or the fully specified ARN to a key. <ul> <li>Key ARN Example - arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012</li> <li>Globally Unique Key ID Example - 12345678-1234-1234-1234-123456789012</li> </ul> </p>"
+          "documentation":"<p>Use this parameter only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>NextMarker</code> in the response you just received. </p>"
         }
       }
     },
@@ -2863,11 +2352,11 @@
         },
         "NextMarker":{
           "shape":"MarkerType",
-          "documentation":"<p>When <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> parameter in a subsequent pagination request.</p>"
+          "documentation":"<p>If <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> request parameter in a subsequent pagination request. </p>"
         },
         "Truncated":{
           "shape":"BooleanType",
-          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can use the <code>Marker</code> parameter to make a subsequent pagination request to retrieve more items in the list.</p>"
+          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can make a subsequent pagination request using the <code>Marker</code> request parameter to retrieve more grants in the list. </p>"
         }
       }
     },
@@ -2881,11 +2370,11 @@
         },
         "Limit":{
           "shape":"LimitType",
-          "documentation":"<p>When paginating results, specify the maximum number of items to return in the response. If additional items exist beyond the number you specify, the <code>Truncated</code> element in the response is set to true.</p><p>This value is optional. If you include a value, it must be between 1 and 1000, inclusive. If you do not include a value, it defaults to 100.</p><p>Currently only 1 policy can be attached to a key.</p>"
+          "documentation":"<p>Specify this parameter only when paginating results to indicate the maximum number of policies you want listed in the response. If there are additional policies beyond the maximum you specify, the <code>Truncated</code> response element will be set to <code>true.</code> </p>"
         },
         "Marker":{
           "shape":"MarkerType",
-          "documentation":"<p>Use this parameter only when paginating results and only in a subsequent request after you've received a response with truncated results. Set it to the value of <code>NextMarker</code> from the response you just received.</p>"
+          "documentation":"<p>Use this parameter only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>NextMarker</code> in the response you just received. </p>"
         }
       }
     },
@@ -2898,11 +2387,11 @@
         },
         "NextMarker":{
           "shape":"MarkerType",
-          "documentation":"<p>When <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> parameter in a subsequent pagination request.</p>"
+          "documentation":"<p>If <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> request parameter in a subsequent pagination request. </p>"
         },
         "Truncated":{
           "shape":"BooleanType",
-          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can use the <code>Marker</code> parameter to make a subsequent pagination request to retrieve more items in the list.</p>"
+          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can make a subsequent pagination request using the <code>Marker</code> request parameter to retrieve more policies in the list. </p>"
         }
       }
     },
@@ -2911,11 +2400,11 @@
       "members":{
         "Limit":{
           "shape":"LimitType",
-          "documentation":"<p>When paginating results, specify the maximum number of items to return in the response. If additional items exist beyond the number you specify, the <code>Truncated</code> element in the response is set to true.</p><p>This value is optional. If you include a value, it must be between 1 and 1000, inclusive. If you do not include a value, it defaults to 100.</p>"
+          "documentation":"<p>Specify this parameter only when paginating results to indicate the maximum number of keys you want listed in the response. If there are additional keys beyond the maximum you specify, the <code>Truncated</code> response element will be set to <code>true.</code> </p>"
         },
         "Marker":{
           "shape":"MarkerType",
-          "documentation":"<p>Use this parameter only when paginating results and only in a subsequent request after you've received a response with truncated results. Set it to the value of <code>NextMarker</code> from the response you just received.</p>"
+          "documentation":"<p>Use this parameter only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>NextMarker</code> in the response you just received. </p>"
         }
       }
     },
@@ -2928,29 +2417,11 @@
         },
         "NextMarker":{
           "shape":"MarkerType",
-          "documentation":"<p>When <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> parameter in a subsequent pagination request.</p>"
+          "documentation":"<p>If <code>Truncated</code> is true, this value is present and contains the value to use for the <code>Marker</code> request parameter in a subsequent pagination request. </p>"
         },
         "Truncated":{
           "shape":"BooleanType",
-          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can use the <code>Marker</code> parameter to make a subsequent pagination request to retrieve more items in the list.</p>"
-        }
-      }
-    },
-    "ListRetirableGrantsRequest":{
-      "type":"structure",
-      "required":["RetiringPrincipal"],
-      "members":{
-        "Limit":{
-          "shape":"LimitType",
-          "documentation":"<p>When paginating results, specify the maximum number of items to return in the response. If additional items exist beyond the number you specify, the <code>Truncated</code> element in the response is set to true.</p><p>This value is optional. If you include a value, it must be between 1 and 100, inclusive. If you do not include a value, it defaults to 50.</p>"
-        },
-        "Marker":{
-          "shape":"MarkerType",
-          "documentation":"<p>Use this parameter only when paginating results and only in a subsequent request after you've received a response with truncated results. Set it to the value of <code>NextMarker</code> from the response you just received.</p>"
-        },
-        "RetiringPrincipal":{
-          "shape":"PrincipalIdType",
-          "documentation":"<p>The retiring principal for which to list grants.</p> <p>To specify the retiring principal, use the <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of an AWS principal. Valid AWS principals include AWS accounts (root), IAM users, federated users, and assumed role users. For examples of the ARN syntax for specifying a principal, go to <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-iam\">AWS Identity and Access Management (IAM)</a> in the Example ARNs section of the <i>Amazon Web Services General Reference</i>.</p>"
+          "documentation":"<p>A flag that indicates whether there are more items in the list. If your results were truncated, you can make a subsequent pagination request using the <code>Marker</code> request parameter to retrieve more keys in the list. </p>"
         }
       }
     },
@@ -2991,11 +2462,6 @@
       "min":1,
       "max":1024
     },
-    "PendingWindowInDaysType":{
-      "type":"integer",
-      "min":1,
-      "max":365
-    },
     "PlaintextType":{
       "type":"blob",
       "min":1,
@@ -3041,7 +2507,7 @@
         },
         "Policy":{
           "shape":"PolicyType",
-          "documentation":"<p>The policy to attach to the key. This is required and delegates back to the account. The key is the root of trust. The policy size limit is 32 KiB (32768 bytes). </p>"
+          "documentation":"<p>The policy, in JSON format, to be attached to the key.</p>"
         }
       }
     },
@@ -3070,7 +2536,7 @@
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
-          "documentation":"<p>A list of grant tokens.</p> <p>For more information, go to <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a>. </p>"
         }
       }
     },
@@ -3125,33 +2591,6 @@
         }
       }
     },
-    "ScheduleKeyDeletionRequest":{
-      "type":"structure",
-      "required":["KeyId"],
-      "members":{
-        "KeyId":{
-          "shape":"KeyIdType",
-          "documentation":"<p>The unique identifier for the customer master key (CMK) to delete.</p> <p>To specify this value, use the unique key ID or the Amazon Resource Name (ARN) of the CMK. Examples: <ul> <li>Unique key ID: 1234abcd-12ab-34cd-56ef-1234567890ab</li> <li>Key ARN: arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</li> </ul> </p> <p>To obtain the unique key ID and key ARN for a given CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
-        },
-        "PendingWindowInDays":{
-          "shape":"PendingWindowInDaysType",
-          "documentation":"<p>The waiting period, specified in number of days. After the waiting period ends, AWS KMS deletes the customer master key (CMK).</p> <p>This value is optional. If you include a value, it must be between 7 and 30, inclusive. If you do not include a value, it defaults to 30.</p>"
-        }
-      }
-    },
-    "ScheduleKeyDeletionResponse":{
-      "type":"structure",
-      "members":{
-        "KeyId":{
-          "shape":"KeyIdType",
-          "documentation":"<p>The unique identifier of the customer master key (CMK) for which deletion is scheduled.</p>"
-        },
-        "DeletionDate":{
-          "shape":"DateType",
-          "documentation":"<p>The date and time after which AWS KMS deletes the customer master key (CMK).</p>"
-        }
-      }
-    },
     "UnsupportedOperationException":{
       "type":"structure",
       "members":{
@@ -3174,11 +2613,11 @@
       "members":{
         "AliasName":{
           "shape":"AliasNameType",
-          "documentation":"<p>String that contains the name of the alias to be modified. The name must start with the word \"alias\" followed by a forward slash (alias/). Aliases that begin with \"alias/aws\" are reserved.</p>"
+          "documentation":"String that contains the name of the alias to be modifed. The name must start with the word \"alias\" followed by a forward slash (alias/). Aliases that begin with \"alias/AWS\" are reserved."
         },
         "TargetKeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>Unique identifier of the customer master key to be mapped to the alias. This value can be a globally unique identifier or the fully specified ARN of a key. <ul> <li>Key ARN Example - arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012</li> <li>Globally Unique Key ID Example - 12345678-1234-1234-1234-123456789012</li> </ul> </p> <p>You can call <a>ListAliases</a> to verify that the alias is mapped to the correct <code>TargetKeyId</code>.</p>"
+          "documentation":"<p>Unique identifier of the customer master key to be associated with the alias. This value can be a globally unique identifier or the fully specified ARN of a key. <ul> <li>Key ARN Example - arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012</li> <li>Globally Unique Key ID Example - 12345678-1234-1234-1234-123456789012</li> </ul> </p>"
         }
       }
     },
@@ -3199,7 +2638,5 @@
         }
       }
     }
-  },
-  "examples":{
   }
 }
diff --git a/botocore/data/s3/2006-03-01/service-2.json b/botocore/data/s3/2006-03-01/service-2.json
index 6622737c1..29ee921a7 100644
--- a/botocore/data/s3/2006-03-01/service-2.json
+++ b/botocore/data/s3/2006-03-01/service-2.json
@@ -1056,12 +1056,6 @@
           "location":"header",
           "locationName":"x-amz-copy-source-version-id"
         },
-        "VersionId":{
-          "shape":"ObjectVersionId",
-          "location":"header",
-          "locationName":"x-amz-version-id",
-          "documentation":"Version ID of the newly created copy."
-        },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
           "location":"header",
@@ -4974,11 +4968,6 @@
           "locationName":"uploadId",
           "documentation":"Upload ID identifying the multipart upload whose part is being uploaded."
         },
-        "ServerSideEncryption":{
-          "shape":"UploadPartRequestServerSideEncryption",
-          "location":"header",
-          "locationName":"x-amz-server-side-encryption"
-        },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
           "location":"header",
@@ -5005,11 +4994,6 @@
       },
       "payload":"Body"
     },
-    "UploadPartRequestServerSideEncryption":{
-      "type":"string",
-      "enum":["AES256"],
-      "documentation":"The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256)."
-    },
     "Value":{"type":"string"},
     "VersionIdMarker":{"type":"string"},
     "VersioningConfiguration":{
diff --git a/botocore/endpoint.py b/botocore/endpoint.py
index 8c62926b7..c28f1b354 100644
--- a/botocore/endpoint.py
+++ b/botocore/endpoint.py
@@ -171,8 +171,6 @@ class Endpoint(object):
             # lookup issue, 99% of the time this is due to a misconfigured
             # region/endpoint so we'll raise a more specific error message
             # to help users.
-            logger.debug("ConnectionError received when sending HTTP request.",
-                         exc_info=True)
             if self._looks_like_dns_error(e):
                 endpoint_url = e.request.url
                 better_exception = EndpointConnectionError(
diff --git a/botocore/paginate.py b/botocore/paginate.py
index bec9f82b4..cf7342ea9 100644
--- a/botocore/paginate.py
+++ b/botocore/paginate.py
@@ -13,6 +13,8 @@
 
 from itertools import tee
 
+from six import string_types
+
 import jmespath
 from botocore.exceptions import PaginationError
 from botocore.compat import zip
@@ -253,10 +255,6 @@ class PageIterator(object):
 
     def build_full_result(self):
         complete_result = {}
-        # Prepopulate the result keys with an empty list.
-        for result_expression in self.result_keys:
-            set_value_from_jmespath(complete_result,
-                                    result_expression.expression, [])
         for response in self:
             page = response
             # We want to try to catch operation object pagination
@@ -277,10 +275,24 @@ class PageIterator(object):
                 # current result key value.  Then we append the current
                 # value onto the existing value, and re-set that value
                 # as the new value.
-                existing_value = result_expression.search(complete_result)
                 result_value = result_expression.search(page)
-                if result_value is not None:
+                if result_value is None:
+                    continue
+                existing_value = result_expression.search(complete_result)
+                if existing_value is None:
+                    # Set the initial result
+                    set_value_from_jmespath(
+                        complete_result, result_expression.expression,
+                        result_value)
+                    continue
+                # Now both result_value and existing_value contain something
+                if isinstance(result_value, list):
                     existing_value.extend(result_value)
+                elif isinstance(result_value, (int, float, string_types)):
+                    # Modify the existing result with the sum or concatenation
+                    set_value_from_jmespath(
+                        complete_result, result_expression.expression,
+                        existing_value + result_value)
         merge_dicts(complete_result, self.non_aggregate_part)
         if self.resume_token is not None:
             complete_result['NextToken'] = self.resume_token
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 6376d6cdc..f7dcd0591 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -54,7 +54,7 @@ copyright = u'2013, Mitch Garnaat'
 # The short X.Y version.
 version = '1.2.'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.11'
+release = '1.2.10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.


Test patch:
diff --git a/tests/unit/test_paginate.py b/tests/unit/test_paginate.py
index 32fa880a2..125171c2a 100644
--- a/tests/unit/test_paginate.py
+++ b/tests/unit/test_paginate.py
@@ -671,6 +671,41 @@ class TestExpressionKeyIterators(unittest.TestCase):
         })
 
 
+class TestIncludeResultKeys(unittest.TestCase):
+    def setUp(self):
+        self.method = mock.Mock()
+        self.paginate_config = {
+            'output_token': 'Marker',
+            'input_token': 'Marker',
+            'result_key': ['ResultKey', 'Count', 'Log'],
+        }
+        self.paginator = Paginator(self.method, self.paginate_config)
+
+    def test_different_kinds_of_result_key(self):
+        self.method.side_effect = [
+            {'ResultKey': ['a'], 'Count': 1, 'Log': 'x', 'Marker': 'a'},
+            {'not_a_result_key': 'this page will be ignored', 'Marker': '_'},
+            {'ResultKey': ['b', 'c'], 'Count': 2, 'Log': 'y', 'Marker': 'b'},
+            {'ResultKey': ['d', 'e', 'f'], 'Count': 3, 'Log': 'z'},
+        ]
+        pages = self.paginator.paginate()
+        expected = {
+            'ResultKey': ['a', 'b', 'c', 'd', 'e', 'f'],
+            'Count': 6,
+            'Log': 'xyz',
+        }
+        self.assertEqual(pages.build_full_result(), expected)
+
+    def test_result_key_is_missing(self):
+        self.method.side_effect = [
+            {'not_a_result_key': 'this page will be ignored', 'Marker': '_'},
+            {'neither_this_one': 'this page will be ignored, too'},
+        ]
+        pages = self.paginator.paginate()
+        expected = {}
+        self.assertEqual(pages.build_full_result(), expected)
+
+
 class TestIncludeNonResultKeys(unittest.TestCase):
     maxDiff = None