aws-sdk-s3 1.87.0 → 1.90.0

data/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/VERSION

@@ -0,0 +1 @@
+1.90.0

data/lib/aws-sdk-s3.rb

@@ -69,6 +69,6 @@ require_relative 'aws-sdk-s3/event_streams'
 # @!group service
 module Aws::S3
 
-  GEM_VERSION = '1.87.0'
+  GEM_VERSION = '1.90.0'
 
 end

data/lib/aws-sdk-s3/arn/access_point_arn.rb

@@ -52,10 +52,14 @@ module Aws
         end
       end
 
-      def host_url(region, dualstack = false)
-        sfx = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
-        "#{@access_point_name}-#{@account_id}"\
-        ".s3-accesspoint#{'.dualstack' if dualstack}.#{region}.#{sfx}"
+      def host_url(region, dualstack = false, custom_endpoint = nil)
+        pfx = "#{@access_point_name}-#{@account_id}"
+        if custom_endpoint
+          "#{pfx}.#{custom_endpoint}"
+        else
+          sfx = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
+          "#{pfx}.s3-accesspoint#{'.dualstack' if dualstack}.#{region}.#{sfx}"
+        end
       end
     end
   end

data/lib/aws-sdk-s3/arn/outpost_access_point_arn.rb

@@ -62,9 +62,13 @@ module Aws
       end
 
       # Outpost ARNs currently do not support dualstack
-      def host_url(region, _dualstack = false)
-        "#{@access_point_name}-#{@account_id}.#{@outpost_id}"\
-        ".s3-outposts.#{region}.amazonaws.com"
+      def host_url(region, _dualstack = false, custom_endpoint = nil)
+        pfx = "#{@access_point_name}-#{@account_id}.#{@outpost_id}"
+        if custom_endpoint
+          "#{pfx}.#{custom_endpoint}"
+        else
+          "#{pfx}.s3-outposts.#{region}.amazonaws.com"
+        end
       end
     end
   end

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

@@ -456,7 +456,7 @@ module Aws::S3
     #
     #   This action is not supported by Amazon S3 on Outposts.
     # @option options [required, String] :key
-    #   Object key for which the PUT operation was initiated.
+    #   Object key for which the PUT action was initiated.
     # @option options [Hash<String,String>] :metadata
     #   A map of metadata to store with the object in S3.
     # @option options [String] :server_side_encryption
@@ -533,8 +533,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a PUT operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a PUT action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that they will be charged for the
     #   request. Bucket owners need not specify this parameter in their

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

@@ -213,7 +213,7 @@ module Aws::S3
     # @option options [required, Types::CORSConfiguration] :cors_configuration
     #   Describes the cross-origin access configuration for objects in an
     #   Amazon S3 bucket. For more information, see [Enabling Cross-Origin
-    #   Resource Sharing][1] in the *Amazon Simple Storage Service Developer
+    #   Resource Sharing][1] in the *Amazon Simple Storage Service User
     #   Guide*.
     #
     #

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

@@ -185,10 +185,9 @@ module Aws::S3
     #   })
     # @param [Hash] options ({})
     # @option options [String] :content_md5
-    #   >The base64-encoded 128-bit MD5 digest of the data. You must use
-    #   this header as a message integrity check to verify that the request
-    #   body was not corrupted in transit. For more information, see [RFC
-    #   1864][1].
+    #   The base64-encoded 128-bit MD5 digest of the data. You must use this
+    #   header as a message integrity check to verify that the request body
+    #   was not corrupted in transit. For more information, see [RFC 1864][1].
     #
     #   For requests made using the AWS Command Line Interface (CLI) or AWS
     #   SDKs, this field is calculated automatically.

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

@@ -408,7 +408,7 @@ module Aws::S3
 
     # @!group API Operations
 
-    # This operation aborts a multipart upload. After a multipart upload is
+    # This action aborts a multipart upload. After a multipart upload is
     # aborted, no additional parts can be uploaded using that upload ID. The
     # storage consumed by any previously uploaded parts will be freed.
     # However, if any part uploads are currently in progress, those part
@@ -417,11 +417,11 @@ module Aws::S3
     # completely free all storage consumed by all parts.
     #
     # To verify that all parts have been removed, so you don't get charged
-    # for the part storage, you should call the [ListParts][1] operation and
+    # for the part storage, you should call the [ListParts][1] action and
     # ensure that the parts list is empty.
     #
-    # For information about permissions required to use the multipart upload
-    # API, see [Multipart Upload API and Permissions][2].
+    # For information about permissions required to use the multipart
+    # upload, see [Multipart Upload and Permissions][2].
     #
     # The following operations are related to `AbortMultipartUpload`\:
     #
@@ -447,22 +447,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name to which the upload was taking place.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -537,11 +537,11 @@ module Aws::S3
     #
     # You first initiate the multipart upload and then upload all parts
     # using the [UploadPart][1] operation. After successfully uploading all
-    # relevant parts of an upload, you call this operation to complete the
+    # relevant parts of an upload, you call this action to complete the
     # upload. Upon receiving this request, Amazon S3 concatenates all the
     # parts in ascending order by part number to create a new object. In the
     # Complete Multipart Upload request, you must provide the parts list.
-    # You must ensure that the parts list is complete. This operation
+    # You must ensure that the parts list is complete. This action
     # concatenates the parts that you provide in the list. For each part in
     # the list, you must provide the part number and the `ETag` value,
     # returned after that part was uploaded.
@@ -563,7 +563,7 @@ module Aws::S3
     # Using Multipart Upload][3].
     #
     # For information about permissions required to use the multipart upload
-    # API, see [Multipart Upload API and Permissions][4].
+    # API, see [Multipart Upload and Permissions][4].
     #
     # `CompleteMultipartUpload` has the following special errors:
     #
@@ -737,8 +737,8 @@ 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, to copy an object greater than 5
-    # GB, you must use the multipart upload Upload Part - Copy API. For more
+    # action 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>
@@ -752,12 +752,11 @@ module Aws::S3
     #
     # 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
-    # error. If the error occurs during the copy operation, the error
-    # response is embedded in the `200 OK` response. This means that a `200
-    # OK` response can contain either a success or an error. Design your
-    # application to parse the contents of the response and handle it
-    # appropriately.
+    # before the copy action starts, you receive a standard Amazon S3 error.
+    # If the error occurs during the copy operation, the error response is
+    # embedded in the `200 OK` response. This means that a `200 OK` response
+    # can contain either a success or an error. Design your application to
+    # parse the contents of the response and handle it appropriately.
     #
     # If the copy is successful, you receive a response with information
     # about the copied object.
@@ -845,7 +844,7 @@ module Aws::S3
     #
     # If a target object uses SSE-KMS, you can enable an S3 Bucket Key for
     # the object. For more information, see [Amazon S3 Bucket Keys][9] in
-    # the *Amazon Simple Storage Service Developer Guide*.
+    # the *Amazon Simple Storage Service User Guide*.
     #
     # **Access Control List (ACL)-Specific Request Headers**
     #
@@ -859,8 +858,8 @@ module Aws::S3
     #
     # **Storage Class Options**
     #
-    # You can use the `CopyObject` operation to change the storage class of
-    # an object that is already stored in Amazon S3 using the `StorageClass`
+    # You can use the `CopyObject` action 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][12] in the
     # *Amazon S3 Service Developer Guide*.
     #
@@ -896,7 +895,7 @@ module Aws::S3
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/CopyingObjctsUsingRESTMPUapi.html
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
-    # [3]: https://aws.amazon.com/s3/pricing/
+    # [3]: http://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
@@ -919,22 +918,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The name of the destination bucket.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -1116,8 +1115,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a COPY operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a COPY action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     #
     # @option params [String] :copy_source_sse_customer_algorithm
     #   Specifies the algorithm to use when decrypting the source object (for
@@ -1476,7 +1475,7 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This operation initiates a multipart upload and returns an upload ID.
+    # This action initiates a multipart upload and returns an upload ID.
     # This upload ID is used to associate all of the parts in the specific
     # multipart upload. You specify this upload ID in each of your
     # subsequent upload part requests (see [UploadPart][1]). You also
@@ -1489,12 +1488,12 @@ module Aws::S3
     # If you have configured a lifecycle rule to abort incomplete multipart
     # uploads, the upload must complete within the number of days specified
     # in the bucket lifecycle configuration. Otherwise, the incomplete
-    # multipart upload becomes eligible for an abort operation and Amazon S3
+    # multipart upload becomes eligible for an abort action and Amazon S3
     # aborts the multipart upload. For more information, see [Aborting
     # Incomplete Multipart Uploads Using a Bucket Lifecycle Policy][3].
     #
     # For information about the permissions required to use the multipart
-    # upload API, see [Multipart Upload API and Permissions][4].
+    # upload API, see [Multipart Upload and Permissions][4].
     #
     # For request signing, multipart upload is just a series of regular
     # requests. You initiate a multipart upload, send one or more requests
@@ -1517,9 +1516,9 @@ module Aws::S3
     # your own encryption key, or use AWS Key Management Service (AWS KMS)
     # customer master keys (CMKs) or Amazon S3-managed encryption keys. If
     # you choose to provide your own encryption key, the request headers you
-    # provide in [UploadPart](AmazonS3/latest/API/API_UploadPart.html) and
-    # [UploadPartCopy][6] requests must match the headers you used in the
-    # request to initiate the upload by using `CreateMultipartUpload`.
+    # provide in [UploadPart][1] and [UploadPartCopy][6] requests must match
+    # the headers you used in the request to initiate the upload by using
+    # `CreateMultipartUpload`.
     #
     # To perform a multipart upload with encryption using an AWS KMS CMK,
     # the requester must have permission to the `kms:Encrypt`,
@@ -1717,22 +1716,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The name of the bucket to which to initiate the upload
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -1833,7 +1832,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/http:/docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
     #
     # @option params [String] :ssekms_encryption_context
     #   Specifies the AWS KMS Encryption Context to use for object encryption.
@@ -1846,7 +1845,7 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with an object operation doesn’t affect
+    #   Specifying this header with an object action doesn’t affect
     #   bucket-level settings for S3 Bucket Key.
     #
     # @option params [String] :request_payer
@@ -2091,7 +2090,7 @@ module Aws::S3
     # default and can grant this permission to others.
     #
     # For information about `cors`, see [Enabling Cross-Origin Resource
-    # Sharing][1] in the *Amazon Simple Storage Service Developer Guide*.
+    # Sharing][1] in the *Amazon Simple Storage Service User Guide*.
     #
     # **Related Resources:**
     #
@@ -2140,10 +2139,10 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This implementation of the DELETE operation removes default encryption
+    # This implementation of the DELETE action removes default encryption
     # from the bucket. For information about the Amazon S3 default
     # encryption feature, see [Amazon S3 Default Bucket Encryption][1] in
-    # the *Amazon Simple Storage Service Developer Guide*.
+    # the *Amazon Simple Storage Service User Guide*.
     #
     # To use this operation, you must have permissions to perform the
     # `s3:PutEncryptionConfiguration` action. The bucket owner has this
@@ -2151,7 +2150,7 @@ module Aws::S3
     # others. For more information about permissions, see [Permissions
     # Related to Bucket Subresource Operations][2] and [Managing Access
     # Permissions to your Amazon S3 Resources][3] in the *Amazon Simple
-    # Storage Service Developer Guide*.
+    # Storage Service User Guide*.
     #
     # **Related Resources**
     #
@@ -2491,12 +2490,12 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This implementation of the DELETE operation uses the policy
-    # subresource to delete the policy of a specified bucket. If you are
-    # using an identity other than the root user of the AWS account that
-    # owns the bucket, the calling identity must have the
-    # `DeleteBucketPolicy` permissions on the specified bucket and belong to
-    # the bucket owner's account to use this operation.
+    # This implementation of the DELETE action uses the policy subresource
+    # to delete the policy of a specified bucket. If you are using an
+    # identity other than the root user of the AWS account that owns the
+    # bucket, the calling identity must have the `DeleteBucketPolicy`
+    # permissions on the specified bucket and belong to the bucket owner's
+    # account to use this operation.
     #
     # If you don't have `DeleteBucketPolicy` permissions, Amazon S3 returns
     # a `403 Access Denied` error. If you have the correct permissions, but
@@ -2508,19 +2507,19 @@ module Aws::S3
     # denies the root user the ability to perform this action.
     #
     # For more information about bucket policies, see [Using Bucket Policies
-    # and UserPolicies](
-    # https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html).
+    # and UserPolicies][1].
     #
     # The following operations are related to `DeleteBucketPolicy`
     #
-    # * [CreateBucket][1]
+    # * [CreateBucket][2]
     #
-    # * [DeleteObject][2]
+    # * [DeleteObject][3]
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html
-    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html
     #
     # @option params [required, String] :bucket
     #   The bucket name.
@@ -2571,22 +2570,22 @@ module Aws::S3
     #
     #  </note>
     #
-    # For information about replication configuration, see [Replication](
-    # https://docs.aws.amazon.com/AmazonS3/latest/dev/replication.html) in
-    # the *Amazon S3 Developer Guide*.
+    # For information about replication configuration, see [Replication][3]
+    # in the *Amazon S3 Developer Guide*.
     #
     # The following operations are related to `DeleteBucketReplication`\:
     #
-    # * [PutBucketReplication][3]
+    # * [PutBucketReplication][4]
     #
-    # * [GetBucketReplication][4]
+    # * [GetBucketReplication][5]
     #
     #
     #
     # [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/API/API_PutBucketReplication.html
-    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketReplication.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/replication.html
+    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketReplication.html
+    # [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketReplication.html
     #
     # @option params [required, String] :bucket
     #   The bucket name.
@@ -2675,18 +2674,18 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This operation removes the website configuration for a bucket. Amazon
-    # S3 returns a `200 OK` response upon successfully deleting a website
+    # This action removes the website configuration for a bucket. Amazon S3
+    # returns a `200 OK` response upon successfully deleting a website
     # configuration on the specified bucket. You will get a `200 OK`
     # response if the website configuration you are trying to delete does
     # not exist on the bucket. Amazon S3 returns a `404` response if the
     # bucket specified in the request does not exist.
     #
-    # This DELETE operation requires the `S3:DeleteBucketWebsite`
-    # permission. By default, only the bucket owner can delete the website
-    # configuration attached to a bucket. However, bucket owners can grant
-    # other users permission to delete the website configuration by writing
-    # a bucket policy granting them the `S3:DeleteBucketWebsite` permission.
+    # This DELETE action requires the `S3:DeleteBucketWebsite` permission.
+    # By default, only the bucket owner can delete the website configuration
+    # attached to a bucket. However, bucket owners can grant other users
+    # permission to delete the website configuration by writing a bucket
+    # policy granting them the `S3:DeleteBucketWebsite` permission.
     #
     # For more information about hosting websites, see [Hosting Websites on
     # Amazon S3][1].
@@ -2757,14 +2756,14 @@ module Aws::S3
     # For more information about MFA Delete, see [Using MFA Delete][1]. To
     # see sample requests that use versioning, see [Sample Request][2].
     #
-    # You can delete objects by explicitly calling the DELETE Object API or
+    # You can delete objects by explicitly calling DELETE Object or
     # configure its lifecycle ([PutBucketLifecycle][3]) to enable Amazon S3
     # to remove them for you. If you want to block users or accounts from
     # removing or deleting objects from your bucket, you must deny them the
     # `s3:DeleteObject`, `s3:DeleteObjectVersion`, and
     # `s3:PutLifeCycleConfiguration` actions.
     #
-    # The following operation is related to `DeleteObject`\:
+    # The following action is related to `DeleteObject`\:
     #
     # * [PutObject][4]
     #
@@ -2780,22 +2779,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name of the bucket containing the object.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -2841,6 +2840,15 @@ 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.
@@ -2854,15 +2862,6 @@ 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({
@@ -2916,22 +2915,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name containing the objects from which to remove the tags.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -2939,7 +2938,8 @@ module Aws::S3
     #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
     #
     # @option params [required, String] :key
-    #   Name of the object key.
+    #   The key that identifies the object in the bucket from which to remove
+    #   all tags.
     #
     # @option params [String] :version_id
     #   The versionId of the object that the tag-set will be removed from.
@@ -3007,27 +3007,27 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This operation enables you to delete multiple objects from a bucket
-    # using a single HTTP request. If you know the object keys that you want
-    # to delete, then this operation provides a suitable alternative to
-    # sending individual delete requests, reducing per-request overhead.
+    # This action enables you to delete multiple objects from a bucket using
+    # a single HTTP request. If you know the object keys that you want to
+    # delete, then this action provides a suitable alternative to sending
+    # individual delete requests, reducing per-request overhead.
     #
     # The request contains a list of up to 1000 keys that you want to
     # delete. In the XML, you provide the object key names, and optionally,
     # version IDs if you want to delete a specific version of the object
     # from a versioning-enabled bucket. For each key, Amazon S3 performs a
-    # delete operation and returns the result of that delete, success, or
+    # delete action and returns the result of that delete, success, or
     # failure, in the response. Note that if the object specified in the
     # request is not found, Amazon S3 returns the result as deleted.
     #
-    # The operation supports two modes for the response: verbose and quiet.
-    # By default, the operation uses verbose mode in which the response
-    # includes the result of deletion of each key in your request. In quiet
-    # mode the response includes only keys where the delete operation
-    # encountered an error. For a successful deletion, the operation does
-    # not return any information about the delete in the response body.
+    # The action supports two modes for the response: verbose and quiet. By
+    # default, the action uses verbose mode in which the response includes
+    # the result of deletion of each key in your request. In quiet mode the
+    # response includes only keys where the delete action encountered an
+    # error. For a successful deletion, the action does not return any
+    # information about the delete in the response body.
     #
-    # When performing this operation on an MFA Delete enabled bucket, that
+    # When performing this action on an MFA Delete enabled bucket, that
     # attempts to delete any versioned objects, you must include an MFA
     # token. If you do not provide one, the entire request will fail, even
     # if there are non-versioned objects you are trying to delete. If you
@@ -3063,22 +3063,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name containing the objects to delete.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -3289,7 +3289,7 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This implementation of the GET operation uses the `accelerate`
+    # This implementation of the GET action uses the `accelerate`
     # subresource to return the Transfer Acceleration state of a bucket,
     # which is either `Enabled` or `Suspended`. Amazon S3 Transfer
     # Acceleration is a bucket-level feature that enables you to perform
@@ -3301,7 +3301,7 @@ module Aws::S3
     # 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*.
+    # Storage Service User Guide*.
     #
     # You set the Transfer Acceleration state of an existing bucket to
     # `Enabled` or `Suspended` by using the
@@ -3312,7 +3312,7 @@ module Aws::S3
     # Acceleration state if a state has never been set on the bucket.
     #
     # For more information about transfer acceleration, see [Transfer
-    # Acceleration][4] in the Amazon Simple Storage Service Developer Guide.
+    # Acceleration][4] in the Amazon Simple Storage Service User Guide.
     #
     # **Related Resources**
     #
@@ -3360,8 +3360,8 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This implementation of the `GET` operation uses the `acl` subresource
-    # to return the access control list (ACL) of a bucket. To use `GET` to
+    # This implementation of the `GET` action uses the `acl` subresource to
+    # return the access control list (ACL) of a bucket. To use `GET` to
     # return the ACL of the bucket, you must have `READ_ACP` access to the
     # bucket. If `READ_ACP` permission is granted to the anonymous user, you
     # can return the ACL of the bucket without using an authorization
@@ -3418,7 +3418,7 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This implementation of the GET operation returns an analytics
+    # This implementation of the GET action returns an analytics
     # configuration (identified by the analytics configuration ID) from the
     # bucket.
     #
@@ -3428,11 +3428,11 @@ module Aws::S3
     # 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*.
+    # Storage Service User Guide*.
     #
     # For information about Amazon S3 analytics feature, see [Amazon S3
     # Analytics – Storage Class Analysis][3] in the *Amazon Simple Storage
-    # Service Developer Guide*.
+    # Service User Guide*.
     #
     # **Related Resources**
     #
@@ -3590,6 +3590,10 @@ module Aws::S3
     end
 
     # Returns the default encryption configuration for an Amazon S3 bucket.
+    # If the bucket does not have a default encryption configuration,
+    # GetBucketEncryption returns
+    # `ServerSideEncryptionConfigurationNotFoundError`.
+    #
     # For information about the Amazon S3 default encryption feature, see
     # [Amazon S3 Default Bucket Encryption][1].
     #
@@ -3926,7 +3930,7 @@ module Aws::S3
     # API. The response describes the new filter element that you can use to
     # specify a filter to select a subset of objects to which the rule
     # applies. If you are using a previous version of the lifecycle
-    # configuration, it still works. For the earlier API description, see
+    # configuration, it still works. For the earlier action, see
     # [GetBucketLifecycle][1].
     #
     #  </note>
@@ -4362,8 +4366,8 @@ module Aws::S3
 
     # Returns the notification configuration of a bucket.
     #
-    # If notifications are not enabled on the bucket, the operation returns
-    # an empty `NotificationConfiguration` element.
+    # If notifications are not enabled on the bucket, the action returns an
+    # empty `NotificationConfiguration` element.
     #
     # By default, you must be the bucket owner to read the notification
     # configuration of a bucket. However, the bucket owner can use a bucket
@@ -4375,7 +4379,7 @@ module Aws::S3
     # Events][1]. For more information about bucket policies, see [Using
     # Bucket Policies][2].
     #
-    # The following operation is related to `GetBucketNotification`\:
+    # The following action is related to `GetBucketNotification`\:
     #
     # * [PutBucketNotification][3]
     #
@@ -4516,7 +4520,7 @@ module Aws::S3
     # For more information about bucket policies, see [Using Bucket Policies
     # and User Policies][1].
     #
-    # The following operation is related to `GetBucketPolicy`\:
+    # The following action is related to `GetBucketPolicy`\:
     #
     # * [GetObject][2]
     #
@@ -4643,9 +4647,9 @@ module Aws::S3
     #  </note>
     #
     # For information about replication configuration, see [Replication][1]
-    # in the *Amazon Simple Storage Service Developer Guide*.
+    # in the *Amazon Simple Storage Service User Guide*.
     #
-    # This operation requires permissions for the
+    # This action requires permissions for the
     # `s3:GetReplicationConfiguration` action. For more information about
     # permissions, see [Using Bucket Policies and User Policies][2].
     #
@@ -4975,7 +4979,7 @@ module Aws::S3
     # configuration. For more information about hosting websites, see
     # [Hosting Websites on Amazon S3][1].
     #
-    # This GET operation requires the `S3:GetBucketWebsite` permission. By
+    # This GET action requires the `S3:GetBucketWebsite` permission. By
     # default, only the bucket owner can read the bucket website
     # configuration. However, bucket owners can allow other users to read
     # the website configuration by writing a bucket policy granting them the
@@ -5087,9 +5091,9 @@ module Aws::S3
     # Glacier Deep Archive storage class, or S3 Intelligent-Tiering Archive
     # or S3 Intelligent-Tiering Deep Archive tiers, before you can retrieve
     # the object you must first restore a copy using [RestoreObject][4].
-    # Otherwise, this operation returns an `InvalidObjectStateError` error.
-    # For information about restoring archived objects, see [Restoring
-    # Archived Objects][5].
+    # Otherwise, this action returns an `InvalidObjectStateError` error. For
+    # information about restoring archived objects, see [Restoring Archived
+    # Objects][5].
     #
     # Encryption request headers, like `x-amz-server-side-encryption`,
     # should not be sent for GET requests if your object uses server-side
@@ -5133,9 +5137,8 @@ module Aws::S3
     #
     # **Versioning**
     #
-    # By default, the GET operation returns the current version of an
-    # object. To return a different version, use the `versionId`
-    # subresource.
+    # By default, the GET action returns the current version of an object.
+    # To return a different version, use the `versionId` subresource.
     #
     # <note markdown="1"> If the current version of the object is a delete marker, Amazon S3
     # behaves as if the object was deleted and includes
@@ -5220,22 +5223,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name containing the object.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -5297,14 +5300,14 @@ module Aws::S3
     #   VersionId used to reference a specific version of the object.
     #
     # @option params [String] :sse_customer_algorithm
-    #   Specifies the algorithm to use to when encrypting the object (for
+    #   Specifies the algorithm to use to when decrypting the object (for
     #   example, AES256).
     #
     # @option params [String] :sse_customer_key
-    #   Specifies the customer-provided encryption key for Amazon S3 to use in
-    #   encrypting data. This value is used to store the object and then it is
-    #   discarded; Amazon S3 does not store the encryption key. The key must
-    #   be appropriate for use with the algorithm specified in the
+    #   Specifies the customer-provided encryption key for Amazon S3 used to
+    #   encrypt the data. This value is used to decrypt the object when
+    #   recovering it and must match the one used when storing the data. The
+    #   key must be appropriate for use with the algorithm specified in the
     #   `x-amz-server-side-encryption-customer-algorithm` header.
     #
     # @option params [String] :sse_customer_key_md5
@@ -5371,49 +5374,49 @@ module Aws::S3
     #   * {Types::GetObjectOutput#object_lock_legal_hold_status #object_lock_legal_hold_status} => String
     #
     #
-    # @example Example: To retrieve a byte range of an object 
+    # @example Example: To retrieve an object
     #
-    #   # The following example retrieves an object for an S3 bucket. The request specifies the range header to retrieve a
-    #   # specific byte range.
+    #   # The following example retrieves an object for an S3 bucket.
     #
     #   resp = client.get_object({
     #     bucket: "examplebucket", 
-    #     key: "SampleFile.txt", 
-    #     range: "bytes=0-9", 
+    #     key: "HappyFace.jpg", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     accept_ranges: "bytes", 
-    #     content_length: 10, 
-    #     content_range: "bytes 0-9/43", 
-    #     content_type: "text/plain", 
-    #     etag: "\"0d94420ffd0bc68cd3d152506b97a9cc\"", 
-    #     last_modified: Time.parse("Thu, 09 Oct 2014 22:57:28 GMT"), 
+    #     content_length: 3191, 
+    #     content_type: "image/jpeg", 
+    #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
+    #     last_modified: Time.parse("Thu, 15 Dec 2016 01:19:41 GMT"), 
     #     metadata: {
     #     }, 
+    #     tag_count: 2, 
     #     version_id: "null", 
     #   }
     #
-    # @example Example: To retrieve an object
+    # @example Example: To retrieve a byte range of an object 
     #
-    #   # The following example retrieves an object for an S3 bucket.
+    #   # The following example retrieves an object for an S3 bucket. The request specifies the range header to retrieve a
+    #   # specific byte range.
     #
     #   resp = client.get_object({
     #     bucket: "examplebucket", 
-    #     key: "HappyFace.jpg", 
+    #     key: "SampleFile.txt", 
+    #     range: "bytes=0-9", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     accept_ranges: "bytes", 
-    #     content_length: 3191, 
-    #     content_type: "image/jpeg", 
-    #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     last_modified: Time.parse("Thu, 15 Dec 2016 01:19:41 GMT"), 
+    #     content_length: 10, 
+    #     content_range: "bytes 0-9/43", 
+    #     content_type: "text/plain", 
+    #     etag: "\"0d94420ffd0bc68cd3d152506b97a9cc\"", 
+    #     last_modified: Time.parse("Thu, 09 Oct 2014 22:57:28 GMT"), 
     #     metadata: {
     #     }, 
-    #     tag_count: 2, 
     #     version_id: "null", 
     #   }
     #
@@ -5546,11 +5549,11 @@ module Aws::S3
     #   The bucket name that contains the object for which to get the ACL
     #   information.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
@@ -5683,11 +5686,11 @@ module Aws::S3
     #   The bucket name containing the object whose Legal Hold status you want
     #   to retrieve.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
@@ -5758,11 +5761,11 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket whose Object Lock configuration you want to retrieve.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
@@ -5815,11 +5818,11 @@ module Aws::S3
     #   The bucket name containing the object whose retention settings you
     #   want to retrieve.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
@@ -5883,7 +5886,7 @@ module Aws::S3
     # tagging subresource associated with the object.
     #
     # To use this operation, you must have permission to perform the
-    # `s3:GetObjectTagging` action. By default, the GET operation returns
+    # `s3:GetObjectTagging` action. By default, the GET action returns
     # information about current version of an object. For a versioned
     # bucket, you can have multiple versions of an object in your bucket. To
     # retrieve tags of any other version, use the versionId query parameter.
@@ -5895,37 +5898,38 @@ module Aws::S3
     # For information about the Amazon S3 object tagging feature, see
     # [Object Tagging][1].
     #
-    # The following operation is related to `GetObjectTagging`\:
+    # The following action is related to `GetObjectTagging`\:
     #
     # * [PutObjectTagging][2]
     #
-    # ^
+    # * [DeleteObjectTagging][3]
     #
     #
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-tagging.html
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectTagging.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjectTagging.html
     #
     # @option params [required, String] :bucket
     #   The bucket name containing the object for which to get the tagging
     #   information.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -5943,6 +5947,17 @@ module Aws::S3
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     #
+    # @option params [String] :request_payer
+    #   Confirms that the requester knows that they will be charged for the
+    #   request. Bucket owners need not specify this parameter in their
+    #   requests. For information about downloading objects from requester
+    #   pays buckets, see [Downloading Objects in Requestor Pays Buckets][1]
+    #   in the *Amazon S3 Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
+    #
     # @return [Types::GetObjectTaggingOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::GetObjectTaggingOutput#version_id #version_id} => String
@@ -6001,6 +6016,7 @@ module Aws::S3
     #     key: "ObjectKey", # required
     #     version_id: "ObjectVersionId",
     #     expected_bucket_owner: "AccountId",
+    #     request_payer: "requester", # accepts requester
     #   })
     #
     # @example Response structure
@@ -6033,7 +6049,7 @@ module Aws::S3
     #
     # This action is not supported by Amazon S3 on Outposts.
     #
-    # The following operation is related to `GetObjectTorrent`\:
+    # The following action is related to `GetObjectTorrent`\:
     #
     # * [GetObject][2]
     #
@@ -6183,11 +6199,14 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This operation is useful to determine if a bucket exists and you have
-    # permission to access it. The operation returns a `200 OK` if the
-    # bucket exists and you have permission to access it. Otherwise, the
-    # operation might return responses such as `404 Not Found` and `403
-    # Forbidden`.
+    # This action is useful to determine if a bucket exists and you have
+    # permission to access it. The action returns a `200 OK` if the bucket
+    # exists and you have permission to access it.
+    #
+    # If the bucket does not exist or you do not have permission to access
+    # it, the `HEAD` request returns a generic `404 Not Found` or `403
+    # Forbidden` code. A message body is not included, so you cannot
+    # determine the exception beyond these error codes.
     #
     # To use this operation, you must have permissions to perform the
     # `s3:ListBucket` action. The bucket owner has this permission by
@@ -6204,22 +6223,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -6264,14 +6283,17 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # The HEAD operation retrieves metadata from an object without returning
-    # the object itself. This operation is useful if you're only interested
-    # in an object's metadata. To use HEAD, you must have READ access to
-    # the object.
-    #
-    # A `HEAD` request has the same options as a `GET` operation on an
-    # object. The response is identical to the `GET` response except that
-    # there is no response body.
+    # The HEAD action retrieves metadata from an object without returning
+    # the object itself. This action is useful if you're only interested in
+    # an object's metadata. To use HEAD, you must have READ access to the
+    # object.
+    #
+    # A `HEAD` request has the same options as a `GET` action on an object.
+    # The response is identical to the `GET` response except that there is
+    # no response body. Because of this, if the `HEAD` request generates an
+    # error, it returns a generic `404 Not Found` or `403 Forbidden` code.
+    # It is not possible to retrieve the exact exception beyond these error
+    # codes.
     #
     # If you encrypt an object by using server-side encryption with
     # customer-provided encryption keys (SSE-C) when you store the object in
@@ -6287,12 +6309,15 @@ module Aws::S3
     # For more information about SSE-C, see [Server-Side Encryption (Using
     # Customer-Provided Encryption Keys)][1].
     #
-    # <note markdown="1"> Encryption request headers, like `x-amz-server-side-encryption`,
-    # should not be sent for GET requests if your object uses server-side
-    # encryption with CMKs stored in AWS KMS (SSE-KMS) or server-side
-    # encryption with Amazon S3–managed encryption keys (SSE-S3). If your
-    # object does use these types of keys, you’ll get an HTTP 400 BadRequest
-    # error.
+    # <note markdown="1"> * Encryption request headers, like `x-amz-server-side-encryption`,
+    #   should not be sent for GET requests if your object uses server-side
+    #   encryption with CMKs stored in AWS KMS (SSE-KMS) or server-side
+    #   encryption with Amazon S3–managed encryption keys (SSE-S3). If your
+    #   object does use these types of keys, you’ll get an HTTP 400
+    #   BadRequest error.
+    #
+    # * The last modified property in this case is the creation date of the
+    #   object.
     #
     #  </note>
     #
@@ -6334,7 +6359,7 @@ module Aws::S3
     # * If you don’t have the `s3:ListBucket` permission, Amazon S3 returns
     #   an HTTP status code 403 ("access denied") error.
     #
-    # The following operation is related to `HeadObject`\:
+    # The following action is related to `HeadObject`\:
     #
     # * [GetObject][5]
     #
@@ -6351,22 +6376,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The name of the bucket containing the object.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -6575,15 +6600,14 @@ module Aws::S3
     # Lists the analytics configurations for the bucket. You can have up to
     # 1,000 analytics configurations per bucket.
     #
-    # This operation supports list pagination and does not return more than
-    # 100 configurations at a time. You should always check the
-    # `IsTruncated` element in the response. If there are no more
-    # configurations to list, `IsTruncated` is set to false. If there are
-    # more configurations to list, `IsTruncated` is set to true, and there
-    # will be a value in `NextContinuationToken`. You use the
-    # `NextContinuationToken` value to continue the pagination of the list
-    # by passing the value in continuation-token in the request to `GET` the
-    # next page.
+    # This action supports list pagination and does not return more than 100
+    # configurations at a time. You should always check the `IsTruncated`
+    # element in the response. If there are no more configurations to list,
+    # `IsTruncated` is set to false. If there are more configurations to
+    # list, `IsTruncated` is set to true, and there will be a value in
+    # `NextContinuationToken`. You use the `NextContinuationToken` value to
+    # continue the pagination of the list by passing the value in
+    # continuation-token in the request to `GET` the next page.
     #
     # To use this operation, you must have permissions to perform the
     # `s3:GetAnalyticsConfiguration` action. The bucket owner has this
@@ -6760,9 +6784,9 @@ module Aws::S3
     # Returns a list of inventory configurations for the bucket. You can
     # have up to 1,000 analytics configurations per bucket.
     #
-    # This operation supports list pagination and does not return more than
-    # 100 configurations at a time. Always check the `IsTruncated` element
-    # in the response. If there are no more configurations to list,
+    # This action supports list pagination and does not return more than 100
+    # configurations at a time. Always check the `IsTruncated` element in
+    # the response. If there are no more configurations to list,
     # `IsTruncated` is set to false. If there are more configurations to
     # list, `IsTruncated` is set to true, and there is a value in
     # `NextContinuationToken`. You use the `NextContinuationToken` value to
@@ -6860,9 +6884,9 @@ module Aws::S3
     # not provide information on daily storage metrics. You can have up to
     # 1,000 configurations per bucket.
     #
-    # This operation supports list pagination and does not return more than
-    # 100 configurations at a time. Always check the `IsTruncated` element
-    # in the response. If there are no more configurations to list,
+    # This action supports list pagination and does not return more than 100
+    # configurations at a time. Always check the `IsTruncated` element in
+    # the response. If there are no more configurations to list,
     # `IsTruncated` is set to false. If there are more configurations to
     # list, `IsTruncated` is set to true, and there is a value in
     # `NextContinuationToken`. You use the `NextContinuationToken` value to
@@ -7008,20 +7032,19 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This operation lists in-progress multipart uploads. An in-progress
+    # This action lists in-progress multipart uploads. An in-progress
     # multipart upload is a multipart upload that has been initiated using
     # the Initiate Multipart Upload request, but has not yet been completed
     # or aborted.
     #
-    # This operation returns at most 1,000 multipart uploads in the
-    # response. 1,000 multipart uploads is the maximum number of uploads a
-    # response can include, which is also the default value. You can further
-    # limit the number of uploads in a response by specifying the
-    # `max-uploads` parameter in the response. If additional multipart
-    # uploads satisfy the list criteria, the response will contain an
-    # `IsTruncated` element with the value true. To list the additional
-    # multipart uploads, use the `key-marker` and `upload-id-marker` request
-    # parameters.
+    # This action returns at most 1,000 multipart uploads in the response.
+    # 1,000 multipart uploads is the maximum number of uploads a response
+    # can include, which is also the default value. You can further limit
+    # the number of uploads in a response by specifying the `max-uploads`
+    # parameter in the response. If additional multipart uploads satisfy the
+    # list criteria, the response will contain an `IsTruncated` element with
+    # the value true. To list the additional multipart uploads, use the
+    # `key-marker` and `upload-id-marker` request parameters.
     #
     # In the response, the uploads are sorted by key. If your application
     # has initiated more than one multipart upload using the same object
@@ -7033,7 +7056,7 @@ module Aws::S3
     # Using Multipart Upload][1].
     #
     # For information on permissions required to use the multipart upload
-    # API, see [Multipart Upload API and Permissions][2].
+    # API, see [Multipart Upload and Permissions][2].
     #
     # The following operations are related to `ListMultipartUploads`\:
     #
@@ -7060,22 +7083,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The name of the bucket to which the multipart upload was initiated.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -7155,97 +7178,97 @@ module Aws::S3
     # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
     #
     #
-    # @example Example: List next set of multipart uploads when previous result is truncated
+    # @example Example: To list in-progress multipart uploads on a bucket
     #
-    #   # The following example specifies the upload-id-marker and key-marker from previous truncated response to retrieve next
-    #   # setup of multipart uploads.
+    #   # The following example lists in-progress multipart uploads on a specific bucket.
     #
     #   resp = client.list_multipart_uploads({
     #     bucket: "examplebucket", 
-    #     key_marker: "nextkeyfrompreviousresponse", 
-    #     max_uploads: 2, 
-    #     upload_id_marker: "valuefrompreviousresponse", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
-    #     bucket: "acl1", 
-    #     is_truncated: true, 
-    #     key_marker: "", 
-    #     max_uploads: 2, 
-    #     next_key_marker: "someobjectkey", 
-    #     next_upload_id_marker: "examplelo91lv1iwvWpvCiJWugw2xXLPAD7Z8cJyX9.WiIRgNrdG6Ldsn.9FtS63TCl1Uf5faTB.1U5Ckcbmdw--", 
-    #     upload_id_marker: "", 
     #     uploads: [
     #       {
     #         initiated: Time.parse("2014-05-01T05:40:58.000Z"), 
     #         initiator: {
-    #           display_name: "ownder-display-name", 
+    #           display_name: "display-name", 
     #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         key: "JavaFile", 
     #         owner: {
-    #           display_name: "mohanataws", 
-    #           id: "852b113e7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
+    #           display_name: "display-name", 
+    #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         storage_class: "STANDARD", 
-    #         upload_id: "gZ30jIqlUa.CInXklLQtSMJITdUnoZ1Y5GACB5UckOtspm5zbDMCkPF_qkfZzMiFZ6dksmcnqxJyIBvQMG9X9Q--", 
+    #         upload_id: "examplelUa.CInXklLQtSMJITdUnoZ1Y5GACB5UckOtspm5zbDMCkPF_qkfZzMiFZ6dksmcnqxJyIBvQMG9X9Q--", 
     #       }, 
     #       {
     #         initiated: Time.parse("2014-05-01T05:41:27.000Z"), 
     #         initiator: {
-    #           display_name: "ownder-display-name", 
+    #           display_name: "display-name", 
     #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         key: "JavaFile", 
     #         owner: {
-    #           display_name: "ownder-display-name", 
+    #           display_name: "display-name", 
     #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         storage_class: "STANDARD", 
-    #         upload_id: "b7tZSqIlo91lv1iwvWpvCiJWugw2xXLPAD7Z8cJyX9.WiIRgNrdG6Ldsn.9FtS63TCl1Uf5faTB.1U5Ckcbmdw--", 
+    #         upload_id: "examplelo91lv1iwvWpvCiJWugw2xXLPAD7Z8cJyX9.WiIRgNrdG6Ldsn.9FtS63TCl1Uf5faTB.1U5Ckcbmdw--", 
     #       }, 
     #     ], 
     #   }
     #
-    # @example Example: To list in-progress multipart uploads on a bucket
+    # @example Example: List next set of multipart uploads when previous result is truncated
     #
-    #   # The following example lists in-progress multipart uploads on a specific bucket.
+    #   # The following example specifies the upload-id-marker and key-marker from previous truncated response to retrieve next
+    #   # setup of multipart uploads.
     #
     #   resp = client.list_multipart_uploads({
     #     bucket: "examplebucket", 
+    #     key_marker: "nextkeyfrompreviousresponse", 
+    #     max_uploads: 2, 
+    #     upload_id_marker: "valuefrompreviousresponse", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
+    #     bucket: "acl1", 
+    #     is_truncated: true, 
+    #     key_marker: "", 
+    #     max_uploads: 2, 
+    #     next_key_marker: "someobjectkey", 
+    #     next_upload_id_marker: "examplelo91lv1iwvWpvCiJWugw2xXLPAD7Z8cJyX9.WiIRgNrdG6Ldsn.9FtS63TCl1Uf5faTB.1U5Ckcbmdw--", 
+    #     upload_id_marker: "", 
     #     uploads: [
     #       {
     #         initiated: Time.parse("2014-05-01T05:40:58.000Z"), 
     #         initiator: {
-    #           display_name: "display-name", 
+    #           display_name: "ownder-display-name", 
     #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         key: "JavaFile", 
     #         owner: {
-    #           display_name: "display-name", 
-    #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
+    #           display_name: "mohanataws", 
+    #           id: "852b113e7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         storage_class: "STANDARD", 
-    #         upload_id: "examplelUa.CInXklLQtSMJITdUnoZ1Y5GACB5UckOtspm5zbDMCkPF_qkfZzMiFZ6dksmcnqxJyIBvQMG9X9Q--", 
+    #         upload_id: "gZ30jIqlUa.CInXklLQtSMJITdUnoZ1Y5GACB5UckOtspm5zbDMCkPF_qkfZzMiFZ6dksmcnqxJyIBvQMG9X9Q--", 
     #       }, 
     #       {
     #         initiated: Time.parse("2014-05-01T05:41:27.000Z"), 
     #         initiator: {
-    #           display_name: "display-name", 
+    #           display_name: "ownder-display-name", 
     #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         key: "JavaFile", 
     #         owner: {
-    #           display_name: "display-name", 
+    #           display_name: "ownder-display-name", 
     #           id: "examplee7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc", 
     #         }, 
     #         storage_class: "STANDARD", 
-    #         upload_id: "examplelo91lv1iwvWpvCiJWugw2xXLPAD7Z8cJyX9.WiIRgNrdG6Ldsn.9FtS63TCl1Uf5faTB.1U5Ckcbmdw--", 
+    #         upload_id: "b7tZSqIlo91lv1iwvWpvCiJWugw2xXLPAD7Z8cJyX9.WiIRgNrdG6Ldsn.9FtS63TCl1Uf5faTB.1U5Ckcbmdw--", 
     #       }, 
     #     ], 
     #   }
@@ -7351,7 +7374,7 @@ module Aws::S3
     #
     # @option params [Integer] :max_keys
     #   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
+    #   the action 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
@@ -7495,7 +7518,7 @@ module Aws::S3
     # invalid XML. Be sure to design your application to parse the contents
     # of the response and handle it appropriately.
     #
-    # This API has been revised. We recommend that you use the newer
+    # This action has been revised. We recommend that you use the newer
     # version, [ListObjectsV2][1], when developing applications. For
     # backward compatibility, Amazon S3 continues to support `ListObjects`.
     #
@@ -7522,22 +7545,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The name of the bucket containing the objects.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -7560,7 +7583,7 @@ module Aws::S3
     #
     # @option params [Integer] :max_keys
     #   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
+    #   the action returns up to 1,000 key names. The response might contain
     #   fewer keys but will never contain more.
     #
     # @option params [String] :prefix
@@ -7677,20 +7700,22 @@ module Aws::S3
     # use the request parameters as selection criteria to return a subset of
     # the objects in a bucket. A `200 OK` response can contain valid or
     # invalid XML. Make sure to design your application to parse the
-    # contents of the response and handle it appropriately.
+    # contents of the response and handle it appropriately. Objects are
+    # returned sorted in an ascending order of the respective key names in
+    # the list.
     #
     # To use this operation, you must have READ access to the bucket.
     #
-    # To use this operation in an AWS Identity and Access Management (IAM)
+    # To use this action in an AWS Identity and Access Management (IAM)
     # policy, you must have permissions to perform the `s3:ListBucket`
     # 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].
     #
-    # This section describes the latest revision of the API. We recommend
-    # that you use this revised API for application development. For
-    # backward compatibility, Amazon S3 continues to support the prior
+    # This section describes the latest revision of this action. We
+    # recommend that you use this revised API for application development.
+    # For backward compatibility, Amazon S3 continues to support the prior
     # version of this API, [ListObjects][3].
     #
     # To get a list of your buckets, see [ListBuckets][4].
@@ -7716,22 +7741,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   Bucket name to list.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -7746,7 +7771,7 @@ module Aws::S3
     #
     # @option params [Integer] :max_keys
     #   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
+    #   the action returns up to 1,000 key names. The response might contain
     #   fewer keys but will never contain more.
     #
     # @option params [String] :prefix
@@ -7895,7 +7920,7 @@ module Aws::S3
     # Using Multipart Upload][2].
     #
     # For information on permissions required to use the multipart upload
-    # API, see [Multipart Upload API and Permissions][3].
+    # API, see [Multipart Upload and Permissions][3].
     #
     # The following operations are related to `ListParts`\:
     #
@@ -7922,22 +7947,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The name of the bucket to which the parts are being uploaded.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -8093,8 +8118,8 @@ module Aws::S3
     #
     # * Suspended – Disables accelerated data transfers to the bucket.
     #
-    # The [GetBucketAccelerateConfiguration][3] operation returns the
-    # transfer acceleration state of a bucket.
+    # The [GetBucketAccelerateConfiguration][3] action returns the transfer
+    # acceleration state of a bucket.
     #
     # After setting the Transfer Acceleration state of a bucket to Enabled,
     # it might take up to thirty minutes before the data transfer rates to
@@ -8579,7 +8604,7 @@ module Aws::S3
     #   element.
     #
     # For more information about CORS, go to [Enabling Cross-Origin Resource
-    # Sharing][1] in the *Amazon Simple Storage Service Developer Guide*.
+    # Sharing][1] in the *Amazon Simple Storage Service User Guide*.
     #
     # **Related Resources**
     #
@@ -8602,7 +8627,7 @@ module Aws::S3
     # @option params [required, Types::CORSConfiguration] :cors_configuration
     #   Describes the cross-origin access configuration for objects in an
     #   Amazon S3 bucket. For more information, see [Enabling Cross-Origin
-    #   Resource Sharing][1] in the *Amazon Simple Storage Service Developer
+    #   Resource Sharing][1] in the *Amazon Simple Storage Service User
     #   Guide*.
     #
     #
@@ -8700,7 +8725,7 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This operation uses the `encryption` subresource to configure default
+    # This action uses the `encryption` subresource to configure default
     # encryption and Amazon S3 Bucket Key for an existing bucket.
     #
     # Default encryption for a bucket can use server-side encryption with
@@ -8708,36 +8733,36 @@ module Aws::S3
     # (SSE-KMS). If you specify default encryption using SSE-KMS, you can
     # also configure Amazon S3 Bucket Key. For information about default
     # encryption, see [Amazon S3 default bucket encryption][1] in the
-    # *Amazon Simple Storage Service Developer Guide*. For more information
-    # about S3 Bucket Keys, see [Amazon S3 Bucket Keys][2] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # *Amazon Simple Storage Service User Guide*. For more information about
+    # S3 Bucket Keys, see [Amazon S3 Bucket Keys][2] in the *Amazon Simple
+    # Storage Service User Guide*.
     #
-    # This operation requires AWS Signature Version 4. For more information,
-    # see [ Authenticating Requests (AWS Signature Version
-    # 4)](sig-v4-authenticating-requests.html).
+    # This action requires AWS Signature Version 4. For more information,
+    # see [ Authenticating Requests (AWS Signature Version 4)][3].
     #
     # To use this operation, you must have permissions to perform the
     # `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][3] and [Managing Access
-    # Permissions to Your Amazon S3 Resources][4] in the Amazon Simple
-    # Storage Service Developer Guide.
+    # Related to Bucket Subresource Operations][4] and [Managing Access
+    # Permissions to Your Amazon S3 Resources][5] in the Amazon Simple
+    # Storage Service User Guide.
     #
     # **Related Resources**
     #
-    # * [GetBucketEncryption][5]
+    # * [GetBucketEncryption][6]
     #
-    # * [DeleteBucketEncryption][6]
+    # * [DeleteBucketEncryption][7]
     #
     #
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html
     # [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-key.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/AmazonS3/latest/API/API_GetBucketEncryption.html
-    # [6]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketEncryption.html
+    # [3]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html
+    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources
+    # [5]: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html
+    # [6]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketEncryption.html
+    # [7]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketEncryption.html
     #
     # @option params [required, String] :bucket
     #   Specifies default encryption for a bucket using server-side encryption
@@ -8796,6 +8821,8 @@ module Aws::S3
     end
 
     # Puts a S3 Intelligent-Tiering configuration to the specified bucket.
+    # You can have up to 1,000 S3 Intelligent-Tiering configurations per
+    # bucket.
     #
     # The S3 Intelligent-Tiering storage class is designed to optimize
     # storage costs by automatically moving data to the most cost-effective
@@ -8824,6 +8851,35 @@ module Aws::S3
     #
     # * [ListBucketIntelligentTieringConfigurations][4]
     #
+    # <note markdown="1"> You only need S3 Intelligent-Tiering enabled on a bucket if you want
+    # to automatically move objects stored in the S3 Intelligent-Tiering
+    # storage class to the Archive Access or Deep Archive Access tier.
+    #
+    #  </note>
+    #
+    # **Special Errors**
+    #
+    # * **HTTP 400 Bad Request Error**
+    #
+    #   * *Code:* InvalidArgument
+    #
+    #   * *Cause:* Invalid Argument
+    #
+    # * **HTTP 400 Bad Request Error**
+    #
+    #   * *Code:* TooManyConfigurations
+    #
+    #   * *Cause:* You are attempting to create a new configuration but have
+    #     already reached the 1,000-configuration limit.
+    #
+    # * **HTTP 403 Forbidden Error**
+    #
+    #   * *Code:* AccessDenied
+    #
+    #   * *Cause:* You are not the owner of the specified bucket, or you do
+    #     not have the `s3:PutIntelligentTieringConfiguration` bucket
+    #     permission to set the configuration on the bucket.
+    #
     #
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access
@@ -8885,7 +8941,7 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This implementation of the `PUT` operation adds an inventory
+    # This implementation of the `PUT` action adds an inventory
     # configuration (identified by the inventory ID) to the bucket. You can
     # have up to 1,000 inventory configurations per bucket.
     #
@@ -8901,8 +8957,8 @@ module Aws::S3
     # whether to generate the inventory daily or weekly. You can also
     # configure what object metadata to include and whether to inventory all
     # object versions or only current versions. For more information, see
-    # [Amazon S3 Inventory][1] in the Amazon Simple Storage Service
-    # Developer Guide.
+    # [Amazon S3 Inventory][1] in the Amazon Simple Storage Service User
+    # Guide.
     #
     # 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
@@ -8914,7 +8970,7 @@ module Aws::S3
     # permission by default and can grant this permission to others. For
     # more information about permissions, see [Permissions Related to Bucket
     # Subresource Operations][3] and [Managing Access Permissions to Your
-    # Amazon S3 Resources][4] in the Amazon Simple Storage Service Developer
+    # Amazon S3 Resources][4] in the Amazon Simple Storage Service User
     # Guide.
     #
     # **Special Errors**
@@ -9027,7 +9083,7 @@ module Aws::S3
     # Creates a new lifecycle configuration for the bucket or replaces an
     # existing lifecycle configuration. For information about lifecycle
     # configuration, see [Object Lifecycle Management][2] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # Simple Storage Service User Guide*.
     #
     # By default, all Amazon S3 resources, including buckets, objects, and
     # related subresources (for example, lifecycle configuration and website
@@ -9050,7 +9106,7 @@ module Aws::S3
     #
     # For more information about permissions, see [Managing Access
     # Permissions to your Amazon S3 Resources][3] in the *Amazon Simple
-    # Storage Service Developer Guide*.
+    # Storage Service User Guide*.
     #
     # For more examples of transitioning objects to storage classes such as
     # STANDARD\_IA or ONEZONE\_IA, see [Examples of Lifecycle
@@ -9068,7 +9124,7 @@ module Aws::S3
     #   the AWS account that created the bucket—can perform any of the
     #   operations. A resource owner can also grant others permission to
     #   perform the operation. For more information, see the following
-    #   topics in the Amazon Simple Storage Service Developer Guide:
+    #   topics in the Amazon Simple Storage Service User Guide:
     #
     #   * [Specifying Permissions in a Policy][8]
     #
@@ -9658,8 +9714,8 @@ module Aws::S3
     #
     # `</NotificationConfiguration>`
     #
-    # This operation replaces the existing notification configuration with
-    # the configuration you include in the request body.
+    # This action replaces the existing notification configuration with the
+    # configuration you include in the request body.
     #
     # After Amazon S3 receives this request, it first verifies that any
     # Amazon Simple Notification Service (Amazon SNS) or Amazon Simple Queue
@@ -9682,8 +9738,8 @@ module Aws::S3
     # notification configuration includes SNS topic, SQS queue, and Lambda
     # function configurations. When you send a PUT request with this
     # configuration, Amazon S3 sends test messages to your SNS topic. If the
-    # message fails, the entire PUT operation will fail, and Amazon S3 will
-    # not add the configuration to your bucket.
+    # message fails, the entire PUT action will fail, and Amazon S3 will not
+    # add the configuration to your bucket.
     #
     #  </note>
     #
@@ -9695,7 +9751,7 @@ module Aws::S3
     # include the `x-amz-sns-test-message-id` header containing the message
     # ID of the test notification sent to the topic.
     #
-    # The following operation is related to
+    # The following action is related to
     # `PutBucketNotificationConfiguration`\:
     #
     # * [GetBucketNotificationConfiguration][2]
@@ -9960,8 +10016,8 @@ module Aws::S3
     # more information, see [Replication][1] in the *Amazon S3 Developer
     # Guide*.
     #
-    # <note markdown="1"> To perform this operation, the user or role performing the operation
-    # must have the [iam:PassRole][2] permission.
+    # <note markdown="1"> To perform this operation, the user or role performing the action must
+    # have the [iam:PassRole][2] permission.
     #
     #  </note>
     #
@@ -10187,10 +10243,9 @@ module Aws::S3
     #   The bucket name.
     #
     # @option params [String] :content_md5
-    #   &gt;The base64-encoded 128-bit MD5 digest of the data. You must use
-    #   this header as a message integrity check to verify that the request
-    #   body was not corrupted in transit. For more information, see [RFC
-    #   1864][1].
+    #   The base64-encoded 128-bit MD5 digest of the data. You must use this
+    #   header as a message integrity check to verify that the request body
+    #   was not corrupted in transit. For more information, see [RFC 1864][1].
     #
     #   For requests made using the AWS Command Line Interface (CLI) or AWS
     #   SDKs, this field is calculated automatically.
@@ -10284,7 +10339,7 @@ module Aws::S3
     #
     # * Error code: `OperationAbortedError `
     #
-    #   * Description: A conflicting conditional operation is currently in
+    #   * Description: A conflicting conditional action is currently in
     #     progress against this resource. Please try again.
     #
     #   ^
@@ -10499,7 +10554,7 @@ module Aws::S3
     # such as the file name of the index document and any redirect rules.
     # For more information, see [Hosting Websites on Amazon S3][1].
     #
-    # This PUT operation requires the `S3:PutBucketWebsite` permission. By
+    # This PUT action requires the `S3:PutBucketWebsite` permission. By
     # default, only the bucket owner can configure the website attached to a
     # bucket; however, bucket owners can allow other users to set the
     # website configuration by writing a bucket policy that grants them the
@@ -10559,7 +10614,7 @@ module Aws::S3
     # 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*.
+    # Redirect][2] in the *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -10692,7 +10747,7 @@ module Aws::S3
     # If you request server-side encryption using AWS Key Management Service
     # (SSE-KMS), you can enable an S3 Bucket Key at the object-level. For
     # more information, see [Amazon S3 Bucket Keys][3] in the *Amazon Simple
-    # Storage Service Developer Guide*.
+    # Storage Service User Guide*.
     #
     # **Access Control List (ACL)-Specific Request Headers**
     #
@@ -10758,24 +10813,24 @@ module Aws::S3
     #   Object data.
     #
     # @option params [required, String] :bucket
-    #   The bucket name to which the PUT operation was initiated.
+    #   The bucket name to which the PUT action was initiated.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -10875,7 +10930,7 @@ module Aws::S3
     #   This action is not supported by Amazon S3 on Outposts.
     #
     # @option params [required, String] :key
-    #   Object key for which the PUT operation was initiated.
+    #   Object key for which the PUT action was initiated.
     #
     # @option params [Hash<String,String>] :metadata
     #   A map of metadata to store with the object in S3.
@@ -10962,8 +11017,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a PUT operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a PUT action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     #
     # @option params [String] :request_payer
     #   Confirms that the requester knows that they will be charged for the
@@ -11013,58 +11068,41 @@ module Aws::S3
     #   * {Types::PutObjectOutput#request_charged #request_charged} => String
     #
     #
-    # @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 Example: To create an object.
+    # @example Example: To upload an object and specify server-side encryption and object tags
     #
-    #   # The following example creates an object. If the bucket is versioning enabled, S3 returns version ID in response.
+    #   # 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: "filetoupload", 
     #     bucket: "examplebucket", 
-    #     key: "objectkey", 
-    #   })
-    #
-    #   resp.to_h outputs the following:
-    #   {
-    #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "Bvq0EDKxOcXLJXNo_Lkz37eM3R4pfzyQ", 
-    #   }
-    #
-    # @example Example: To upload an object and specify optional tags
-    #
-    #   # 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: "c:\\HappyFace.jpg", 
-    #     bucket: "examplebucket", 
-    #     key: "HappyFace.jpg", 
+    #     key: "exampleobject", 
+    #     server_side_encryption: "AES256", 
     #     tagging: "key1=value1&key2=value2", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "psM2sYY4.o1501dSx8wMvnkOzSBB.V4a", 
+    #     server_side_encryption: "AES256", 
+    #     version_id: "Ri.vC6qVlA4dEnjgRV4ZHsHoFIjqEMNt", 
     #   }
     #
     # @example Example: To upload an object (specify optional headers)
@@ -11087,25 +11125,20 @@ module Aws::S3
     #     version_id: "CG612hodqujkf8FaaNfp8U..FIhLROcp", 
     #   }
     #
-    # @example Example: To upload object and specify user-defined metadata
+    # @example Example: To create an 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.
+    #   # The following example creates an object. If the bucket is versioning enabled, S3 returns version ID in response.
     #
     #   resp = client.put_object({
     #     body: "filetoupload", 
     #     bucket: "examplebucket", 
-    #     key: "exampleobject", 
-    #     metadata: {
-    #       "metadata1" => "value1", 
-    #       "metadata2" => "value2", 
-    #     }, 
+    #     key: "objectkey", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "pSKidl4pHBiNwukdbcPXAIs.sshFFOc0", 
+    #     version_id: "Bvq0EDKxOcXLJXNo_Lkz37eM3R4pfzyQ", 
     #   }
     #
     # @example Example: To upload an object and specify canned ACL.
@@ -11126,21 +11159,43 @@ module Aws::S3
     #     version_id: "Kirh.unyZwjQ69YxcQLA8z4F5j3kJJKr", 
     #   }
     #
-    # @example Example: To upload an object
+    # @example Example: To upload an object and specify optional tags
     #
-    #   # 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 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: "HappyFace.jpg", 
+    #     body: "c:\\HappyFace.jpg", 
     #     bucket: "examplebucket", 
     #     key: "HappyFace.jpg", 
+    #     tagging: "key1=value1&key2=value2", 
     #   })
     #
     #   resp.to_h outputs the following:
     #   {
     #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
-    #     version_id: "tpf3zF08nBplQK1XLOefGskR7mGDwcDk", 
+    #     version_id: "psM2sYY4.o1501dSx8wMvnkOzSBB.V4a", 
+    #   }
+    #
+    # @example Example: To upload object and specify user-defined metadata
+    #
+    #   # 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: "filetoupload", 
+    #     bucket: "examplebucket", 
+    #     key: "exampleobject", 
+    #     metadata: {
+    #       "metadata1" => "value1", 
+    #       "metadata2" => "value2", 
+    #     }, 
+    #   })
+    #
+    #   resp.to_h outputs the following:
+    #   {
+    #     etag: "\"6805f2cfc46c0f04559748bb039d69ae\"", 
+    #     version_id: "pSKidl4pHBiNwukdbcPXAIs.sshFFOc0", 
     #   }
     #
     # @example Streaming a file from disk
@@ -11214,7 +11269,7 @@ module Aws::S3
     # permissions for a new or existing object in an S3 bucket. You must
     # have `WRITE_ACP` permission to set the ACL of an object. For more
     # information, see [What permissions can I grant?][1] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # Simple Storage Service User Guide*.
     #
     # This action is not supported by Amazon S3 on Outposts.
     #
@@ -11378,11 +11433,11 @@ module Aws::S3
     #   The bucket name that contains the object to which you want to attach
     #   the ACL.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
@@ -11429,24 +11484,24 @@ module Aws::S3
     #   This action is not supported by Amazon S3 on Outposts.
     #
     # @option params [required, String] :key
-    #   Key for which the PUT operation was initiated.
+    #   Key for which the PUT action was initiated.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -11561,11 +11616,11 @@ module Aws::S3
     #   The bucket name containing the object that you want to place a Legal
     #   Hold on.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
@@ -11743,11 +11798,11 @@ module Aws::S3
     #   The bucket name that contains the object you want to apply this Object
     #   Retention configuration to.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
@@ -11778,7 +11833,7 @@ module Aws::S3
     #   Retention configuration to.
     #
     # @option params [Boolean] :bypass_governance_retention
-    #   Indicates whether this operation should bypass Governance-mode
+    #   Indicates whether this action should bypass Governance-mode
     #   restrictions.
     #
     # @option params [String] :content_md5
@@ -11861,8 +11916,8 @@ module Aws::S3
     #
     # * * <i>Code: OperationAbortedError </i>
     #
-    #   * *Cause: A conflicting conditional operation is currently in
-    #     progress against this resource. Please try again.*
+    #   * *Cause: A conflicting conditional action is currently in progress
+    #     against this resource. Please try again.*
     #
     # * * *Code: InternalError*
     #
@@ -11873,33 +11928,34 @@ module Aws::S3
     #
     # * [GetObjectTagging][1]
     #
-    # ^
+    # * [DeleteObjectTagging][4]
     #
     #
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html
     # [2]: https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html
     # [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-tagging.html
+    # [4]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjectTagging.html
     #
     # @option params [required, String] :bucket
     #   The bucket name containing the object.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -11926,6 +11982,17 @@ module Aws::S3
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     #
+    # @option params [String] :request_payer
+    #   Confirms that the requester knows that they will be charged for the
+    #   request. Bucket owners need not specify this parameter in their
+    #   requests. For information about downloading objects from requester
+    #   pays buckets, see [Downloading Objects in Requestor Pays Buckets][1]
+    #   in the *Amazon S3 Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
+    #
     # @return [Types::PutObjectTaggingOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::PutObjectTaggingOutput#version_id #version_id} => String
@@ -11973,6 +12040,7 @@ module Aws::S3
     #       ],
     #     },
     #     expected_bucket_owner: "AccountId",
+    #     request_payer: "requester", # accepts requester
     #   })
     #
     # @example Response structure
@@ -12089,7 +12157,7 @@ module Aws::S3
     # 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*.
+    # Resources][2] in the *Amazon Simple Storage Service User Guide*.
     #
     # **Querying Archives with Select Requests**
     #
@@ -12099,7 +12167,7 @@ module Aws::S3
     # files. You can run queries and custom analytics on your archived data
     # without having to restore your data to a hotter Amazon S3 tier. For an
     # overview about select requests, see [Querying Archived Objects][3] in
-    # the *Amazon Simple Storage Service Developer Guide*.
+    # the *Amazon Simple Storage Service User Guide*.
     #
     # When making a select request, do the following:
     #
@@ -12110,7 +12178,7 @@ module Aws::S3
     #   bucket. You can specify the storage class and encryption for the
     #   output objects stored in the bucket. For more information about
     #   output, see [Querying Archived Objects][3] in the *Amazon Simple
-    #   Storage Service Developer Guide*.
+    #   Storage Service User Guide*.
     #
     #   For more information about the `S3` structure in the request body,
     #   see the following:
@@ -12118,10 +12186,10 @@ module Aws::S3
     #   * [PutObject][4]
     #
     #   * [Managing Access with ACLs][5] in the *Amazon Simple Storage
-    #     Service Developer Guide*
+    #     Service User Guide*
     #
     #   * [Protecting Data Using Server-Side Encryption][6] in the *Amazon
-    #     Simple Storage Service Developer Guide*
+    #     Simple Storage Service User Guide*
     #
     # * Define the SQL expression for the `SELECT` type of restoration for
     #   your query in the request body's `SelectParameters` structure. You
@@ -12147,7 +12215,7 @@ module Aws::S3
     #
     # For more information about using SQL with S3 Glacier Select restore,
     # see [SQL Reference for Amazon S3 Select and S3 Glacier Select][7] in
-    # the *Amazon Simple Storage Service Developer Guide*.
+    # the *Amazon Simple Storage Service User Guide*.
     #
     # When making a select request, you can also do the following:
     #
@@ -12226,20 +12294,20 @@ module Aws::S3
     #
     # For more information about archive retrieval options and provisioned
     # capacity for `Expedited` data access, see [Restoring Archived
-    # Objects][8] in the *Amazon Simple Storage Service Developer Guide*.
+    # Objects][8] in the *Amazon Simple Storage Service User Guide*.
     #
     # You can use Amazon S3 restore speed upgrade to change the restore
     # speed to a faster speed while it is in progress. For more information,
     # see [ Upgrading the speed of an in-progress restore][9] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # Simple Storage Service User Guide*.
     #
     # To get the status of object restoration, you can send a `HEAD`
     # request. Operations return the `x-amz-restore` header, which provides
     # information about the restoration status, in the response. You can use
     # Amazon S3 event notifications to notify you when a restore is
     # initiated or completed. For more information, see [Configuring Amazon
-    # S3 Event Notifications][10] in the *Amazon Simple Storage Service
-    # Developer Guide*.
+    # S3 Event Notifications][10] in the *Amazon Simple Storage Service User
+    # Guide*.
     #
     # After restoring an archived object, you can update the restoration
     # period by reissuing the request with a new period. Amazon S3 updates
@@ -12255,11 +12323,11 @@ module Aws::S3
     # days, Amazon S3 deletes the object in 3 days. For more information
     # about lifecycle configuration, see
     # [PutBucketLifecycleConfiguration][11] and [Object Lifecycle
-    # Management][12] in *Amazon Simple Storage Service Developer Guide*.
+    # Management][12] in *Amazon Simple Storage Service User Guide*.
     #
     # **Responses**
     #
-    # A successful operation returns either the `200 OK` or `202 Accepted`
+    # A successful action returns either the `200 OK` or `202 Accepted`
     # status code.
     #
     # * If the object is not previously restored, then Amazon S3 returns
@@ -12297,7 +12365,7 @@ module Aws::S3
     # * [GetBucketNotificationConfiguration][13]
     #
     # * [SQL Reference for Amazon S3 Select and S3 Glacier Select ][7] in
-    #   the *Amazon Simple Storage Service Developer Guide*
+    #   the *Amazon Simple Storage Service User Guide*
     #
     #
     #
@@ -12318,22 +12386,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name containing the object to restore.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -12341,7 +12409,7 @@ module Aws::S3
     #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
     #
     # @option params [required, String] :key
-    #   Object key for which the operation was initiated.
+    #   Object key for which the action was initiated.
     #
     # @option params [String] :version_id
     #   VersionId used to reference a specific version of the object.
@@ -12495,7 +12563,7 @@ module Aws::S3
       req.send_request(options)
     end
 
-    # This operation filters the contents of an Amazon S3 object based on a
+    # This action filters the contents of an Amazon S3 object based on a
     # simple structured query language (SQL) statement. In the request,
     # along with the SQL expression, you must also specify a data
     # serialization format (JSON, CSV, or Apache Parquet) of the object.
@@ -12506,12 +12574,11 @@ module Aws::S3
     # This action is not supported by Amazon S3 on Outposts.
     #
     # For more information about Amazon S3 Select, see [Selecting Content
-    # from Objects][1] in the *Amazon Simple Storage Service Developer
-    # Guide*.
+    # from Objects][1] in the *Amazon Simple Storage Service User Guide*.
     #
     # For more information about using SQL with Amazon S3 Select, see [ SQL
     # Reference for Amazon S3 Select and S3 Glacier Select][2] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -12520,7 +12587,7 @@ module Aws::S3
     # You must have `s3:GetObject` permission for this operation. Amazon S3
     # Select does not support anonymous access. For more information about
     # permissions, see [Specifying Permissions in a Policy][3] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -12548,7 +12615,7 @@ module Aws::S3
     #   keys (SSE-C), you must use HTTPS, and you must use the headers that
     #   are documented in the [GetObject][4]. For more information about
     #   SSE-C, see [Server-Side Encryption (Using Customer-Provided
-    #   Encryption Keys)][5] in the *Amazon Simple Storage Service Developer
+    #   Encryption Keys)][5] in the *Amazon Simple Storage Service User
     #   Guide*.
     #
     #   For objects that are encrypted with Amazon S3 managed encryption
@@ -12557,7 +12624,7 @@ module Aws::S3
     #   transparently, so you don't need to specify anything. For more
     #   information about server-side encryption, including SSE-S3 and
     #   SSE-KMS, see [Protecting Data Using Server-Side Encryption][6] in
-    #   the *Amazon Simple Storage Service Developer Guide*.
+    #   the *Amazon Simple Storage Service User Guide*.
     #
     # **Working with the Response Body**
     #
@@ -12570,7 +12637,7 @@ module Aws::S3
     #
     # **GetObject Support**
     #
-    # The `SelectObjectContent` operation does not support the following
+    # The `SelectObjectContent` action does not support the following
     # `GetObject` functionality. For more information, see [GetObject][4].
     #
     # * `Range`\: Although you can specify a scan range for an Amazon S3
@@ -12581,7 +12648,7 @@ module Aws::S3
     # * GLACIER, DEEP\_ARCHIVE and REDUCED\_REDUNDANCY storage classes: You
     #   cannot specify the GLACIER, DEEP\_ARCHIVE, or `REDUCED_REDUNDANCY`
     #   storage classes. For more information, about storage classes see
-    #   [Storage Classes][9] in the *Amazon Simple Storage Service Developer
+    #   [Storage Classes][9] in the *Amazon Simple Storage Service User
     #   Guide*.
     #
     #
@@ -12948,12 +13015,11 @@ module Aws::S3
     # parts storage and stops charging you for the parts storage.
     #
     # For more information on multipart uploads, go to [Multipart Upload
-    # Overview][4] in the <i>Amazon Simple Storage Service Developer Guide
-    # </i>.
+    # Overview][4] in the <i>Amazon Simple Storage Service User Guide </i>.
     #
     # For information on the permissions required to use the multipart
-    # upload API, go to [Multipart Upload API and Permissions][5] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # upload API, go to [Multipart Upload and Permissions][5] in the *Amazon
+    # Simple Storage Service User Guide*.
     #
     # You can optionally request server-side encryption where Amazon S3
     # encrypts your data as it writes it to disks in its data centers and
@@ -12963,8 +13029,8 @@ module Aws::S3
     # request headers you provide in the request must match the headers you
     # used in the request to initiate the upload by using
     # [CreateMultipartUpload][2]. For more information, go to [Using
-    # Server-Side Encryption][6] in the *Amazon Simple Storage Service
-    # Developer Guide*.
+    # Server-Side Encryption][6] in the *Amazon Simple Storage Service User
+    # Guide*.
     #
     # Server-side encryption is supported by the S3 Multipart Upload
     # actions. Unless you are using a customer-provided encryption key, you
@@ -13027,22 +13093,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The name of the bucket to which the multipart upload was initiated.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -13175,10 +13241,10 @@ module Aws::S3
     #
     # The minimum allowable part size for a multipart upload is 5 MB. For
     # more information about multipart upload limits, go to [Quick Facts][1]
-    # in the *Amazon Simple Storage Service Developer Guide*.
+    # in the *Amazon Simple Storage Service User Guide*.
     #
     # <note markdown="1"> Instead of using an existing object as part data, you might use the
-    # [UploadPart][2] operation and provide data in your request.
+    # [UploadPart][2] action and provide data in your request.
     #
     #  </note>
     #
@@ -13192,15 +13258,15 @@ module Aws::S3
     #
     # * For conceptual information about multipart uploads, see [Uploading
     #   Objects Using Multipart Upload][3] in the *Amazon Simple Storage
-    #   Service Developer Guide*.
+    #   Service User Guide*.
     #
     # * For information about permissions required to use the multipart
-    #   upload API, see [Multipart Upload API and Permissions][4] in the
-    #   *Amazon Simple Storage Service Developer Guide*.
+    #   upload API, see [Multipart Upload and Permissions][4] in the *Amazon
+    #   Simple Storage Service User Guide*.
     #
-    # * For information about copying objects using a single atomic
-    #   operation vs. the multipart upload, see [Operations on Objects][5]
-    #   in the *Amazon Simple Storage Service Developer Guide*.
+    # * For information about copying objects using a single atomic action
+    #   vs. the multipart upload, see [Operations on Objects][5] in the
+    #   *Amazon Simple Storage Service User Guide*.
     #
     # * For information about using server-side encryption with
     #   customer-provided encryption keys with the UploadPartCopy operation,
@@ -13302,22 +13368,22 @@ module Aws::S3
     # @option params [required, String] :bucket
     #   The bucket name.
     #
-    #   When using this API with an access point, you must direct requests to
-    #   the access point hostname. The access point hostname takes the form
+    #   When using this action with an access point, you must direct requests
+    #   to the access point hostname. The access point hostname takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this operation with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For more
+    #   When using this action with an access point through the AWS SDKs, you
+    #   provide the access point ARN in place of the bucket name. For more
     #   information about access point ARNs, see [Using Access Points][1] in
     #   the *Amazon Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this operation using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon Simple Storage Service Developer Guide*.
+    #   When using this action using S3 on Outposts through the AWS SDKs, you
+    #   provide the Outposts bucket ARN in place of the bucket name. For more
+    #   information about S3 on Outposts ARNs, see [Using S3 on Outposts][2]
+    #   in the *Amazon Simple Storage Service Developer Guide*.
     #
     #
     #
@@ -13466,45 +13532,45 @@ module Aws::S3
     #   * {Types::UploadPartCopyOutput#request_charged #request_charged} => String
     #
     #
-    # @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"), 
     #     }, 
     #   }
     #
-    # @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"), 
     #     }, 
     #   }
     #
@@ -13566,7 +13632,7 @@ module Aws::S3
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.87.0'
+      context[:gem_version] = '1.90.0'
       Seahorse::Client::Request.new(handlers, context)
     end