aws-sdk-s3 1.64.0 → 1.68.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90cd5bf3ac480f7f0e8420640ec2299d15d079f9e86e9cd7c797f241fd026dfd
-  data.tar.gz: a5103f9ef16e59644172aa6f1f0f7d83f1c2f0f6529e5baaf77e182766934118
+  metadata.gz: bfdbbed3a219f8690462fbca974111e863bbb4b3a3677648cf77dec94af963e9
+  data.tar.gz: 285b62f651038d1bf38e9fc156ec48d78b6aedd21f869455cfdb942aad7d817c
 SHA512:
-  metadata.gz: a903560aead850eb1fa13eb65ea2694c296b94afb39216760fc371dcc878ad9ef2c6ce22b02612a040bab56e6c5ea39bd83a6a873326574544a17fb60de5a469
-  data.tar.gz: ce32a64c04ebcb5a361df5d1b24a5b53ef82109d156b0eb974fbf874a6cc74409b7c17a8c5a1b2779cc0d4977015cc9b068caddc0cecd09fe4ed60828d2e846b
+  metadata.gz: aaed81549dabc75fd9415706924178884c1a9b2d3cc0c8325be4540c28301dd45d6d376ba6fc75bba28f705764af6916b984818d5c2df0d360884db429578b31
+  data.tar.gz: 20bc2cf996bcc241fefe8beba3bb6e30d7f5678e764c23c16a05f00e91c47be098290d85b3fe48a87bdb1edf27b35ab5e632545a210e2c81b801aed682e01641

data/lib/aws-sdk-s3.rb

@@ -66,6 +66,6 @@ require_relative 'aws-sdk-s3/event_streams'
 # @service
 module Aws::S3
 
-  GEM_VERSION = '1.64.0'
+  GEM_VERSION = '1.68.1'
 
 end

data/lib/aws-sdk-s3/bucket.rb

@@ -437,8 +437,8 @@ module Aws::S3
     #   The server-side encryption algorithm used when storing this object in
     #   Amazon S3 (for example, AES256, aws:kms).
     # @option options [String] :storage_class
-    #   If you don't specify, Standard is the default storage class. Amazon
-    #   S3 supports other storage classes.
+    #   If you don't specify, S3 Standard is the default storage class.
+    #   Amazon S3 supports other storage classes.
     # @option options [String] :website_redirect_location
     #   If the bucket is configured as a website, redirects requests for this
     #   object to another object in the same bucket or to an external URL.
@@ -520,7 +520,7 @@ module Aws::S3
     # @return [Object]
     def put_object(options = {})
       options = options.merge(bucket: @name)
-      resp = @client.put_object(options)
+      @client.put_object(options)
       Object.new(
         bucket_name: @name,
         key: options[:key],

data/lib/aws-sdk-s3/bucket_cors.rb

@@ -209,7 +209,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//cors.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html
     # @option options [String] :content_md5
     #   The base64-encoded 128-bit MD5 digest of the data. This header must be
     #   used as a message integrity check to verify that the request body was

data/lib/aws-sdk-s3/bucket_website.rb

@@ -39,13 +39,15 @@ module Aws::S3
       data[:redirect_all_requests_to]
     end
 
-    # The name of the index document for the website.
+    # The name of the index document for the website (for example
+    # `index.html`).
     # @return [Types::IndexDocument]
     def index_document
       data[:index_document]
     end
 
-    # The name of the error document for the website.
+    # The object key name of the website error document to use for 4XX class
+    # errors.
     # @return [Types::ErrorDocument]
     def error_document
       data[:error_document]

data/lib/aws-sdk-s3/client.rb

@@ -24,6 +24,7 @@ require 'aws-sdk-core/plugins/jsonvalue_converter.rb'
 require 'aws-sdk-core/plugins/client_metrics_plugin.rb'
 require 'aws-sdk-core/plugins/client_metrics_send_plugin.rb'
 require 'aws-sdk-core/plugins/transfer_encoding.rb'
+require 'aws-sdk-core/plugins/http_checksum.rb'
 require 'aws-sdk-core/plugins/protocols/rest_xml.rb'
 require 'aws-sdk-s3/plugins/iad_regional_endpoint.rb'
 require 'aws-sdk-s3/plugins/accelerate.rb'
@@ -85,6 +86,7 @@ module Aws::S3
     add_plugin(Aws::Plugins::ClientMetricsPlugin)
     add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
     add_plugin(Aws::Plugins::TransferEncoding)
+    add_plugin(Aws::Plugins::HttpChecksum)
     add_plugin(Aws::Plugins::Protocols::RestXml)
     add_plugin(Aws::S3::Plugins::IADRegionalEndpoint)
     add_plugin(Aws::S3::Plugins::Accelerate)
@@ -179,10 +181,11 @@ module Aws::S3
     #     will use the Client Side Monitoring Agent Publisher.
     #
     #   @option options [Boolean] :compute_checksums (true)
-    #     When `true` a MD5 checksum will be computed for every request that
-    #     sends a body.  When `false`, MD5 checksums will only be computed
-    #     for operations that require them.  Checksum errors returned by Amazon
-    #     S3 are automatically retried up to `:retry_limit` times.
+    #     When `true` a MD5 checksum will be computed and sent in the Content Md5
+    #     header for :put_object and :upload_part. When `false`, MD5 checksums
+    #     will not be computed for these operations. Checksums are still computed
+    #     for operations requiring them. Checksum errors returned by Amazon S3 are
+    #     automatically retried up to `:retry_limit` times.
     #
     #   @option options [Boolean] :convert_params (true)
     #     When `true`, an attempt is made to coerce request parameters into
@@ -199,7 +202,7 @@ module Aws::S3
     #   @option options [String] :endpoint
     #     The client endpoint is normally constructed from the `:region`
     #     option. You should only configure an `:endpoint` when connecting
-    #     to test endpoints. This should be a valid HTTP(S) URI.
+    #     to test or custom endpoints. This should be a valid HTTP(S) URI.
     #
     #   @option options [Integer] :endpoint_cache_max_entries (1000)
     #     Used for the maximum size limit of the LRU cache storing endpoints data
@@ -214,7 +217,7 @@ module Aws::S3
     #     requests fetching endpoints information. Defaults to 60 sec.
     #
     #   @option options [Boolean] :endpoint_discovery (false)
-    #     When set to `true`, endpoint discovery will be enabled for operations when available. Defaults to `false`.
+    #     When set to `true`, endpoint discovery will be enabled for operations when available.
     #
     #   @option options [Proc] :event_stream_handler
     #     When an EventStream or Proc object is provided, it will be used as callback for each chunk of event stream response received along the way.
@@ -555,8 +558,7 @@ module Aws::S3
     #
     #   * 404 Not Found
     #
-    # The following operations are related to
-    # `DeleteBucketMetricsConfiguration`\:
+    # The following operations are related to `CompleteMultipartUpload`\:
     #
     # * CreateMultipartUpload
     #
@@ -637,7 +639,7 @@ module Aws::S3
     #     bucket: "acexamplebucket", 
     #     etag: "\"4d9031c7644d8081c2829f4ea23c55f7-2\"", 
     #     key: "bigobject", 
-    #     location: "https://examplebucket.s3.amazonaws.com/bigobject", 
+    #     location: "https://examplebucket.s3.<Region>.amazonaws.com/bigobject", 
     #   }
     #
     # @example Request syntax with placeholder values
@@ -682,58 +684,19 @@ module Aws::S3
     #
     # <note markdown="1"> You can store individual objects of up to 5 TB in Amazon S3. You
     # create a copy of your object up to 5 GB in size in a single atomic
-    # operation using this API. However, for copying an object greater than
-    # 5 GB, you must use the multipart upload Upload Part - Copy API. For
-    # more information, see [Copy Object Using the REST Multipart Upload
-    # API][1].
+    # operation using this API. However, to copy an object greater than 5
+    # GB, you must use the multipart upload Upload Part - Copy API. For more
+    # information, see [Copy Object Using the REST Multipart Upload API][1].
     #
     #  </note>
     #
-    # When copying an object, you can preserve all metadata (default) or
-    # specify new metadata. However, the ACL is not preserved and is set to
-    # private for the user making the request. To override the default ACL
-    # setting, specify a new ACL when generating a copy request. For more
-    # information, see [Using ACLs][2].
-    #
-    # Amazon S3 transfer acceleration does not support cross-region copies.
-    # If you request a cross-region copy using a transfer acceleration
-    # endpoint, you get a 400 `Bad Request` error. For more information
-    # about transfer acceleration, see [Transfer Acceleration][3].
-    #
     # All copy requests must be authenticated. Additionally, you must have
     # *read* access to the source object and *write* access to the
     # destination bucket. For more information, see [REST
-    # Authentication][4]. Both the Region that you want to copy the object
+    # Authentication][2]. Both the Region that you want to copy the object
     # from and the Region that you want to copy the object to must be
     # enabled for your account.
     #
-    # To only copy an object under certain conditions, such as whether the
-    # `Etag` matches or whether the object was modified before or after a
-    # specified date, use the request parameters
-    # `x-amz-copy-source-if-match`, `x-amz-copy-source-if-none-match`,
-    # `x-amz-copy-source-if-unmodified-since`, or `
-    # x-amz-copy-source-if-modified-since`.
-    #
-    # <note markdown="1"> All headers with the `x-amz-` prefix, including `x-amz-copy-source`,
-    # must be signed.
-    #
-    #  </note>
-    #
-    # You can use this operation to change the storage class of an object
-    # that is already stored in Amazon S3 using the `StorageClass`
-    # parameter. For more information, see [Storage Classes][5].
-    #
-    # The source object that you are copying can be encrypted or
-    # unencrypted. If the source object is encrypted, it can be encrypted by
-    # server-side encryption using AWS managed encryption keys or by using a
-    # customer-provided encryption key. When copying an object, you can
-    # request that Amazon S3 encrypt the target object by using either the
-    # AWS managed encryption keys or by using your own encryption key. You
-    # can do this regardless of the form of server-side encryption that was
-    # used to encrypt the source, or even if the source object was not
-    # encrypted. For more information about server-side encryption, see
-    # [Using Server-Side Encryption][6].
-    #
     # A copy request might return an error when Amazon S3 receives the copy
     # request or while Amazon S3 is copying the files. If the error occurs
     # before the copy operation starts, you receive a standard Amazon S3
@@ -752,182 +715,123 @@ module Aws::S3
     #
     #  </note>
     #
-    # Consider the following when using request headers:
-    #
-    # * Consideration 1 – If both the `x-amz-copy-source-if-match` and
-    #   `x-amz-copy-source-if-unmodified-since` headers are present in the
-    #   request and evaluate as follows, Amazon S3 returns 200 OK and copies
-    #   the data:
-    #
-    #   * `x-amz-copy-source-if-match` condition evaluates to true
-    #
-    #   * `x-amz-copy-source-if-unmodified-since` condition evaluates to
-    #     false
-    #
-    # * Consideration 2 – If both of the `x-amz-copy-source-if-none-match`
-    #   and `x-amz-copy-source-if-modified-since` headers are present in the
-    #   request and evaluate as follows, Amazon S3 returns the `412
-    #   Precondition Failed` response code:
-    #
-    #   * `x-amz-copy-source-if-none-match` condition evaluates to false
-    #
-    #   * `x-amz-copy-source-if-modified-since` condition evaluates to true
-    #
-    # The copy request charge is based on the storage class and Region you
-    # specify for the destination object. For pricing information, see
-    # [Amazon S3 Pricing][7].
-    #
-    # Following are other considerations when using `CopyObject`\:
-    #
-    # Versioning
-    #
-    # : By default, `x-amz-copy-source` identifies the current version of an
-    #   object to copy. (If the current version is a delete marker, Amazon
-    #   S3 behaves as if the object was deleted.) To copy a different
-    #   version, use the `versionId` subresource.
-    #
-    #   If you enable versioning on the target bucket, Amazon S3 generates a
-    #   unique version ID for the object being copied. This version ID is
-    #   different from the version ID of the source object. Amazon S3
-    #   returns the version ID of the copied object in the
-    #   `x-amz-version-id` response header in the response.
+    # The copy request charge is based on the storage class and Region that
+    # you specify for the destination object. For pricing information, see
+    # [Amazon S3 pricing][3].
     #
-    #   If you do not enable versioning or suspend it on the target bucket,
-    #   the version ID that Amazon S3 generates is always null.
+    # Amazon S3 transfer acceleration does not support cross-Region copies.
+    # If you request a cross-Region copy using a transfer acceleration
+    # endpoint, you get a 400 `Bad Request` error. For more information, see
+    # [Transfer Acceleration][4].
     #
-    #   If the source object's storage class is GLACIER, you must restore a
-    #   copy of this object before you can use it as a source object for the
-    #   copy operation. For more information, see .
-    #
-    # Access Permissions
-    #
-    # : When copying an object, you can optionally specify the accounts or
-    #   groups that should be granted specific permissions on the new
-    #   object. There are two ways to grant the permissions using the
-    #   request headers:
-    #
-    #   * Specify a canned ACL with the `x-amz-acl` request header. For more
-    #     information, see [Canned ACL][8].
-    #
-    #   * Specify access permissions explicitly with the `x-amz-grant-read`,
-    #     `x-amz-grant-read-acp`, `x-amz-grant-write-acp`, and
-    #     `x-amz-grant-full-control` headers. These parameters map to the
-    #     set of permissions that Amazon S3 supports in an ACL. For more
-    #     information, see [Access Control List (ACL) Overview][9].
-    #
-    #   You can use either a canned ACL or specify access permissions
-    #   explicitly. You cannot do both.
-    #
-    # Server-Side- Encryption-Specific Request Headers
-    #
-    # : To encrypt the target object, you must provide the appropriate
-    #   encryption-related request headers. The one you use depends on
-    #   whether you want to use AWS managed encryption keys or provide your
-    #   own encryption key.
-    #
-    #   * To encrypt the target object using server-side encryption with an
-    #     AWS managed encryption key, provide the following request headers,
-    #     as appropriate.
-    #
-    #     * `x-amz-server-side​-encryption`
-    #
-    #     * `x-amz-server-side-encryption-aws-kms-key-id`
-    #
-    #     * `x-amz-server-side-encryption-context`
-    #
-    #     <note markdown="1"> If you specify `x-amz-server-side-encryption:aws:kms`, but don't
-    #     provide `x-amz-server-side-encryption-aws-kms-key-id`, Amazon S3
-    #     uses the AWS managed CMK in AWS KMS to protect the data. If you
-    #     want to use a customer managed AWS KMS CMK, you must provide the
-    #     `x-amz-server-side-encryption-aws-kms-key-id` of the symmetric
-    #     customer managed CMK. Amazon S3 only supports symmetric CMKs and
-    #     not asymmetric CMKs. For more information, see [Using Symmetric
-    #     and Asymmetric Keys][10] in the *AWS Key Management Service
-    #     Developer Guide*.
-    #
-    #      </note>
-    #
-    #     All GET and PUT requests for an object protected by AWS KMS fail
-    #     if you don't make them with SSL or by using SigV4.
+    # **Metadata**
     #
-    #     For more information about server-side encryption with CMKs stored
-    #     in AWS KMS (SSE-KMS), see [Protecting Data Using Server-Side
-    #     Encryption with CMKs stored in KMS][11].
+    # When copying an object, you can preserve all metadata (default) or
+    # specify new metadata. However, the ACL is not preserved and is set to
+    # private for the user making the request. To override the default ACL
+    # setting, specify a new ACL when generating a copy request. For more
+    # information, see [Using ACLs][5].
     #
-    #   * To encrypt the target object using server-side encryption with an
-    #     encryption key that you provide, use the following headers.
+    # To specify whether you want the object metadata copied from the source
+    # object or replaced with metadata provided in the request, you can
+    # optionally add the `x-amz-metadata-directive` header. When you grant
+    # permissions, you can use the `s3:x-amz-metadata-directive` condition
+    # key to enforce certain metadata behavior when objects are uploaded.
+    # For more information, see [Specifying Conditions in a Policy][6] in
+    # the *Amazon S3 Developer Guide*. For a complete list of Amazon
+    # S3-specific condition keys, see [Actions, Resources, and Condition
+    # Keys for Amazon S3][7].
     #
-    #     * x-amz-server-side​-encryption​-customer-algorithm
+    # <b> <code>x-amz-copy-source-if</code> Headers</b>
     #
-    #     * x-amz-server-side​-encryption​-customer-key
+    # To only copy an object under certain conditions, such as whether the
+    # `Etag` matches or whether the object was modified before or after a
+    # specified date, use the following request parameters:
     #
-    #     * x-amz-server-side​-encryption​-customer-key-MD5
+    # * `x-amz-copy-source-if-match`
     #
-    #   * If the source object is encrypted using server-side encryption
-    #     with customer-provided encryption keys, you must use the following
-    #     headers.
+    # * `x-amz-copy-source-if-none-match`
     #
-    #     * x-amz-copy-source​-server-side​-encryption​-customer-algorithm
+    # * `x-amz-copy-source-if-unmodified-since`
     #
-    #     * x-amz-copy-source​-server-side​-encryption​-customer-key
+    # * `x-amz-copy-source-if-modified-since`
     #
-    #     * x-amz-copy-source-​server-side​-encryption​-customer-key-MD5
+    # If both the `x-amz-copy-source-if-match` and
+    # `x-amz-copy-source-if-unmodified-since` headers are present in the
+    # request and evaluate as follows, Amazon S3 returns `200 OK` and copies
+    # the data:
     #
-    #     For more information about server-side encryption with CMKs stored
-    #     in AWS KMS (SSE-KMS), see [Protecting Data Using Server-Side
-    #     Encryption with CMKs stored in Amazon KMS][11].
+    # * `x-amz-copy-source-if-match` condition evaluates to true
     #
-    # Access-Control-List (ACL)-Specific Request Headers
+    # * `x-amz-copy-source-if-unmodified-since` condition evaluates to false
     #
-    # : You also can use the following access control–related headers with
-    #   this operation. By default, all objects are private. Only the owner
-    #   has full access control. When adding a new object, you can grant
-    #   permissions to individual AWS accounts or to predefined groups
-    #   defined by Amazon S3. These permissions are then added to the access
-    #   control list (ACL) on the object. For more information, see [Using
-    #   ACLs][2]. With this operation, you can grant access permissions
-    #   using one of the following two methods:
+    # If both the `x-amz-copy-source-if-none-match` and
+    # `x-amz-copy-source-if-modified-since` headers are present in the
+    # request and evaluate as follows, Amazon S3 returns the `412
+    # Precondition Failed` response code:
     #
-    #   * Specify a canned ACL (`x-amz-acl`) — Amazon S3 supports a set of
-    #     predefined ACLs, known as *canned ACLs*. Each canned ACL has a
-    #     predefined set of grantees and permissions. For more information,
-    #     see [Canned ACL][8].
+    # * `x-amz-copy-source-if-none-match` condition evaluates to false
     #
-    #   * Specify access permissions explicitly — To explicitly grant access
-    #     permissions to specific AWS accounts or groups, use the following
-    #     headers. Each header maps to specific permissions that Amazon S3
-    #     supports in an ACL. For more information, see [Access Control List
-    #     (ACL) Overview][9]. In the header, you specify a list of grantees
-    #     who get the specific permission. To grant permissions explicitly,
-    #     use:
+    # * `x-amz-copy-source-if-modified-since` condition evaluates to true
     #
-    #     * x-amz-grant-read
+    # <note markdown="1"> All headers with the `x-amz-` prefix, including `x-amz-copy-source`,
+    # must be signed.
     #
-    #     * x-amz-grant-write
+    #  </note>
     #
-    #     * x-amz-grant-read-acp
+    # **Encryption**
     #
-    #     * x-amz-grant-write-acp
+    # The source object that you are copying can be encrypted or
+    # unencrypted. The source object can be encrypted with server-side
+    # encryption using AWS managed encryption keys (SSE-S3 or SSE-KMS) or by
+    # using a customer-provided encryption key. With server-side encryption,
+    # Amazon S3 encrypts your data as it writes it to disks in its data
+    # centers and decrypts the data when you access it.
+    #
+    # You can optionally use the appropriate encryption-related headers to
+    # request server-side encryption for the target object. You have the
+    # option to provide your own encryption key or use SSE-S3 or SSE-KMS,
+    # regardless of the form of server-side encryption that was used to
+    # encrypt the source object. You can even request encryption if the
+    # source object was not encrypted. For more information about
+    # server-side encryption, see [Using Server-Side Encryption][8].
+    #
+    # **Access Control List (ACL)-Specific Request Headers**
+    #
+    # When copying an object, you can optionally use headers to grant
+    # ACL-based permissions. By default, all objects are private. Only the
+    # owner has full access control. When adding a new object, you can grant
+    # permissions to individual AWS accounts or to predefined groups defined
+    # by Amazon S3. These permissions are then added to the ACL on the
+    # object. For more information, see [Access Control List (ACL)
+    # Overview][9] and [Managing ACLs Using the REST API][10].
     #
-    #     * x-amz-grant-full-control
+    # **Storage Class Options**
     #
-    #     You specify each grantee as a type=value pair, where the type is
-    #     one of the following:
+    # You can use the `CopyObject` operation to change the storage class of
+    # an object that is already stored in Amazon S3 using the `StorageClass`
+    # parameter. For more information, see [Storage Classes][11] in the
+    # *Amazon S3 Service Developer Guide*.
     #
-    #     * `emailAddress` – if the value specified is the email address of
-    #       an AWS account
+    # **Versioning**
     #
-    #     * `id` – if the value specified is the canonical user ID of an AWS
-    #       account
+    # By default, `x-amz-copy-source` identifies the current version of an
+    # object to copy. If the current version is a delete marker, Amazon S3
+    # behaves as if the object was deleted. To copy a different version, use
+    # the `versionId` subresource.
     #
-    #     * `uri` – if you are granting permissions to a predefined group
+    # If you enable versioning on the target bucket, Amazon S3 generates a
+    # unique version ID for the object being copied. This version ID is
+    # different from the version ID of the source object. Amazon S3 returns
+    # the version ID of the copied object in the `x-amz-version-id` response
+    # header in the response.
     #
-    #     For example, the following `x-amz-grant-read` header grants the
-    #     AWS accounts identified by email addresses permissions to read
-    #     object data and its metadata:
+    # If you do not enable versioning or suspend it on the target bucket,
+    # the version ID that Amazon S3 generates is always null.
     #
-    #     `x-amz-grant-read: emailAddress="xyz@amazon.com",
-    #     emailAddress="abc@amazon.com" `
+    # If the source object's storage class is GLACIER, you must restore a
+    # copy of this object before you can use it as a source object for the
+    # copy operation. For more information, see .
     #
     # The following operations are related to `CopyObject`\:
     #
@@ -940,16 +844,16 @@ module Aws::S3
     #
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/CopyingObjctsUsingRESTMPUapi.html
-    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html
-    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/transfer-acceleration.html
-    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
-    # [5]: https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html
-    # [6]: https://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html
-    # [7]: https://aws.amazon.com/s3/pricing/
-    # [8]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
+    # [3]: https://aws.amazon.com/s3/pricing/
+    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/transfer-acceleration.html
+    # [5]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html
+    # [6]: https://docs.aws.amazon.com/AmazonS3/latest/dev/amazon-s3-policy-keys.html
+    # [7]: https://docs.aws.amazon.com/AmazonS3/latest/dev/list_amazons3.html
+    # [8]: https://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html
     # [9]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
-    # [10]: https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html
-    # [11]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html
+    # [10]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-using-rest-api.html
+    # [11]: https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html
     # [12]: https://docs.aws.amazon.com/AmazonS3/latest/dev/CopyingObjectsExamples.html
     #
     # @option params [String] :acl
@@ -1219,7 +1123,7 @@ module Aws::S3
     # You can optionally specify a Region in the request body. You might
     # choose a Region to optimize latency, minimize costs, or address
     # regulatory requirements. For example, if you reside in Europe, you
-    # will probably find it advantageous to create buckets in the EU
+    # will probably find it advantageous to create buckets in the Europe
     # (Ireland) Region. For more information, see [How to Select a Region
     # for Your Buckets][2].
     #
@@ -1254,20 +1158,43 @@ module Aws::S3
     #   You specify each grantee as a type=value pair, where the type is one
     #   of the following:
     #
-    #   * `emailAddress` – if the value specified is the email address of an
-    #     AWS account
-    #
     #   * `id` – if the value specified is the canonical user ID of an AWS
     #     account
     #
     #   * `uri` – if you are granting permissions to a predefined group
     #
+    #   * `emailAddress` – if the value specified is the email address of an
+    #     AWS account
+    #
+    #     <note markdown="1"> Using email addresses to specify a grantee is only supported in
+    #     the following AWS Regions:
+    #
+    #      * US East (N. Virginia)
+    #
+    #     * US West (N. California)
+    #
+    #     * US West (Oregon)
+    #
+    #     * Asia Pacific (Singapore)
+    #
+    #     * Asia Pacific (Sydney)
+    #
+    #     * Asia Pacific (Tokyo)
+    #
+    #     * Europe (Ireland)
+    #
+    #     * South America (São Paulo)
+    #
+    #      For a list of all the Amazon S3 supported Regions and endpoints,
+    #     see [Regions and Endpoints][6] in the AWS General Reference.
+    #
+    #      </note>
+    #
     #   For example, the following `x-amz-grant-read` header grants the AWS
-    #   accounts identified by email addresses permissions to read object
-    #   data and its metadata:
+    #   accounts identified by account IDs permissions to read object data
+    #   and its metadata:
     #
-    #   `x-amz-grant-read: emailAddress="xyz@amazon.com",
-    #   emailAddress="abc@amazon.com" `
+    #   `x-amz-grant-read: id="11112222333", id="444455556666" `
     #
     # <note markdown="1"> You can use either a canned ACL or specify access permissions
     # explicitly. You cannot do both.
@@ -1287,6 +1214,7 @@ module Aws::S3
     # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
     # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
     # [5]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
+    # [6]: https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     #
     # @option params [String] :acl
     #   The canned ACL to apply to the bucket.
@@ -1349,7 +1277,7 @@ module Aws::S3
     #
     #   resp.to_h outputs the following:
     #   {
-    #     location: "http://examplebucket.s3.amazonaws.com/", 
+    #     location: "http://examplebucket.<Region>.s3.amazonaws.com/", 
     #   }
     #
     # @example Request syntax with placeholder values
@@ -1545,20 +1473,43 @@ module Aws::S3
     #     You specify each grantee as a type=value pair, where the type is
     #     one of the following:
     #
-    #     * `emailAddress` – if the value specified is the email address of
-    #       an AWS account
-    #
     #     * `id` – if the value specified is the canonical user ID of an AWS
     #       account
     #
     #     * `uri` – if you are granting permissions to a predefined group
     #
+    #     * `emailAddress` – if the value specified is the email address of
+    #       an AWS account
+    #
+    #       <note markdown="1"> Using email addresses to specify a grantee is only supported in
+    #       the following AWS Regions:
+    #
+    #        * US East (N. Virginia)
+    #
+    #       * US West (N. California)
+    #
+    #       * US West (Oregon)
+    #
+    #       * Asia Pacific (Singapore)
+    #
+    #       * Asia Pacific (Sydney)
+    #
+    #       * Asia Pacific (Tokyo)
+    #
+    #       * Europe (Ireland)
+    #
+    #       * South America (São Paulo)
+    #
+    #        For a list of all the Amazon S3 supported Regions and endpoints,
+    #       see [Regions and Endpoints][10] in the AWS General Reference.
+    #
+    #        </note>
+    #
     #     For example, the following `x-amz-grant-read` header grants the
-    #     AWS accounts identified by email addresses permissions to read
-    #     object data and its metadata:
+    #     AWS accounts identified by account IDs permissions to read object
+    #     data and its metadata:
     #
-    #     `x-amz-grant-read: emailAddress="xyz@amazon.com",
-    #     emailAddress="abc@amazon.com" `
+    #     `x-amz-grant-read: id="11112222333", id="444455556666" `
     #
     # The following operations are related to `CreateMultipartUpload`\:
     #
@@ -1583,6 +1534,7 @@ module Aws::S3
     # [7]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
     # [8]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html
     # [9]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html
+    # [10]: https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     #
     # @option params [String] :acl
     #   The canned ACL to apply to the object.
@@ -1848,7 +1800,7 @@ module Aws::S3
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
     # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/analytics-storage-class.html
     #
@@ -1945,9 +1897,9 @@ module Aws::S3
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//bucket-encryption.html
-    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
-    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
     #
     # @option params [required, String] :bucket
     #   The name of the bucket containing the server-side encryption
@@ -2428,15 +2380,6 @@ module Aws::S3
     #   * {Types::DeleteObjectOutput#request_charged #request_charged} => String
     #
     #
-    # @example Example: To delete an object (from a non-versioned bucket)
-    #
-    #   # The following example deletes an object from a non-versioned bucket.
-    #
-    #   resp = client.delete_object({
-    #     bucket: "ExampleBucket", 
-    #     key: "HappyFace.jpg", 
-    #   })
-    #
     # @example Example: To delete an object
     #
     #   # The following example deletes an object from an S3 bucket.
@@ -2450,6 +2393,15 @@ module Aws::S3
     #   {
     #   }
     #
+    # @example Example: To delete an object (from a non-versioned bucket)
+    #
+    #   # The following example deletes an object from a non-versioned bucket.
+    #
+    #   resp = client.delete_object({
+    #     bucket: "ExampleBucket", 
+    #     key: "HappyFace.jpg", 
+    #   })
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.delete_object({
@@ -2670,20 +2622,22 @@ module Aws::S3
     #   * {Types::DeleteObjectsOutput#errors #errors} => Array&lt;Types::Error&gt;
     #
     #
-    # @example Example: To delete multiple objects from a versioned bucket
+    # @example Example: To delete multiple object versions from a versioned bucket
     #
-    #   # The following example deletes objects from a bucket. The bucket is versioned, and the request does not specify the
-    #   # object version to delete. In this case, all versions remain in the bucket and S3 adds a delete marker.
+    #   # The following example deletes objects from a bucket. The request specifies object versions. S3 deletes specific object
+    #   # versions and returns the key and versions of deleted objects in the response.
     #
     #   resp = client.delete_objects({
     #     bucket: "examplebucket", 
     #     delete: {
     #       objects: [
     #         {
-    #           key: "objectkey1", 
+    #           key: "HappyFace.jpg", 
+    #           version_id: "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b", 
     #         }, 
     #         {
-    #           key: "objectkey2", 
+    #           key: "HappyFace.jpg", 
+    #           version_id: "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd", 
     #         }, 
     #       ], 
     #       quiet: false, 
@@ -2694,34 +2648,30 @@ module Aws::S3
     #   {
     #     deleted: [
     #       {
-    #         delete_marker: true, 
-    #         delete_marker_version_id: "A._w1z6EFiCF5uhtQMDal9JDkID9tQ7F", 
-    #         key: "objectkey1", 
+    #         key: "HappyFace.jpg", 
+    #         version_id: "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd", 
     #       }, 
     #       {
-    #         delete_marker: true, 
-    #         delete_marker_version_id: "iOd_ORxhkKe_e8G8_oSGxt2PjsCZKlkt", 
-    #         key: "objectkey2", 
+    #         key: "HappyFace.jpg", 
+    #         version_id: "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b", 
     #       }, 
     #     ], 
     #   }
     #
-    # @example Example: To delete multiple object versions from a versioned bucket
+    # @example Example: To delete multiple objects from a versioned bucket
     #
-    #   # The following example deletes objects from a bucket. The request specifies object versions. S3 deletes specific object
-    #   # versions and returns the key and versions of deleted objects in the response.
+    #   # The following example deletes objects from a bucket. The bucket is versioned, and the request does not specify the
+    #   # object version to delete. In this case, all versions remain in the bucket and S3 adds a delete marker.
     #
     #   resp = client.delete_objects({
     #     bucket: "examplebucket", 
     #     delete: {
     #       objects: [
     #         {
-    #           key: "HappyFace.jpg", 
-    #           version_id: "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b", 
+    #           key: "objectkey1", 
     #         }, 
     #         {
-    #           key: "HappyFace.jpg", 
-    #           version_id: "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd", 
+    #           key: "objectkey2", 
     #         }, 
     #       ], 
     #       quiet: false, 
@@ -2732,12 +2682,14 @@ module Aws::S3
     #   {
     #     deleted: [
     #       {
-    #         key: "HappyFace.jpg", 
-    #         version_id: "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd", 
+    #         delete_marker: true, 
+    #         delete_marker_version_id: "A._w1z6EFiCF5uhtQMDal9JDkID9tQ7F", 
+    #         key: "objectkey1", 
     #       }, 
     #       {
-    #         key: "HappyFace.jpg", 
-    #         version_id: "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b", 
+    #         delete_marker: true, 
+    #         delete_marker_version_id: "iOd_ORxhkKe_e8G8_oSGxt2PjsCZKlkt", 
+    #         key: "objectkey2", 
     #       }, 
     #     ], 
     #   }
@@ -2790,8 +2742,7 @@ module Aws::S3
     # Operations][1] and [Managing Access Permissions to Your Amazon S3
     # Resources][2].
     #
-    # The following operations are related to
-    # `DeleteBucketMetricsConfiguration`\:
+    # The following operations are related to `DeletePublicAccessBlock`\:
     #
     # * [Using Amazon S3 Block Public Access][3]
     #
@@ -2861,9 +2812,9 @@ module Aws::S3
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
-    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html
-    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev//transfer-acceleration.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/transfer-acceleration.html
     #
     # @option params [required, String] :bucket
     #   Name of the bucket for which the accelerate configuration is
@@ -3348,7 +3299,7 @@ module Aws::S3
     #   * SOAP Fault Code Prefix: Client
     #
     # The following operations are related to
-    # `DeleteBucketMetricsConfiguration`\:
+    # `GetBucketLifecycleConfiguration`\:
     #
     # * GetBucketLifecycle
     #
@@ -3605,7 +3556,7 @@ module Aws::S3
     # No longer used, see GetBucketNotificationConfiguration.
     #
     # @option params [required, String] :bucket
-    #   Name of the bucket for which to get the notification configuration
+    #   Name of the bucket for which to get the notification configuration.
     #
     # @return [Types::NotificationConfigurationDeprecated] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -3731,7 +3682,7 @@ module Aws::S3
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html
     #
     # @option params [required, String] :bucket
-    #   Name of the bucket for which to get the notification configuration
+    #   Name of the bucket for which to get the notification configuration.
     #
     # @return [Types::NotificationConfiguration] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -4466,7 +4417,16 @@ module Aws::S3
     # @option params [String] :range
     #   Downloads the specified range bytes of an object. For more information
     #   about the HTTP Range header, see
-    #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
+    #   [https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35][1].
+    #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
     #
     # @option params [String] :response_cache_control
     #   Sets the `Cache-Control` header of the response.
@@ -5446,6 +5406,11 @@ module Aws::S3
     #   about the HTTP Range header, see
     #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
     #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
+    #
     # @option params [String] :version_id
     #   VersionId used to reference a specific version of the object.
     #
@@ -6248,12 +6213,12 @@ module Aws::S3
     #   Specifies the key to start with when listing objects in a bucket.
     #
     # @option params [Integer] :max_keys
-    #   Sets the maximum number of keys returned in the response. The response
-    #   might contain fewer keys but will never contain more. If additional
-    #   keys satisfy the search criteria, but were not returned because
-    #   max-keys was exceeded, the response contains
-    #   &lt;isTruncated&gt;true&lt;/isTruncated&gt;. To return the additional
-    #   keys, see key-marker and version-id-marker.
+    #   Sets the maximum number of keys returned in the response. By default
+    #   the API returns up to 1,000 key names. The response might contain
+    #   fewer keys but will never contain more. If additional keys satisfy the
+    #   search criteria, but were not returned because max-keys was exceeded,
+    #   the response contains &lt;isTruncated&gt;true&lt;/isTruncated&gt;. To
+    #   return the additional keys, see key-marker and version-id-marker.
     #
     # @option params [String] :prefix
     #   Use this parameter to select only those keys that begin with the
@@ -6421,8 +6386,9 @@ module Aws::S3
     #   Specifies the key to start with when listing objects in a bucket.
     #
     # @option params [Integer] :max_keys
-    #   Sets the maximum number of keys returned in the response. The response
-    #   might contain fewer keys but will never contain more.
+    #   Sets the maximum number of keys returned in the response. By default
+    #   the API returns up to 1,000 key names. The response might contain
+    #   fewer keys but will never contain more.
     #
     # @option params [String] :prefix
     #   Limits the response to keys that begin with the specified prefix.
@@ -6585,8 +6551,9 @@ module Aws::S3
     #   Encoding type used by Amazon S3 to encode object keys in the response.
     #
     # @option params [Integer] :max_keys
-    #   Sets the maximum number of keys returned in the response. The response
-    #   might contain fewer keys but will never contain more.
+    #   Sets the maximum number of keys returned in the response. By default
+    #   the API returns up to 1,000 key names. The response might contain
+    #   fewer keys but will never contain more.
     #
     # @option params [String] :prefix
     #   Limits the response to keys that begin with the specified prefix.
@@ -7002,38 +6969,54 @@ module Aws::S3
     #   You specify each grantee as a type=value pair, where the type is one
     #   of the following:
     #
-    #   * `emailAddress` – if the value specified is the email address of an
-    #     AWS account
-    #
     #   * `id` – if the value specified is the canonical user ID of an AWS
     #     account
     #
     #   * `uri` – if you are granting permissions to a predefined group
     #
-    #   For example, the following `x-amz-grant-write` header grants create,
-    #   overwrite, and delete objects permission to LogDelivery group
-    #   predefined by Amazon S3 and two AWS accounts identified by their
-    #   email addresses.
+    #   * `emailAddress` – if the value specified is the email address of an
+    #     AWS account
     #
-    #   `x-amz-grant-write:
-    #   uri="http://acs.amazonaws.com/groups/s3/LogDelivery",
-    #   emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" `
+    #     <note markdown="1"> Using email addresses to specify a grantee is only supported in
+    #     the following AWS Regions:
     #
-    # You can use either a canned ACL or specify access permissions
-    # explicitly. You cannot do both.
+    #      * US East (N. Virginia)
     #
-    # **Grantee Values**
+    #     * US West (N. California)
     #
-    # You can specify the person (grantee) to whom you're assigning access
-    # rights (using request elements) in the following ways:
+    #     * US West (Oregon)
     #
-    # * By Email address:
+    #     * Asia Pacific (Singapore)
     #
-    #   `<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    #   xsi:type="AmazonCustomerByEmail"><EmailAddress><>Grantees@email.com<></EmailAddress>lt;/Grantee>`
+    #     * Asia Pacific (Sydney)
     #
-    #   The grantee is resolved to the CanonicalUser and, in a response to a
-    #   GET Object acl request, appears as the CanonicalUser.
+    #     * Asia Pacific (Tokyo)
+    #
+    #     * Europe (Ireland)
+    #
+    #     * South America (São Paulo)
+    #
+    #      For a list of all the Amazon S3 supported Regions and endpoints,
+    #     see [Regions and Endpoints][4] in the AWS General Reference.
+    #
+    #      </note>
+    #
+    #   For example, the following `x-amz-grant-write` header grants create,
+    #   overwrite, and delete objects permission to LogDelivery group
+    #   predefined by Amazon S3 and two AWS accounts identified by their
+    #   email addresses.
+    #
+    #   `x-amz-grant-write:
+    #   uri="http://acs.amazonaws.com/groups/s3/LogDelivery",
+    #   id="111122223333", id="555566667777" `
+    #
+    # You can use either a canned ACL or specify access permissions
+    # explicitly. You cannot do both.
+    #
+    # **Grantee Values**
+    #
+    # You can specify the person (grantee) to whom you're assigning access
+    # rights (using request elements) in the following ways:
     #
     # * By the person's ID:
     #
@@ -7048,6 +7031,38 @@ module Aws::S3
     #   `<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     #   xsi:type="Group"><URI><>http://acs.amazonaws.com/groups/global/AuthenticatedUsers<></URI></Grantee>`
     #
+    # * By Email address:
+    #
+    #   `<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    #   xsi:type="AmazonCustomerByEmail"><EmailAddress><>Grantees@email.com<></EmailAddress>lt;/Grantee>`
+    #
+    #   The grantee is resolved to the CanonicalUser and, in a response to a
+    #   GET Object acl request, appears as the CanonicalUser.
+    #
+    #   <note markdown="1"> Using email addresses to specify a grantee is only supported in the
+    #   following AWS Regions:
+    #
+    #    * US East (N. Virginia)
+    #
+    #   * US West (N. California)
+    #
+    #   * US West (Oregon)
+    #
+    #   * Asia Pacific (Singapore)
+    #
+    #   * Asia Pacific (Sydney)
+    #
+    #   * Asia Pacific (Tokyo)
+    #
+    #   * Europe (Ireland)
+    #
+    #   * South America (São Paulo)
+    #
+    #    For a list of all the Amazon S3 supported Regions and endpoints, see
+    #   [Regions and Endpoints][4] in the AWS General Reference.
+    #
+    #    </note>
+    #
     # **Related Resources**
     #
     # * CreateBucket
@@ -7061,6 +7076,7 @@ module Aws::S3
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
     # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
+    # [4]: https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     #
     # @option params [String] :acl
     #   The canned ACL to apply to the bucket.
@@ -7336,7 +7352,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//cors.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html
     #
     # @option params [String] :content_md5
     #   The base64-encoded 128-bit MD5 digest of the data. This header must be
@@ -7425,7 +7441,9 @@ module Aws::S3
     #
     # This implementation of the `PUT` operation sets default encryption for
     # a bucket using server-side encryption with Amazon S3-managed keys
-    # SSE-S3 or AWS KMS customer master keys (CMKs) (SSE-KMS).
+    # SSE-S3 or AWS KMS customer master keys (CMKs) (SSE-KMS). For
+    # information about the Amazon S3 default encryption feature, see
+    # [Amazon S3 Default Bucket Encryption][1].
     #
     # This operation requires AWS Signature Version 4. For more information,
     # see [ Authenticating Requests (AWS Signature Version
@@ -7435,8 +7453,8 @@ module Aws::S3
     # `s3:PutEncryptionConfiguration` action. The bucket owner has this
     # permission by default. The bucket owner can grant this permission to
     # others. For more information about permissions, see [Permissions
-    # Related to Bucket Subresource Operations][1] and [Managing Access
-    # Permissions to Your Amazon S3 Resources][2] in the Amazon Simple
+    # Related to Bucket Subresource Operations][2] and [Managing Access
+    # Permissions to Your Amazon S3 Resources][3] in the Amazon Simple
     # Storage Service Developer Guide.
     #
     # **Related Resources**
@@ -7447,8 +7465,9 @@ module Aws::S3
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
-    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
     #
     # @option params [required, String] :bucket
     #   Specifies default encryption for a bucket using server-side encryption
@@ -7519,7 +7538,7 @@ module Aws::S3
     # You must create a bucket policy on the *destination* bucket to grant
     # permissions to Amazon S3 to write objects to the bucket in the defined
     # location. For an example policy, see [ Granting Permissions for Amazon
-    # S3 Inventory and Storage Class Analysis.][2]
+    # S3 Inventory and Storage Class Analysis][2].
     #
     # To use this operation, you must have permissions to perform the
     # `s3:PutInventoryConfiguration` action. The bucket owner has this
@@ -7550,7 +7569,7 @@ module Aws::S3
     #
     #   * *Cause:* You are not the owner of the specified bucket, or you do
     #     not have the `s3:PutInventoryConfiguration` bucket permission to
-    #     set the configuration on the bucket
+    #     set the configuration on the bucket.
     #
     # **Related Resources**
     #
@@ -7562,10 +7581,10 @@ module Aws::S3
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//storage-inventory.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-inventory.html
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html#example-bucket-policies-use-case-9
-    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
-    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
+    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
     #
     # @option params [required, String] :bucket
     #   The name of the bucket where the inventory configuration will be
@@ -7678,10 +7697,10 @@ module Aws::S3
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//object-lifecycle-mgmt.html
-    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html
-    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev//intro-lifecycle-rules.html#lifecycle-configuration-examples
-    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html#lifecycle-configuration-examples
+    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html
     #
     # @option params [required, String] :bucket
     #
@@ -8354,7 +8373,7 @@ module Aws::S3
     # permissions on the specified bucket and belong to the bucket owner's
     # account in order to use this operation.
     #
-    # If you don't have `PutBucketPolic`y permissions, Amazon S3 returns a
+    # If you don't have `PutBucketPolicy` permissions, Amazon S3 returns a
     # `403 Access Denied` error. If you have the correct permissions, but
     # you're not using an identity that belongs to the bucket owner's
     # account, Amazon S3 returns a `405 Method Not Allowed` error.
@@ -8737,8 +8756,8 @@ module Aws::S3
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/CostAllocTagging.html
     # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
     # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
-    # [5]: https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2//allocation-tag-restrictions.html
-    # [6]: https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2//aws-tag-restrictions.html
+    # [5]: https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html
+    # [6]: https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/aws-tag-restrictions.html
     #
     # @option params [required, String] :bucket
     #   The bucket name.
@@ -8962,9 +8981,15 @@ module Aws::S3
     #
     # * `HttpRedirectCode`
     #
+    # Amazon S3 has a limitation of 50 routing rules per website
+    # configuration. If you require more than 50 routing rules, you can use
+    # object redirect. For more information, see [Configuring an Object
+    # Redirect][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #
     #
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/how-to-page-redirect.html
     #
     # @option params [required, String] :bucket
     #   The bucket name.
@@ -9063,16 +9088,16 @@ module Aws::S3
     # putting an object to Amazon S3 and compare the returned ETag to the
     # calculated MD5 value.
     #
-    # <note markdown="1"> To configure your application to send the request headers before
-    # sending the request body, use the `100-continue` HTTP status code. For
-    # PUT operations, this helps you avoid sending the message body if the
-    # message is rejected based on the headers (for example, because
-    # authentication fails or a redirect occurs). For more information on
-    # the `100-continue` HTTP status code, see Section 8.2.3 of
-    # [http://www.ietf.org/rfc/rfc2616.txt][1].
+    # <note markdown="1"> The `Content-MD5` header is required for any request to upload an
+    # object with a retention period configured using Amazon S3 Object Lock.
+    # For more information about Amazon S3 Object Lock, see [Amazon S3
+    # Object Lock Overview][1] in the *Amazon Simple Storage Service
+    # Developer Guide*.
     #
     #  </note>
     #
+    # **Server-side Encryption**
+    #
     # You can optionally request server-side encryption. With server-side
     # encryption, Amazon S3 encrypts your data as it writes it to disks in
     # its data centers and decrypts the data when you access it. You have
@@ -9080,229 +9105,35 @@ module Aws::S3
     # encryption keys. For more information, see [Using Server-Side
     # Encryption][2].
     #
-    # Access Permissions
-    #
-    # : You can optionally specify the accounts or groups that should be
-    #   granted specific permissions on the new object. There are two ways
-    #   to grant the permissions using the request headers:
-    #
-    #   * Specify a canned ACL with the `x-amz-acl` request header. For more
-    #     information, see [Canned ACL][3].
-    #
-    #   * Specify access permissions explicitly with the `x-amz-grant-read`,
-    #     `x-amz-grant-read-acp`, `x-amz-grant-write-acp`, and
-    #     `x-amz-grant-full-control` headers. These parameters map to the
-    #     set of permissions that Amazon S3 supports in an ACL. For more
-    #     information, see [Access Control List (ACL) Overview][4].
-    #
-    #   You can use either a canned ACL or specify access permissions
-    #   explicitly. You cannot do both.
-    #
-    # Server-Side- Encryption-Specific Request Headers
-    #
-    # : You can optionally tell Amazon S3 to encrypt data at rest using
-    #   server-side encryption. Server-side encryption is for data
-    #   encryption at rest. Amazon S3 encrypts your data as it writes it to
-    #   disks in its data centers and decrypts it when you access it. The
-    #   option you use depends on whether you want to use AWS managed
-    #   encryption keys or provide your own encryption key.
-    #
-    #   * Use encryption keys managed by Amazon S3 or customer master keys
-    #     (CMKs) stored in AWS Key Management Service (AWS KMS) – If you
-    #     want AWS to manage the keys used to encrypt data, specify the
-    #     following headers in the request.
-    #
-    #     * x-amz-server-side​-encryption
-    #
-    #     * x-amz-server-side-encryption-aws-kms-key-id
-    #
-    #     * x-amz-server-side-encryption-context
-    #
-    #     <note markdown="1"> If you specify `x-amz-server-side-encryption:aws:kms`, but don't
-    #     provide `x-amz-server-side-encryption-aws-kms-key-id`, Amazon S3
-    #     uses the AWS managed CMK in AWS KMS to protect the data. If you
-    #     want to use a customer managed AWS KMS CMK, you must provide the
-    #     `x-amz-server-side-encryption-aws-kms-key-id` of the symmetric
-    #     customer managed CMK. Amazon S3 only supports symmetric CMKs and
-    #     not asymmetric CMKs. For more information, see [Using Symmetric
-    #     and Asymmetric Keys][5] in the *AWS Key Management Service
-    #     Developer Guide*.
-    #
-    #      </note>
-    #
-    #     All GET and PUT requests for an object protected by AWS KMS fail
-    #     if you don't make them with SSL or by using SigV4.
-    #
-    #     For more information about server-side encryption with CMKs stored
-    #     in AWS KMS (SSE-KMS), see [Protecting Data Using Server-Side
-    #     Encryption with CMKs stored in AWS][6].
-    #
-    #   * Use customer-provided encryption keys – If you want to manage your
-    #     own encryption keys, provide all the following headers in the
-    #     request.
-    #
-    #     * x-amz-server-side​-encryption​-customer-algorithm
-    #
-    #     * x-amz-server-side​-encryption​-customer-key
-    #
-    #     * x-amz-server-side​-encryption​-customer-key-MD5
-    #
-    #     For more information about server-side encryption with CMKs stored
-    #     in KMS (SSE-KMS), see [Protecting Data Using Server-Side
-    #     Encryption with CMKs stored in AWS][6].
-    #
-    # Access-Control-List (ACL)-Specific Request Headers
-    #
-    # : You also can use the following access control–related headers with
-    #   this operation. By default, all objects are private. Only the owner
-    #   has full access control. When adding a new object, you can grant
-    #   permissions to individual AWS accounts or to predefined groups
-    #   defined by Amazon S3. These permissions are then added to the Access
-    #   Control List (ACL) on the object. For more information, see [Using
-    #   ACLs][7]. With this operation, you can grant access permissions
-    #   using one of the following two methods:
-    #
-    #   * Specify a canned ACL (`x-amz-acl`) — Amazon S3 supports a set of
-    #     predefined ACLs, known as canned ACLs. Each canned ACL has a
-    #     predefined set of grantees and permissions. For more information,
-    #     see [Canned ACL][3].
-    #
-    #   * Specify access permissions explicitly — To explicitly grant access
-    #     permissions to specific AWS accounts or groups, use the following
-    #     headers. Each header maps to specific permissions that Amazon S3
-    #     supports in an ACL. For more information, see [Access Control List
-    #     (ACL) Overview][4]. In the header, you specify a list of grantees
-    #     who get the specific permission. To grant permissions explicitly
-    #     use:
-    #
-    #     * x-amz-grant-read
-    #
-    #     * x-amz-grant-write
-    #
-    #     * x-amz-grant-read-acp
-    #
-    #     * x-amz-grant-write-acp
-    #
-    #     * x-amz-grant-full-control
-    #
-    #     You specify each grantee as a type=value pair, where the type is
-    #     one of the following:
-    #
-    #     * `emailAddress` – if the value specified is the email address of
-    #       an AWS account
-    #
-    #       Using email addresses to specify a grantee is only supported in
-    #       the following AWS Regions:
-    #
-    #        * US East (N. Virginia)
-    #
-    #       * US West (N. California)
-    #
-    #       * US West (Oregon)
-    #
-    #       * Asia Pacific (Singapore)
-    #
-    #       * Asia Pacific (Sydney)
-    #
-    #       * Asia Pacific (Tokyo)
-    #
-    #       * EU (Ireland)
-    #
-    #       * South America (São Paulo)
-    #
-    #        For a list of all the Amazon S3 supported Regions and
-    #       endpoints,
-    #       see [Regions and Endpoints][8] in the AWS General Reference
-    #
-    #     * `id` – if the value specified is the canonical user ID of an AWS
-    #       account
-    #
-    #     * `uri` – if you are granting permissions to a predefined group
+    # **Access Control List (ACL)-Specific Request Headers**
     #
-    #     For example, the following `x-amz-grant-read` header grants the
-    #     AWS accounts identified by email addresses permissions to read
-    #     object data and its metadata:
-    #
-    #     `x-amz-grant-read: emailAddress="xyz@amazon.com",
-    #     emailAddress="abc@amazon.com" `
-    #
-    # Server-Side- Encryption-Specific Request Headers
-    #
-    # : You can optionally tell Amazon S3 to encrypt data at rest using
-    #   server-side encryption. Server-side encryption is for data
-    #   encryption at rest. Amazon S3 encrypts your data as it writes it to
-    #   disks in its data centers and decrypts it when you access it. The
-    #   option you use depends on whether you want to use AWS-managed
-    #   encryption keys or provide your own encryption key.
-    #
-    #   * Use encryption keys managed by Amazon S3 or customer master keys
-    #     (CMKs) stored in AWS Key Management Service (AWS KMS) – If you
-    #     want AWS to manage the keys used to encrypt data, specify the
-    #     following headers in the request.
-    #
-    #     * x-amz-server-side​-encryption
-    #
-    #     * x-amz-server-side-encryption-aws-kms-key-id
-    #
-    #     * x-amz-server-side-encryption-context
-    #
-    #     <note markdown="1"> If you specify `x-amz-server-side-encryption:aws:kms`, but don't
-    #     provide `x-amz-server-side-encryption-aws-kms-key-id`, Amazon S3
-    #     uses the AWS managed CMK in AWS KMS to protect the data. If you
-    #     want to use a customer managed AWS KMS CMK, you must provide the
-    #     `x-amz-server-side-encryption-aws-kms-key-id` of the symmetric
-    #     customer managed CMK. Amazon S3 only supports symmetric CMKs and
-    #     not asymmetric CMKs. For more information, see [Using Symmetric
-    #     and Asymmetric Keys][5] in the *AWS Key Management Service
-    #     Developer Guide*.
-    #
-    #      </note>
-    #
-    #     All GET and PUT requests for an object protected by AWS KMS fail
-    #     if you don't make them with SSL or by using SigV4.
-    #
-    #     For more information about server-side encryption with CMKs stored
-    #     in AWS KMS (SSE-KMS), see [Protecting Data Using Server-Side
-    #     Encryption with CMKs stored in AWS KMS][6].
-    #
-    #   * Use customer-provided encryption keys – If you want to manage your
-    #     own encryption keys, provide all the following headers in the
-    #     request.
-    #
-    #     <note markdown="1"> If you use this feature, the ETag value that Amazon S3 returns in
-    #     the response is not the MD5 of the object.
-    #
-    #      </note>
-    #
-    #     * x-amz-server-side​-encryption​-customer-algorithm
-    #
-    #     * x-amz-server-side​-encryption​-customer-key
-    #
-    #     * x-amz-server-side​-encryption​-customer-key-MD5
-    #
-    #     For more information about server-side encryption with CMKs stored
-    #     in AWS KMS (SSE-KMS), see [Protecting Data Using Server-Side
-    #     Encryption with CMKs stored in AWS KMS][6].
+    # You can use headers to grant ACL- based permissions. By default, all
+    # objects are private. Only the owner has full access control. When
+    # adding a new object, you can grant permissions to individual AWS
+    # accounts or to predefined groups defined by Amazon S3. These
+    # permissions are then added to the ACL on the object. For more
+    # information, see [Access Control List (ACL) Overview][3] and [Managing
+    # ACLs Using the REST API][4].
     #
     # **Storage Class Options**
     #
-    # By default, Amazon S3 uses the Standard storage class to store newly
-    # created objects. The Standard storage class provides high durability
-    # and high availability. You can specify other storage classes depending
-    # on the performance needs. For more information, see [Storage
-    # Classes][9] in the Amazon Simple Storage Service Developer Guide.
+    # By default, Amazon S3 uses the STANDARD storage class to store newly
+    # created objects. The STANDARD storage class provides high durability
+    # and high availability. Depending on performance needs, you can specify
+    # a different storage class. For more information, see [Storage
+    # Classes][5] in the *Amazon S3 Service Developer Guide*.
     #
     # **Versioning**
     #
     # If you enable versioning for a bucket, Amazon S3 automatically
     # generates a unique version ID for the object being stored. Amazon S3
-    # returns this ID in the response using the `x-amz-version-id response`
-    # header. If versioning is suspended, Amazon S3 always uses null as the
-    # version ID for the object stored. For more information about returning
-    # the versioning state of a bucket, see GetBucketVersioning. If you
-    # enable versioning for a bucket, when Amazon S3 receives multiple write
-    # requests for the same object simultaneously, it stores all of the
-    # objects.
+    # returns this ID in the response. When you enable versioning for a
+    # bucket, if Amazon S3 receives multiple write requests for the same
+    # object simultaneously, it stores all of the objects.
+    #
+    # For more information about versioning, see [Adding Objects to
+    # Versioning Enabled Buckets][6]. For information about returning the
+    # versioning state of a bucket, see GetBucketVersioning.
     #
     # **Related Resources**
     #
@@ -9312,15 +9143,12 @@ module Aws::S3
     #
     #
     #
-    # [1]: http://www.ietf.org/rfc/rfc2616.txt
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html
-    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
-    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
-    # [5]: https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html
-    # [6]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html
-    # [7]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html
-    # [8]: https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
-    # [9]: https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
+    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-using-rest-api.html
+    # [5]: https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html
+    # [6]: https://docs.aws.amazon.com/AmazonS3/latest/dev/AddingObjectstoVersioningEnabledBuckets.html
     #
     # @option params [String] :acl
     #   The canned ACL to apply to the object. For more information, see
@@ -9443,8 +9271,8 @@ module Aws::S3
     #   Amazon S3 (for example, AES256, aws:kms).
     #
     # @option params [String] :storage_class
-    #   If you don't specify, Standard is the default storage class. Amazon
-    #   S3 supports other storage classes.
+    #   If you don't specify, S3 Standard is the default storage class.
+    #   Amazon S3 supports other storage classes.
     #
     # @option params [String] :website_redirect_location
     #   If the bucket is configured as a website, redirects requests for this
@@ -9548,96 +9376,99 @@ module Aws::S3
     #   * {Types::PutObjectOutput#request_charged #request_charged} => String
     #
     #
-    # @example Example: To upload an object (specify optional headers)
+    # @example Example: To upload an object and specify server-side encryption and object tags
     #
-    #   # The following example uploads an object. The request specifies optional request headers to directs S3 to use specific
-    #   # storage class and use server-side encryption.
+    #   # The following example uploads and object. The request specifies the optional server-side encryption option. The request
+    #   # also specifies optional object tags. If the bucket is versioning enabled, S3 returns version ID in response.
     #
     #   resp = client.put_object({
-    #     body: "HappyFace.jpg", 
+    #     body: "filetoupload", 
     #     bucket: "examplebucket", 
-    #     key: "HappyFace.jpg", 
+    #     key: "exampleobject", 
     #     server_side_encryption: "AES256", 
-    #     storage_class: "STANDARD_IA", 
+    #     tagging: "key1=value1&key2=value2", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
     #     server_side_encryption: "AES256", 
-    #     version_id: "CG612hodqujkf8FaaNfp8U..FIhLROcp", 
+    #     version_id: "Ri.vC6qVlA4dEnjgRV4ZHsHoFIjqEMNt", 
     #   }
     #
-    # @example Example: To upload an object and specify optional tags
+    # @example Example: To create an object.
     #
-    #   # The following example uploads an object. The request specifies optional object tags. The bucket is versioned, therefore
-    #   # S3 returns version ID of the newly created object.
+    #   # The following example creates an object. If the bucket is versioning enabled, S3 returns version ID in response.
     #
     #   resp = client.put_object({
-    #     body: "c:\\HappyFace.jpg", 
+    #     body: "filetoupload", 
     #     bucket: "examplebucket", 
-    #     key: "HappyFace.jpg", 
-    #     tagging: "key1=value1&key2=value2", 
+    #     key: "objectkey", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "psM2sYY4.o1501dSx8wMvnkOzSBB.V4a", 
+    #     version_id: "Bvq0EDKxOcXLJXNo_Lkz37eM3R4pfzyQ", 
     #   }
     #
-    # @example Example: To upload object and specify user-defined metadata
+    # @example Example: To upload an object and specify optional tags
     #
-    #   # The following example creates an object. The request also specifies optional metadata. If the bucket is versioning
-    #   # enabled, S3 returns version ID in response.
+    #   # The following example uploads an object. The request specifies optional object tags. The bucket is versioned, therefore
+    #   # S3 returns version ID of the newly created object.
     #
     #   resp = client.put_object({
-    #     body: "filetoupload", 
+    #     body: "c:\\HappyFace.jpg", 
     #     bucket: "examplebucket", 
-    #     key: "exampleobject", 
-    #     metadata: {
-    #       "metadata1" => "value1", 
-    #       "metadata2" => "value2", 
-    #     }, 
+    #     key: "HappyFace.jpg", 
+    #     tagging: "key1=value1&key2=value2", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "pSKidl4pHBiNwukdbcPXAIs.sshFFOc0", 
+    #     version_id: "psM2sYY4.o1501dSx8wMvnkOzSBB.V4a", 
     #   }
     #
-    # @example Example: To create an object.
+    # @example Example: To upload an object (specify optional headers)
     #
-    #   # The following example creates an object. If the bucket is versioning enabled, S3 returns version ID in response.
+    #   # The following example uploads an object. The request specifies optional request headers to directs S3 to use specific
+    #   # storage class and use server-side encryption.
     #
     #   resp = client.put_object({
-    #     body: "filetoupload", 
+    #     body: "HappyFace.jpg", 
     #     bucket: "examplebucket", 
-    #     key: "objectkey", 
+    #     key: "HappyFace.jpg", 
+    #     server_side_encryption: "AES256", 
+    #     storage_class: "STANDARD_IA", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "Bvq0EDKxOcXLJXNo_Lkz37eM3R4pfzyQ", 
+    #     server_side_encryption: "AES256", 
+    #     version_id: "CG612hodqujkf8FaaNfp8U..FIhLROcp", 
     #   }
     #
-    # @example Example: To upload an object
+    # @example Example: To upload object and specify user-defined metadata
     #
-    #   # The following example uploads an object to a versioning-enabled bucket. The source file is specified using Windows file
-    #   # syntax. S3 returns VersionId of the newly created object.
+    #   # The following example creates an object. The request also specifies optional metadata. If the bucket is versioning
+    #   # enabled, S3 returns version ID in response.
     #
     #   resp = client.put_object({
-    #     body: "HappyFace.jpg", 
+    #     body: "filetoupload", 
     #     bucket: "examplebucket", 
-    #     key: "HappyFace.jpg", 
+    #     key: "exampleobject", 
+    #     metadata: {
+    #       "metadata1" => "value1", 
+    #       "metadata2" => "value2", 
+    #     }, 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "tpf3zF08nBplQK1XLOefGskR7mGDwcDk", 
+    #     version_id: "pSKidl4pHBiNwukdbcPXAIs.sshFFOc0", 
     #   }
     #
     # @example Example: To upload an object and specify canned ACL.
@@ -9658,24 +9489,21 @@ module Aws::S3
     #     version_id: "Kirh.unyZwjQ69YxcQLA8z4F5j3kJJKr", 
     #   }
     #
-    # @example Example: To upload an object and specify server-side encryption and object tags
+    # @example Example: To upload an object
     #
-    #   # The following example uploads and object. The request specifies the optional server-side encryption option. The request
-    #   # also specifies optional object tags. If the bucket is versioning enabled, S3 returns version ID in response.
+    #   # The following example uploads an object to a versioning-enabled bucket. The source file is specified using Windows file
+    #   # syntax. S3 returns VersionId of the newly created object.
     #
     #   resp = client.put_object({
-    #     body: "filetoupload", 
+    #     body: "HappyFace.jpg", 
     #     bucket: "examplebucket", 
-    #     key: "exampleobject", 
-    #     server_side_encryption: "AES256", 
-    #     tagging: "key1=value1&key2=value2", 
+    #     key: "HappyFace.jpg", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     server_side_encryption: "AES256", 
-    #     version_id: "Ri.vC6qVlA4dEnjgRV4ZHsHoFIjqEMNt", 
+    #     version_id: "tpf3zF08nBplQK1XLOefGskR7mGDwcDk", 
     #   }
     #
     # @example Streaming a file from disk
@@ -9749,7 +9577,9 @@ module Aws::S3
     # Depending on your application needs, you can choose to set the ACL on
     # an object using either the request body or the headers. For example,
     # if you have an existing application that updates a bucket ACL using
-    # the request body, you can continue to use that approach.
+    # the request body, you can continue to use that approach. For more
+    # information, see [Access Control List (ACL) Overview][1] in the
+    # *Amazon S3 Developer Guide*.
     #
     # **Access Permissions**
     #
@@ -9760,7 +9590,7 @@ module Aws::S3
     #   ACL has a predefined set of grantees and permissions. Specify the
     #   canned ACL name as the value of `x-amz-ac`l. If you use this header,
     #   you cannot use other access control-specific headers in your
-    #   request. For more information, see [Canned ACL][1].
+    #   request. For more information, see [Canned ACL][2].
     #
     # * Specify access permissions explicitly with the `x-amz-grant-read`,
     #   `x-amz-grant-read-acp`, `x-amz-grant-write-acp`, and
@@ -9770,19 +9600,43 @@ module Aws::S3
     #   ACL-specific headers, you cannot use `x-amz-acl` header to set a
     #   canned ACL. These parameters map to the set of permissions that
     #   Amazon S3 supports in an ACL. For more information, see [Access
-    #   Control List (ACL) Overview][2].
+    #   Control List (ACL) Overview][1].
     #
     #   You specify each grantee as a type=value pair, where the type is one
     #   of the following:
     #
-    #   * `emailAddress` – if the value specified is the email address of an
-    #     AWS account
-    #
     #   * `id` – if the value specified is the canonical user ID of an AWS
     #     account
     #
     #   * `uri` – if you are granting permissions to a predefined group
     #
+    #   * `emailAddress` – if the value specified is the email address of an
+    #     AWS account
+    #
+    #     <note markdown="1"> Using email addresses to specify a grantee is only supported in
+    #     the following AWS Regions:
+    #
+    #      * US East (N. Virginia)
+    #
+    #     * US West (N. California)
+    #
+    #     * US West (Oregon)
+    #
+    #     * Asia Pacific (Singapore)
+    #
+    #     * Asia Pacific (Sydney)
+    #
+    #     * Asia Pacific (Tokyo)
+    #
+    #     * Europe (Ireland)
+    #
+    #     * South America (São Paulo)
+    #
+    #      For a list of all the Amazon S3 supported Regions and endpoints,
+    #     see [Regions and Endpoints][3] in the AWS General Reference.
+    #
+    #      </note>
+    #
     #   For example, the following `x-amz-grant-read` header grants list
     #   objects permission to the two AWS accounts identified by their email
     #   addresses.
@@ -9798,14 +9652,6 @@ module Aws::S3
     # You can specify the person (grantee) to whom you're assigning access
     # rights (using request elements) in the following ways:
     #
-    # * By Email address:
-    #
-    #   `<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    #   xsi:type="AmazonCustomerByEmail"><EmailAddress><>Grantees@email.com<></EmailAddress>lt;/Grantee>`
-    #
-    #   The grantee is resolved to the CanonicalUser and, in a response to a
-    #   GET Object acl request, appears as the CanonicalUser.
-    #
     # * By the person's ID:
     #
     #   `<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -9819,6 +9665,38 @@ module Aws::S3
     #   `<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     #   xsi:type="Group"><URI><>http://acs.amazonaws.com/groups/global/AuthenticatedUsers<></URI></Grantee>`
     #
+    # * By Email address:
+    #
+    #   `<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    #   xsi:type="AmazonCustomerByEmail"><EmailAddress><>Grantees@email.com<></EmailAddress>lt;/Grantee>`
+    #
+    #   The grantee is resolved to the CanonicalUser and, in a response to a
+    #   GET Object acl request, appears as the CanonicalUser.
+    #
+    #   <note markdown="1"> Using email addresses to specify a grantee is only supported in the
+    #   following AWS Regions:
+    #
+    #    * US East (N. Virginia)
+    #
+    #   * US West (N. California)
+    #
+    #   * US West (Oregon)
+    #
+    #   * Asia Pacific (Singapore)
+    #
+    #   * Asia Pacific (Sydney)
+    #
+    #   * Asia Pacific (Tokyo)
+    #
+    #   * Europe (Ireland)
+    #
+    #   * South America (São Paulo)
+    #
+    #    For a list of all the Amazon S3 supported Regions and endpoints, see
+    #   [Regions and Endpoints][3] in the AWS General Reference.
+    #
+    #    </note>
+    #
     # **Versioning**
     #
     # The ACL of an object is set at the object version level. By default,
@@ -9833,8 +9711,9 @@ module Aws::S3
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
-    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
+    # [3]: https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     #
     # @option params [String] :acl
     #   The canned ACL to apply to the object. For more information, see
@@ -10229,7 +10108,8 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # Sets the supplied tag-set to an object that already exists in a bucket
+    # Sets the supplied tag-set to an object that already exists in a
+    # bucket.
     #
     # A tag is a key-value pair. You can associate tags with an object by
     # sending a PUT request against the tagging subresource that is
@@ -10458,12 +10338,11 @@ module Aws::S3
     # * `restore an archive` - Restore an archived object
     #
     # To use this operation, you must have permissions to perform the
-    # `s3:RestoreObject` and `s3:GetObject` actions. The bucket owner has
-    # this permission by default and can grant this permission to others.
-    # For more information about permissions, see [Permissions Related to
-    # Bucket Subresource Operations][1] and [Managing Access Permissions to
-    # Your Amazon S3 Resources][2] in the *Amazon Simple Storage Service
-    # Developer Guide*.
+    # `s3:RestoreObject` action. The bucket owner has this permission by
+    # default and can grant this permission to others. For more information
+    # about permissions, see [Permissions Related to Bucket Subresource
+    # Operations][1] and [Managing Access Permissions to Your Amazon S3
+    # Resources][2] in the *Amazon Simple Storage Service Developer Guide*.
     #
     # **Querying Archives with Select Requests**
     #
@@ -10519,9 +10398,9 @@ module Aws::S3
     #
     #     `SELECT s.Id, s.FirstName, s.SSN FROM S3Object s`
     #
-    # For more information about using SQL with Glacier Select restore, see
-    # [SQL Reference for Amazon S3 Select and Glacier Select][6] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # For more information about using SQL with S3 Glacier Select restore,
+    # see [SQL Reference for Amazon S3 Select and S3 Glacier Select][6] in
+    # the *Amazon Simple Storage Service Developer Guide*.
     #
     # When making a select request, you can also do the following:
     #
@@ -10578,10 +10457,10 @@ module Aws::S3
     #   retrievals and provisioned capacity are not available for the
     #   DEEP\_ARCHIVE storage class.
     #
-    # * <b> <code>Standard</code> </b> - Standard retrievals allow you to
+    # * <b> <code>Standard</code> </b> - S3 Standard retrievals allow you to
     #   access any of your archived objects within several hours. This is
     #   the default option for the GLACIER and DEEP\_ARCHIVE retrieval
-    #   requests that do not specify the retrieval option. Standard
+    #   requests that do not specify the retrieval option. S3 Standard
     #   retrievals typically complete within 3-5 hours from the GLACIER
     #   storage class and typically complete within 12 hours from the
     #   DEEP\_ARCHIVE storage class.
@@ -10659,10 +10538,11 @@ module Aws::S3
     #
     #   * *Code: GlacierExpeditedRetrievalNotAvailable*
     #
-    #   * *Cause: Glacier expedited retrievals are currently not available.
-    #     Try again later. (Returned if there is insufficient capacity to
-    #     process the Expedited request. This error applies only to
-    #     Expedited retrievals and not to Standard or Bulk retrievals.)*
+    #   * *Cause: S3 Glacier expedited retrievals are currently not
+    #     available. Try again later. (Returned if there is insufficient
+    #     capacity to process the Expedited request. This error applies only
+    #     to Expedited retrievals and not to S3 Standard or Bulk
+    #     retrievals.)*
     #
     #   * *HTTP Status Code: 503*
     #
@@ -10674,8 +10554,8 @@ module Aws::S3
     #
     # * GetBucketNotificationConfiguration
     #
-    # * [SQL Reference for Amazon S3 Select and Glacier Select ][6] in the
-    #   *Amazon Simple Storage Service Developer Guide*
+    # * [SQL Reference for Amazon S3 Select and S3 Glacier Select ][6] in
+    #   the *Amazon Simple Storage Service Developer Guide*
     #
     #
     #
@@ -10867,8 +10747,8 @@ module Aws::S3
     # Guide*.
     #
     # For more information about using SQL with Amazon S3 Select, see [ SQL
-    # Reference for Amazon S3 Select and Glacier Select][2] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # Reference for Amazon S3 Select and S3 Glacier Select][2] in the
+    # *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -10929,10 +10809,10 @@ module Aws::S3
     # The `SelectObjectContent` operation does not support the following
     # `GetObject` functionality. For more information, see GetObject.
     #
-    # * `Range`\: While you can specify a scan range for a Amazon S3 Select
-    #   request, see SelectObjectContentRequest$ScanRange in the request
-    #   parameters below, you cannot specify the range of bytes of an object
-    #   to return.
+    # * `Range`\: Although you can specify a scan range for an Amazon S3
+    #   Select request (see SelectObjectContentRequest$ScanRange in the
+    #   request parameters), you cannot specify the range of bytes of an
+    #   object to return.
     #
     # * GLACIER, DEEP\_ARCHIVE and REDUCED\_REDUNDANCY storage classes: You
     #   cannot specify the GLACIER, DEEP\_ARCHIVE, or `REDUCED_REDUNDANCY`
@@ -10944,9 +10824,8 @@ module Aws::S3
     #
     # **Special Errors**
     #
-    # For a list of special errors for this operation and for general
-    # information about Amazon S3 errors and a list of error codes, see
-    # ErrorResponses
+    # For a list of special errors for this operation, see
+    # SelectObjectContentErrorCodeList
     #
     # **Related Resources**
     #
@@ -11692,45 +11571,45 @@ module Aws::S3
     #   * {Types::UploadPartCopyOutput#request_charged #request_charged} => String
     #
     #
-    # @example Example: To upload a part by copying byte range from an existing object as data source
+    # @example Example: To upload a part by copying data from an existing object as data source
     #
-    #   # The following example uploads a part of a multipart upload by copying a specified byte range from an existing object as
-    #   # data source.
+    #   # The following example uploads a part of a multipart upload by copying data from an existing object as data source.
     #
     #   resp = client.upload_part_copy({
     #     bucket: "examplebucket", 
     #     copy_source: "/bucketname/sourceobjectkey", 
-    #     copy_source_range: "bytes=1-100000", 
     #     key: "examplelargeobject", 
-    #     part_number: 2, 
+    #     part_number: 1, 
     #     upload_id: "exampleuoh_10OhKhT7YukE9bjzTPRiuaCotmZM_pFngJFir9OZNrSr5cWa3cq3LZSUsfjI4FI7PkP91We7Nrw--", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     copy_part_result: {
-    #       etag: "\"65d16d19e65a7508a51f043180edcc36\"", 
-    #       last_modified: Time.parse("2016-12-29T21:44:28.000Z"), 
+    #       etag: "\"b0c6f0e7e054ab8fa2536a2677f8734d\"", 
+    #       last_modified: Time.parse("2016-12-29T21:24:43.000Z"), 
     #     }, 
     #   }
     #
-    # @example Example: To upload a part by copying data from an existing object as data source
+    # @example Example: To upload a part by copying byte range from an existing object as data source
     #
-    #   # The following example uploads a part of a multipart upload by copying data from an existing object as data source.
+    #   # The following example uploads a part of a multipart upload by copying a specified byte range from an existing object as
+    #   # data source.
     #
     #   resp = client.upload_part_copy({
     #     bucket: "examplebucket", 
     #     copy_source: "/bucketname/sourceobjectkey", 
+    #     copy_source_range: "bytes=1-100000", 
     #     key: "examplelargeobject", 
-    #     part_number: 1, 
+    #     part_number: 2, 
     #     upload_id: "exampleuoh_10OhKhT7YukE9bjzTPRiuaCotmZM_pFngJFir9OZNrSr5cWa3cq3LZSUsfjI4FI7PkP91We7Nrw--", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     copy_part_result: {
-    #       etag: "\"b0c6f0e7e054ab8fa2536a2677f8734d\"", 
-    #       last_modified: Time.parse("2016-12-29T21:24:43.000Z"), 
+    #       etag: "\"65d16d19e65a7508a51f043180edcc36\"", 
+    #       last_modified: Time.parse("2016-12-29T21:44:28.000Z"), 
     #     }, 
     #   }
     #
@@ -11789,7 +11668,7 @@ module Aws::S3
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.64.0'
+      context[:gem_version] = '1.68.1'
       Seahorse::Client::Request.new(handlers, context)
     end