From 6699ef962c4fe45c12c66a13d5d28a15eca9807b Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Thu, 16 Jan 2025 12:53:57 -0500
Subject: [PATCH 1/2] Replaced /my-bucket/ with amzn-s3-demo-bucket

---
 .../cloudtrail/create-subscription.rst        |  64 ++---
 awscli/examples/cloudtrail/create-trail.rst   |  32 +--
 .../examples/cloudtrail/describe-trails.rst   |  68 +++---
 .../cloudtrail/update-subscription.rst        |  58 ++---
 awscli/examples/cloudtrail/update-trail.rst   |  30 +--
 .../codepipeline/list-action-executions.rst   | 228 +++++++++---------
 .../ec2/create-spot-datafeed-subscription.rst |  46 ++--
 .../create-application-version.rst            |   6 +-
 .../examples/kendra/describe-data-source.rst  | 166 ++++++-------
 .../delete-bucket-analytics-configuration.rst |   2 +-
 .../delete-bucket-metrics-configuration.rst   |   2 +-
 .../delete-public-access-block.rst            |   2 +-
 .../get-bucket-analytics-configuration.rst    |   2 +-
 .../get-bucket-metrics-configuration.rst      |   2 +-
 .../networkmanager/get-object-retention.rst   |   2 +-
 .../get-public-access-block.rst               |   2 +-
 .../list-bucket-analytics-configurations.rst  |   2 +-
 .../list-bucket-metrics-configurations.rst    |   2 +-
 .../put-bucket-metrics-configuration.rst      |   2 +-
 .../networkmanager/put-object-retention.rst   |   2 +-
 .../put-public-access-block.rst               |   2 +-
 .../create-robot-application-version.rst      |   2 +-
 .../robomaker/create-robot-application.rst    |   4 +-
 .../create-simulation-application-version.rst |   2 +-
 .../create-simulation-application.rst         |   4 +-
 .../robomaker/describe-robot-application.rst  |   2 +-
 .../describe-simulation-application.rst       |   2 +-
 .../robomaker/update-robot-application.rst    |   4 +-
 .../update-simulation-application.rst         |   4 +-
 awscli/examples/s3/website.rst                |   4 +-
 .../examples/s3api/abort-multipart-upload.rst |   4 +-
 .../s3api/complete-multipart-upload.rst       |   8 +-
 awscli/examples/s3api/create-bucket.rst       |  18 +-
 .../s3api/create-multipart-upload.rst         |   8 +-
 .../delete-bucket-analytics-configuration.rst |   2 +-
 awscli/examples/s3api/delete-bucket-cors.rst  |   4 +-
 .../s3api/delete-bucket-encryption.rst        |   2 +-
 .../delete-bucket-inventory-configuration.rst |   2 +-
 .../s3api/delete-bucket-lifecycle.rst         |   4 +-
 .../delete-bucket-metrics-configuration.rst   |   2 +-
 .../examples/s3api/delete-bucket-policy.rst   |   4 +-
 .../s3api/delete-bucket-replication.rst       |   4 +-
 .../examples/s3api/delete-bucket-tagging.rst  |   4 +-
 .../examples/s3api/delete-bucket-website.rst  |   4 +-
 awscli/examples/s3api/delete-bucket.rst       |   4 +-
 .../examples/s3api/delete-object-tagging.rst  |   2 +-
 awscli/examples/s3api/delete-object.rst       |   4 +-
 awscli/examples/s3api/delete-objects.rst      |   4 +-
 .../s3api/delete-public-access-block.rst      |   2 +-
 .../get-bucket-accelerate-configuration.rst   |   2 +-
 awscli/examples/s3api/get-bucket-acl.rst      |   4 +-
 .../get-bucket-analytics-configuration.rst    |   2 +-
 awscli/examples/s3api/get-bucket-cors.rst     |   4 +-
 .../examples/s3api/get-bucket-encryption.rst  |   4 +-
 .../get-bucket-inventory-configuration.rst    |   4 +-
 .../get-bucket-lifecycle-configuration.rst    |   4 +-
 .../examples/s3api/get-bucket-lifecycle.rst   |   4 +-
 awscli/examples/s3api/get-bucket-location.rst |   4 +-
 awscli/examples/s3api/get-bucket-logging.rst  |   4 +-
 .../get-bucket-metrics-configuration.rst      |   2 +-
 .../get-bucket-notification-configuration.rst |   4 +-
 .../s3api/get-bucket-notification.rst         |   4 +-
 .../s3api/get-bucket-policy-status.rst        |   4 +-
 awscli/examples/s3api/get-bucket-policy.rst   |   6 +-
 .../examples/s3api/get-bucket-replication.rst |   6 +-
 .../s3api/get-bucket-request-payment.rst      |   2 +-
 awscli/examples/s3api/get-bucket-tagging.rst  |   4 +-
 .../examples/s3api/get-bucket-versioning.rst  |   4 +-
 awscli/examples/s3api/get-bucket-website.rst  |   4 +-
 awscli/examples/s3api/get-object-acl.rst      |   4 +-
 .../examples/s3api/get-object-attributes.rst  |   2 +-
 .../examples/s3api/get-object-legal-hold.rst  |   2 +-
 .../s3api/get-object-lock-configuration.rst   |   2 +-
 .../examples/s3api/get-object-retention.rst   |   2 +-
 awscli/examples/s3api/get-object-tagging.rst  |   6 +-
 awscli/examples/s3api/get-object-torrent.rst  |   4 +-
 .../s3api/get-public-access-block.rst         |   2 +-
 awscli/examples/s3api/head-bucket.rst         |   4 +-
 awscli/examples/s3api/head-object.rst         |   4 +-
 .../list-bucket-analytics-configurations.rst  |   2 +-
 .../list-bucket-inventory-configurations.rst  |   6 +-
 .../list-bucket-metrics-configurations.rst    |   2 +-
 .../examples/s3api/list-multipart-uploads.rst |   4 +-
 .../examples/s3api/list-object-versions.rst   |   4 +-
 awscli/examples/s3api/list-objects-v2.rst     |   2 +-
 awscli/examples/s3api/list-parts.rst          |   4 +-
 .../put-bucket-accelerate-configuration.rst   |   2 +-
 .../put-bucket-analytics-configuration.rst    |   2 +-
 .../examples/s3api/put-bucket-encryption.rst  |   2 +-
 .../put-bucket-inventory-configuration.rst    |  12 +-
 .../put-bucket-lifecycle-configuration.rst    |   4 +-
 .../examples/s3api/put-bucket-lifecycle.rst   |   4 +-
 .../put-bucket-metrics-configuration.rst      |   2 +-
 .../put-bucket-notification-configuration.rst |  88 +++----
 .../s3api/put-bucket-notification.rst         |   8 +-
 .../s3api/put-bucket-request-payment.rst      |   4 +-
 awscli/examples/s3api/put-bucket-tagging.rst  |   8 +-
 .../examples/s3api/put-bucket-versioning.rst  |   6 +-
 awscli/examples/s3api/put-bucket-website.rst  |   4 +-
 .../examples/s3api/put-object-legal-hold.rst  |   2 +-
 .../s3api/put-object-lock-configuration.rst   |   2 +-
 .../examples/s3api/put-object-retention.rst   |   2 +-
 awscli/examples/s3api/put-object-tagging.rst  |   4 +-
 .../s3api/put-public-access-block.rst         |   2 +-
 .../examples/s3api/select-object-content.rst  |   2 +-
 awscli/examples/s3api/upload-part-copy.rst    |   4 +-
 awscli/examples/s3api/upload-part.rst         |   2 +-
 awscli/examples/s3api/wait/bucket-exists.rst  |   2 +-
 .../examples/s3api/wait/bucket-not-exists.rst |   2 +-
 awscli/examples/s3api/wait/object-exists.rst  |   2 +-
 .../examples/s3api/wait/object-not-exists.rst |   2 +-
 111 files changed, 571 insertions(+), 571 deletions(-)

diff --git a/awscli/examples/cloudtrail/create-subscription.rst b/awscli/examples/cloudtrail/create-subscription.rst
index b3f2fc0ea4a3..6a8239048679 100644
--- a/awscli/examples/cloudtrail/create-subscription.rst
+++ b/awscli/examples/cloudtrail/create-subscription.rst
@@ -1,32 +1,32 @@
-**To create and configure AWS resources for a trail**
-
-The following ``create-subscription`` command creates a new S3 bucket and SNS topic for ``Trail1``::
-
-  aws cloudtrail create-subscription --name Trail1 --s3-new-bucket my-bucket --sns-new-topic my-topic
-
-Output::
-
-  Setting up new S3 bucket my-bucket...
-  Setting up new SNS topic my-topic...
-  Creating/updating CloudTrail configuration...
-  CloudTrail configuration:
-  {
-  "trailList": [ 
-    {
-      "IncludeGlobalServiceEvents": true, 
-      "Name": "Trail1", 
-      "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
-      "LogFileValidationEnabled": false, 
-      "IsMultiRegionTrail": false, 
-      "S3BucketName": "my-bucket", 
-      "SnsTopicName": "my-topic", 
-      "HomeRegion": "us-east-1"
-    }
-  ], 
-  "ResponseMetadata": {
-  "HTTPStatusCode": 200, 
-  "RequestId": "f39e51f6-c615-11e5-85bd-d35ca21ee3e2"
-  }
-  }
-  Starting CloudTrail service...
-  Logs will be delivered to my-bucket
\ No newline at end of file
+**To create and configure AWS resources for a trail**
+
+The following ``create-subscription`` command creates a new S3 bucket and SNS topic for ``Trail1``::
+
+  aws cloudtrail create-subscription --name Trail1 --s3-new-bucket amzn-s3-demo-bucket --sns-new-topic my-topic
+
+Output::
+
+  Setting up new S3 bucket amzn-s3-demo-bucket...
+  Setting up new SNS topic my-topic...
+  Creating/updating CloudTrail configuration...
+  CloudTrail configuration:
+  {
+  "trailList": [ 
+    {
+      "IncludeGlobalServiceEvents": true, 
+      "Name": "Trail1", 
+      "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
+      "LogFileValidationEnabled": false, 
+      "IsMultiRegionTrail": false, 
+      "S3BucketName": "amzn-s3-demo-bucket", 
+      "SnsTopicName": "my-topic", 
+      "HomeRegion": "us-east-1"
+    }
+  ], 
+  "ResponseMetadata": {
+  "HTTPStatusCode": 200, 
+  "RequestId": "f39e51f6-c615-11e5-85bd-d35ca21ee3e2"
+  }
+  }
+  Starting CloudTrail service...
+  Logs will be delivered to amzn-s3-demo-bucket
\ No newline at end of file
diff --git a/awscli/examples/cloudtrail/create-trail.rst b/awscli/examples/cloudtrail/create-trail.rst
index 95d33cbedde7..ace2f1b1e8a0 100644
--- a/awscli/examples/cloudtrail/create-trail.rst
+++ b/awscli/examples/cloudtrail/create-trail.rst
@@ -1,17 +1,17 @@
-**To create a trail**
-
-The following ``create-trail`` command creates a multi-region trail named ``Trail1`` and specifies an S3 bucket::
-
-  aws cloudtrail create-trail --name Trail1 --s3-bucket-name my-bucket --is-multi-region-trail
-
-Output::
-
-  {
-    "IncludeGlobalServiceEvents": true, 
-    "Name": "Trail1", 
-    "TrailARN": "arn:aws:cloudtrail:us-west-2:123456789012:trail/Trail1", 
-    "LogFileValidationEnabled": false, 
-    "IsMultiRegionTrail": true, 
-    "S3BucketName": "my-bucket"
-  }
+**To create a trail**
+
+The following ``create-trail`` command creates a multi-region trail named ``Trail1`` and specifies an S3 bucket::
+
+  aws cloudtrail create-trail --name Trail1 --s3-bucket-name amzn-s3-demo-bucket --is-multi-region-trail
+
+Output::
+
+  {
+    "IncludeGlobalServiceEvents": true, 
+    "Name": "Trail1", 
+    "TrailARN": "arn:aws:cloudtrail:us-west-2:123456789012:trail/Trail1", 
+    "LogFileValidationEnabled": false, 
+    "IsMultiRegionTrail": true, 
+    "S3BucketName": "amzn-s3-demo-bucket"
+  }
  
\ No newline at end of file
diff --git a/awscli/examples/cloudtrail/describe-trails.rst b/awscli/examples/cloudtrail/describe-trails.rst
index f09a67b50ff1..101fe969fd16 100644
--- a/awscli/examples/cloudtrail/describe-trails.rst
+++ b/awscli/examples/cloudtrail/describe-trails.rst
@@ -1,35 +1,35 @@
-**To describe a trail**
-
-The following ``describe-trails`` command returns the settings for ``Trail1`` and ``Trail2``::
-
-  aws cloudtrail describe-trails --trail-name-list Trail1 Trail2
-
-Output::
-
-  {
-   "trailList": [
-       {
-           "IncludeGlobalServiceEvents": true, 
-           "Name": "Trail1", 
-           "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
-           "LogFileValidationEnabled": false, 
-           "IsMultiRegionTrail": false, 
-           "S3BucketName": "my-bucket", 
-           "CloudWatchLogsRoleArn": "arn:aws:iam::123456789012:role/CloudTrail_CloudWatchLogs_Role", 
-           "CloudWatchLogsLogGroupArn": "arn:aws:logs:us-east-1:123456789012:log-group:CloudTrail:*", 
-           "SnsTopicName": "my-topic", 
-           "HomeRegion": "us-east-1"
-       }, 
-       {
-           "IncludeGlobalServiceEvents": true, 
-           "Name": "Trail2", 
-           "S3KeyPrefix": "my-prefix", 
-           "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail2", 
-           "LogFileValidationEnabled": false, 
-           "IsMultiRegionTrail": false, 
-           "S3BucketName": "my-bucket", 
-           "KmsKeyId": "arn:aws:kms:us-east-1:123456789012:key/4c5ae5ac-3c13-421e-8335-c7868ef6a769", 
-           "HomeRegion": "us-east-1"
-       }
-    ]
+**To describe a trail**
+
+The following ``describe-trails`` command returns the settings for ``Trail1`` and ``Trail2``::
+
+  aws cloudtrail describe-trails --trail-name-list Trail1 Trail2
+
+Output::
+
+  {
+   "trailList": [
+       {
+           "IncludeGlobalServiceEvents": true, 
+           "Name": "Trail1", 
+           "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
+           "LogFileValidationEnabled": false, 
+           "IsMultiRegionTrail": false, 
+           "S3BucketName": "amzn-s3-demo-bucket", 
+           "CloudWatchLogsRoleArn": "arn:aws:iam::123456789012:role/CloudTrail_CloudWatchLogs_Role", 
+           "CloudWatchLogsLogGroupArn": "arn:aws:logs:us-east-1:123456789012:log-group:CloudTrail:*", 
+           "SnsTopicName": "my-topic", 
+           "HomeRegion": "us-east-1"
+       }, 
+       {
+           "IncludeGlobalServiceEvents": true, 
+           "Name": "Trail2", 
+           "S3KeyPrefix": "my-prefix", 
+           "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail2", 
+           "LogFileValidationEnabled": false, 
+           "IsMultiRegionTrail": false, 
+           "S3BucketName": "amzn-s3-demo-bucket", 
+           "KmsKeyId": "arn:aws:kms:us-east-1:123456789012:key/4c5ae5ac-3c13-421e-8335-c7868ef6a769", 
+           "HomeRegion": "us-east-1"
+       }
+    ]
   }
\ No newline at end of file
diff --git a/awscli/examples/cloudtrail/update-subscription.rst b/awscli/examples/cloudtrail/update-subscription.rst
index fb0316a5f89b..bb7cdd0ba495 100644
--- a/awscli/examples/cloudtrail/update-subscription.rst
+++ b/awscli/examples/cloudtrail/update-subscription.rst
@@ -1,30 +1,30 @@
-**To update the configuration settings for a trail**
-
-The following ``update-subscription`` command updates the trail to specify a new S3 bucket and SNS topic::
-
-  aws cloudtrail update-subscription --name Trail1 --s3-new-bucket my-bucket-new --sns-new-topic my-topic-new
-
-Output::
-
-  Setting up new S3 bucket my-bucket-new...
-  Setting up new SNS topic my-topic-new...
-  Creating/updating CloudTrail configuration...
-  CloudTrail configuration:
-  {
-  "trailList": [
-    {
-      "IncludeGlobalServiceEvents": true, 
-      "Name": "Trail1", 
-      "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
-      "LogFileValidationEnabled": false, 
-      "IsMultiRegionTrail": false, 
-      "S3BucketName": "my-bucket-new", 
-      "SnsTopicName": "my-topic-new", 
-      "HomeRegion": "us-east-1"
-    }
-  ], 
-  "ResponseMetadata": {
-  "HTTPStatusCode": 200, 
-  "RequestId": "31126f8a-c616-11e5-9cc6-2fd637936879"
-  }
+**To update the configuration settings for a trail**
+
+The following ``update-subscription`` command updates the trail to specify a new S3 bucket and SNS topic::
+
+  aws cloudtrail update-subscription --name Trail1 --s3-new-bucket amzn-s3-demo-bucket-new --sns-new-topic my-topic-new
+
+Output::
+
+  Setting up new S3 bucket amzn-s3-demo-bucket-new...
+  Setting up new SNS topic my-topic-new...
+  Creating/updating CloudTrail configuration...
+  CloudTrail configuration:
+  {
+  "trailList": [
+    {
+      "IncludeGlobalServiceEvents": true, 
+      "Name": "Trail1", 
+      "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
+      "LogFileValidationEnabled": false, 
+      "IsMultiRegionTrail": false, 
+      "S3BucketName": "amzn-s3-demo-bucket-new", 
+      "SnsTopicName": "my-topic-new", 
+      "HomeRegion": "us-east-1"
+    }
+  ], 
+  "ResponseMetadata": {
+  "HTTPStatusCode": 200, 
+  "RequestId": "31126f8a-c616-11e5-9cc6-2fd637936879"
+  }
   }
\ No newline at end of file
diff --git a/awscli/examples/cloudtrail/update-trail.rst b/awscli/examples/cloudtrail/update-trail.rst
index 37539b0b9849..c0c8d4351987 100644
--- a/awscli/examples/cloudtrail/update-trail.rst
+++ b/awscli/examples/cloudtrail/update-trail.rst
@@ -1,16 +1,16 @@
-**To update a trail**
-
-The following ``update-trail`` command updates a trail to use an existing bucket for log delivery::
-
-  aws cloudtrail update-trail --name Trail1 --s3-bucket-name my-bucket
-
-Output::
-
-  {
-    "IncludeGlobalServiceEvents": true, 
-    "Name": "Trail1", 
-    "TrailARN": "arn:aws:cloudtrail:us-west-2:123456789012:trail/Trail1", 
-    "LogFileValidationEnabled": false, 
-    "IsMultiRegionTrail": true, 
-    "S3BucketName": "my-bucket"
+**To update a trail**
+
+The following ``update-trail`` command updates a trail to use an existing bucket for log delivery::
+
+  aws cloudtrail update-trail --name Trail1 --s3-bucket-name amzn-s3-demo-bucket
+
+Output::
+
+  {
+    "IncludeGlobalServiceEvents": true, 
+    "Name": "Trail1", 
+    "TrailARN": "arn:aws:cloudtrail:us-west-2:123456789012:trail/Trail1", 
+    "LogFileValidationEnabled": false, 
+    "IsMultiRegionTrail": true, 
+    "S3BucketName": "amzn-s3-demo-bucket"
   }
\ No newline at end of file
diff --git a/awscli/examples/codepipeline/list-action-executions.rst b/awscli/examples/codepipeline/list-action-executions.rst
index 907ef50fd54d..f5b7503650ad 100644
--- a/awscli/examples/codepipeline/list-action-executions.rst
+++ b/awscli/examples/codepipeline/list-action-executions.rst
@@ -1,115 +1,115 @@
-**To list action executions**
-
-The following ``list-action-executions`` example views action execution details for a pipeline, such as action execution ID, input artifacts, output artifacts, execution result, and status. ::
-
-    aws codepipeline list-action-executions \
-        --pipeline-name myPipeline
-
-Output::
-
-    {
-        "actionExecutionDetails": [
-            {
-                "pipelineExecutionId": "EXAMPLE0-adfc-488e-bf4c-1111111720d3",
-                "actionExecutionId": "EXAMPLE4-2ee8-4853-bd6a-111111158148",
-                "pipelineVersion": 12,
-                "stageName": "Deploy",
-                "actionName": "Deploy",
-                "startTime": 1598572628.6,
-                "lastUpdateTime": 1598572661.255,
-                "status": "Succeeded",
-                "input": {
-                    "actionTypeId": {
-                        "category": "Deploy",
-                        "owner": "AWS",
-                        "provider": "CodeDeploy",
-                        "version": "1"
-                    },
-                    "configuration": {
-                        "ApplicationName": "my-application",
-                        "DeploymentGroupName": "my-deployment-group"
-                    },
-                    "resolvedConfiguration": {
-                        "ApplicationName": "my-application",
-                        "DeploymentGroupName": "my-deployment-group"
-                    },
-                    "region": "us-east-1",
-                    "inputArtifacts": [
-                        {
-                            "name": "SourceArtifact",
-                            "s3location": {
-                                "bucket": "artifact-bucket",
-                                "key": "myPipeline/SourceArti/key"
-                            }
-                        }
-                    ],
-                    "namespace": "DeployVariables"
-                },
-                "output": {
-                    "outputArtifacts": [],
-                    "executionResult": {
-                        "externalExecutionId": "d-EXAMPLEE5",
-                        "externalExecutionSummary": "Deployment Succeeded",
-                        "externalExecutionUrl": "https://myaddress.com"
-                    },
-                    "outputVariables": {}
-                }
-            },
-            {
-                "pipelineExecutionId": "EXAMPLE0-adfc-488e-bf4c-1111111720d3",
-                "actionExecutionId": "EXAMPLE5-abb4-4192-9031-11111113a7b0",
-                "pipelineVersion": 12,
-                "stageName": "Source",
-                "actionName": "Source",
-                "startTime": 1598572624.387,
-                "lastUpdateTime": 1598572628.16,
-                "status": "Succeeded",
-                "input": {
-                    "actionTypeId": {
-                        "category": "Source",
-                        "owner": "AWS",
-                        "provider": "CodeCommit",
-                        "version": "1"
-                    },
-                    "configuration": {
-                        "BranchName": "production",
-                        "PollForSourceChanges": "false",
-                        "RepositoryName": "my-repo"
-                    },
-                    "resolvedConfiguration": {
-                        "BranchName": "production",
-                        "PollForSourceChanges": "false",
-                        "RepositoryName": "my-repo"
-                    },
-                    "region": "us-east-1",
-                    "inputArtifacts": [],
-                    "namespace": "SourceVariables"
-                },
-                "output": {
-                    "outputArtifacts": [
-                        {
-                            "name": "SourceArtifact",
-                            "s3location": {
-                                "bucket": "my-bucket",
-                                "key": "myPipeline/SourceArti/key"
-                            }
-                        }
-                    ],
-                    "executionResult": {
-                        "externalExecutionId": "1111111ad99dcd35914c00b7fbea13995EXAMPLE",
-                        "externalExecutionSummary": "Edited template.yml",
-                        "externalExecutionUrl": "https://myaddress.com"
-                    },
-                    "outputVariables": {
-                        "AuthorDate": "2020-05-08T17:45:43Z",
-                        "BranchName": "production",
-                        "CommitId": "EXAMPLEad99dcd35914c00b7fbea139951111111",
-                        "CommitMessage": "Edited template.yml",
-                        "CommitterDate": "2020-05-08T17:45:43Z",
-                        "RepositoryName": "my-repo"
-                    }
-                }
-            },
-    . . . .
-
+**To list action executions**
+
+The following ``list-action-executions`` example views action execution details for a pipeline, such as action execution ID, input artifacts, output artifacts, execution result, and status. ::
+
+    aws codepipeline list-action-executions \
+        --pipeline-name myPipeline
+
+Output::
+
+    {
+        "actionExecutionDetails": [
+            {
+                "pipelineExecutionId": "EXAMPLE0-adfc-488e-bf4c-1111111720d3",
+                "actionExecutionId": "EXAMPLE4-2ee8-4853-bd6a-111111158148",
+                "pipelineVersion": 12,
+                "stageName": "Deploy",
+                "actionName": "Deploy",
+                "startTime": 1598572628.6,
+                "lastUpdateTime": 1598572661.255,
+                "status": "Succeeded",
+                "input": {
+                    "actionTypeId": {
+                        "category": "Deploy",
+                        "owner": "AWS",
+                        "provider": "CodeDeploy",
+                        "version": "1"
+                    },
+                    "configuration": {
+                        "ApplicationName": "my-application",
+                        "DeploymentGroupName": "my-deployment-group"
+                    },
+                    "resolvedConfiguration": {
+                        "ApplicationName": "my-application",
+                        "DeploymentGroupName": "my-deployment-group"
+                    },
+                    "region": "us-east-1",
+                    "inputArtifacts": [
+                        {
+                            "name": "SourceArtifact",
+                            "s3location": {
+                                "bucket": "artifact-bucket",
+                                "key": "myPipeline/SourceArti/key"
+                            }
+                        }
+                    ],
+                    "namespace": "DeployVariables"
+                },
+                "output": {
+                    "outputArtifacts": [],
+                    "executionResult": {
+                        "externalExecutionId": "d-EXAMPLEE5",
+                        "externalExecutionSummary": "Deployment Succeeded",
+                        "externalExecutionUrl": "https://myaddress.com"
+                    },
+                    "outputVariables": {}
+                }
+            },
+            {
+                "pipelineExecutionId": "EXAMPLE0-adfc-488e-bf4c-1111111720d3",
+                "actionExecutionId": "EXAMPLE5-abb4-4192-9031-11111113a7b0",
+                "pipelineVersion": 12,
+                "stageName": "Source",
+                "actionName": "Source",
+                "startTime": 1598572624.387,
+                "lastUpdateTime": 1598572628.16,
+                "status": "Succeeded",
+                "input": {
+                    "actionTypeId": {
+                        "category": "Source",
+                        "owner": "AWS",
+                        "provider": "CodeCommit",
+                        "version": "1"
+                    },
+                    "configuration": {
+                        "BranchName": "production",
+                        "PollForSourceChanges": "false",
+                        "RepositoryName": "my-repo"
+                    },
+                    "resolvedConfiguration": {
+                        "BranchName": "production",
+                        "PollForSourceChanges": "false",
+                        "RepositoryName": "my-repo"
+                    },
+                    "region": "us-east-1",
+                    "inputArtifacts": [],
+                    "namespace": "SourceVariables"
+                },
+                "output": {
+                    "outputArtifacts": [
+                        {
+                            "name": "SourceArtifact",
+                            "s3location": {
+                                "bucket": "amzn-s3-demo-bucket",
+                                "key": "myPipeline/SourceArti/key"
+                            }
+                        }
+                    ],
+                    "executionResult": {
+                        "externalExecutionId": "1111111ad99dcd35914c00b7fbea13995EXAMPLE",
+                        "externalExecutionSummary": "Edited template.yml",
+                        "externalExecutionUrl": "https://myaddress.com"
+                    },
+                    "outputVariables": {
+                        "AuthorDate": "2020-05-08T17:45:43Z",
+                        "BranchName": "production",
+                        "CommitId": "EXAMPLEad99dcd35914c00b7fbea139951111111",
+                        "CommitMessage": "Edited template.yml",
+                        "CommitterDate": "2020-05-08T17:45:43Z",
+                        "RepositoryName": "my-repo"
+                    }
+                }
+            },
+    . . . .
+
 For more information, see `View action executions (CLI) <https://docs.aws.amazon.com/codepipeline/latest/userguide/pipelines-view-cli.html#pipelines-action-executions-cli>`__ in the *AWS CodePipeline User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ec2/create-spot-datafeed-subscription.rst b/awscli/examples/ec2/create-spot-datafeed-subscription.rst
index 9f644f9e6b38..e2937f46370f 100644
--- a/awscli/examples/ec2/create-spot-datafeed-subscription.rst
+++ b/awscli/examples/ec2/create-spot-datafeed-subscription.rst
@@ -1,24 +1,24 @@
-**To create a Spot Instance data feed**
-
-The following ``create-spot-datafeed-subscription`` example creates a Spot Instance data feed. ::
-
-    aws ec2 create-spot-datafeed-subscription \
-        --bucket my-bucket \
-        --prefix spot-data-feed
-
-Output::
-
-    {
-        "SpotDatafeedSubscription": {
-            "Bucket": "my-bucket",
-            "OwnerId": "123456789012",
-            "Prefix": "spot-data-feed",
-            "State": "Active"
-        }
-    }
-
-The data feed is stored in the Amazon S3 bucket that you specified. The file names for this data feed have the following format. ::
-
-    my-bucket.s3.amazonaws.com/spot-data-feed/123456789012.YYYY-MM-DD-HH.n.abcd1234.gz
-
+**To create a Spot Instance data feed**
+
+The following ``create-spot-datafeed-subscription`` example creates a Spot Instance data feed. ::
+
+    aws ec2 create-spot-datafeed-subscription \
+        --bucket amzn-s3-demo-bucket \
+        --prefix spot-data-feed
+
+Output::
+
+    {
+        "SpotDatafeedSubscription": {
+            "Bucket": "amzn-s3-demo-bucket",
+            "OwnerId": "123456789012",
+            "Prefix": "spot-data-feed",
+            "State": "Active"
+        }
+    }
+
+The data feed is stored in the Amazon S3 bucket that you specified. The file names for this data feed have the following format. ::
+
+    amzn-s3-demo-bucket.s3.amazonaws.com/spot-data-feed/123456789012.YYYY-MM-DD-HH.n.abcd1234.gz
+
 For more information, see `Spot Instance data feed <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html>`__ in the *Amazon Elastic Compute Cloud User Guide for Linux Instances*.
\ No newline at end of file
diff --git a/awscli/examples/elasticbeanstalk/create-application-version.rst b/awscli/examples/elasticbeanstalk/create-application-version.rst
index cf504b44965a..1043b7eb7629 100644
--- a/awscli/examples/elasticbeanstalk/create-application-version.rst
+++ b/awscli/examples/elasticbeanstalk/create-application-version.rst
@@ -2,9 +2,9 @@
 
 The following command creates a new version, "v1" of an application named "MyApp"::
 
-  aws elasticbeanstalk create-application-version --application-name MyApp --version-label v1 --description MyAppv1 --source-bundle S3Bucket="my-bucket",S3Key="sample.war" --auto-create-application
+  aws elasticbeanstalk create-application-version --application-name MyApp --version-label v1 --description MyAppv1 --source-bundle S3Bucket="amzn-s3-demo-bucket",S3Key="sample.war" --auto-create-application
 
-The application will be created automatically if it does not already exist, due to the auto-create-application option. The source bundle is a .war file stored in an s3 bucket named "my-bucket" that contains the Apache Tomcat sample application.
+The application will be created automatically if it does not already exist, due to the auto-create-application option. The source bundle is a .war file stored in an s3 bucket named "amzn-s3-demo-bucket" that contains the Apache Tomcat sample application.
 
 Output::
 
@@ -16,7 +16,7 @@ Output::
         "DateCreated": "2015-02-03T23:01:25.412Z",
         "DateUpdated": "2015-02-03T23:01:25.412Z",
         "SourceBundle": {
-            "S3Bucket": "my-bucket",
+            "S3Bucket": "amzn-s3-demo-bucket",
             "S3Key": "sample.war"
         }
     }
diff --git a/awscli/examples/kendra/describe-data-source.rst b/awscli/examples/kendra/describe-data-source.rst
index a950e80ca680..c3345102946d 100644
--- a/awscli/examples/kendra/describe-data-source.rst
+++ b/awscli/examples/kendra/describe-data-source.rst
@@ -1,84 +1,84 @@
-**To get information about an Amazon Kendra data source connector**
-
-The following ``describe-data-source`` gets information about an Amazon Kendra data soource connector. You can view the configuration of a data source connector, and read any error messages if the status shows a data source connector "FAILED" to completely create. ::
-
-    aws kendra describe-data-source \
-        --id exampledatasource1 \
-        --index-id exampleindex1
-
-Output::
-
-    {
-        "Configuration": {
-            "TemplateConfiguration": {
-                "Template": {
-                    "connectionConfiguration": {
-                        "repositoryEndpointMetadata": {
-                            "BucketName": "my-bucket"
-                        }
-                    },
-                    "repositoryConfigurations": {
-                        "document":{
-                            "fieldMappings": [
-                                {
-                                    "indexFieldName":"_document_title",
-                                    "indexFieldType":"STRING",
-                                    "dataSourceFieldName": "title"
-                                },
-                                {
-                                    "indexFieldName":"_last_updated_at",
-                                    "indexFieldType":"DATE",
-                                    "dataSourceFieldName": "modified_date"
-                                }
-                            ]
-                        }
-                    },
-                    "additionalProperties": {
-                        "inclusionPatterns": [
-                            "*.txt",
-                            "*.doc",
-                            "*.docx"
-                        ],
-                        "exclusionPatterns": [
-                            "*.json"
-                        ],
-                        "inclusionPrefixes": [
-                            "PublicExampleDocsFolder"
-                        ],
-                        "exclusionPrefixes": [
-                            "PrivateDocsFolder/private"
-                        ],
-                        "aclConfigurationFilePath": "ExampleDocsFolder/AclConfig.json",
-                        "metadataFilesPrefix": "metadata"
-                    },
-                    "syncMode": "FULL_CRAWL",
-                    "type" : "S3",
-                    "version": "1.0.0"
-                }
-            }
-        },
-        "CreatedAt": 2024-02-25T13:30:10+00:00,
-        "CustomDocumentEnrichmentConfiguration": {
-            "PostExtractionHookConfiguration": {
-                "LambdaArn": "arn:aws:iam::my-account-id:function/my-function-ocr-docs",
-                "S3Bucket": "s3://my-s3-bucket/scanned-image-text-example-docs/function"
-            },
-            "RoleArn": "arn:aws:iam:my-account-id:role/KendraRoleForCDE"
-        }
-        "Description": "Example data source 1 for example index 1 contains the first set of example documents",
-        "Id": exampledatasource1,
-        "IndexId": exampleindex1,
-        "LanguageCode": "en",
-        "Name": "example data source 1",
-        "RoleArn": "arn:aws:iam::my-account-id:role/KendraRoleForS3TemplateConfigDataSource",
-        "Schedule": "0 0 18 ? * TUE,MON,WED,THU,FRI,SAT *",
-        "Status": "ACTIVE",
-        "Type": "TEMPLATE",
-        "UpdatedAt": 1709163615,
-        "VpcConfiguration": {
-            "SecurityGroupIds": ["sg-1234567890abcdef0"],
-            "SubnetIds": ["subnet-1c234","subnet-2b134"]
-        }
-    }
-
+**To get information about an Amazon Kendra data source connector**
+
+The following ``describe-data-source`` gets information about an Amazon Kendra data soource connector. You can view the configuration of a data source connector, and read any error messages if the status shows a data source connector "FAILED" to completely create. ::
+
+    aws kendra describe-data-source \
+        --id exampledatasource1 \
+        --index-id exampleindex1
+
+Output::
+
+    {
+        "Configuration": {
+            "TemplateConfiguration": {
+                "Template": {
+                    "connectionConfiguration": {
+                        "repositoryEndpointMetadata": {
+                            "BucketName": "amzn-s3-demo-bucket"
+                        }
+                    },
+                    "repositoryConfigurations": {
+                        "document":{
+                            "fieldMappings": [
+                                {
+                                    "indexFieldName":"_document_title",
+                                    "indexFieldType":"STRING",
+                                    "dataSourceFieldName": "title"
+                                },
+                                {
+                                    "indexFieldName":"_last_updated_at",
+                                    "indexFieldType":"DATE",
+                                    "dataSourceFieldName": "modified_date"
+                                }
+                            ]
+                        }
+                    },
+                    "additionalProperties": {
+                        "inclusionPatterns": [
+                            "*.txt",
+                            "*.doc",
+                            "*.docx"
+                        ],
+                        "exclusionPatterns": [
+                            "*.json"
+                        ],
+                        "inclusionPrefixes": [
+                            "PublicExampleDocsFolder"
+                        ],
+                        "exclusionPrefixes": [
+                            "PrivateDocsFolder/private"
+                        ],
+                        "aclConfigurationFilePath": "ExampleDocsFolder/AclConfig.json",
+                        "metadataFilesPrefix": "metadata"
+                    },
+                    "syncMode": "FULL_CRAWL",
+                    "type" : "S3",
+                    "version": "1.0.0"
+                }
+            }
+        },
+        "CreatedAt": 2024-02-25T13:30:10+00:00,
+        "CustomDocumentEnrichmentConfiguration": {
+            "PostExtractionHookConfiguration": {
+                "LambdaArn": "arn:aws:iam::my-account-id:function/my-function-ocr-docs",
+                "S3Bucket": "s3://my-s3-bucket/scanned-image-text-example-docs/function"
+            },
+            "RoleArn": "arn:aws:iam:my-account-id:role/KendraRoleForCDE"
+        }
+        "Description": "Example data source 1 for example index 1 contains the first set of example documents",
+        "Id": exampledatasource1,
+        "IndexId": exampleindex1,
+        "LanguageCode": "en",
+        "Name": "example data source 1",
+        "RoleArn": "arn:aws:iam::my-account-id:role/KendraRoleForS3TemplateConfigDataSource",
+        "Schedule": "0 0 18 ? * TUE,MON,WED,THU,FRI,SAT *",
+        "Status": "ACTIVE",
+        "Type": "TEMPLATE",
+        "UpdatedAt": 1709163615,
+        "VpcConfiguration": {
+            "SecurityGroupIds": ["sg-1234567890abcdef0"],
+            "SubnetIds": ["subnet-1c234","subnet-2b134"]
+        }
+    }
+
 For more information, see `Getting started with an Amazon Kendra index and data source connector <https://docs.aws.amazon.com/kendra/latest/dg/getting-started.html>`__ in the *Amazon Kendra Developer Guide*.
\ No newline at end of file
diff --git a/awscli/examples/networkmanager/delete-bucket-analytics-configuration.rst b/awscli/examples/networkmanager/delete-bucket-analytics-configuration.rst
index 47d350e423f5..51c3d0a5f88a 100755
--- a/awscli/examples/networkmanager/delete-bucket-analytics-configuration.rst
+++ b/awscli/examples/networkmanager/delete-bucket-analytics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``delete-bucket-analytics-configuration`` example removes the analytics configuration for the specified bucket and ID. ::
 
     aws s3api delete-bucket-analytics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 1
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/networkmanager/delete-bucket-metrics-configuration.rst b/awscli/examples/networkmanager/delete-bucket-metrics-configuration.rst
index 325d31ce2dc7..6b428609f898 100755
--- a/awscli/examples/networkmanager/delete-bucket-metrics-configuration.rst
+++ b/awscli/examples/networkmanager/delete-bucket-metrics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``delete-bucket-metrics-configuration`` example removes the metrics configuration for the specified bucket and ID. ::
 
     aws s3api delete-bucket-metrics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 123
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/networkmanager/delete-public-access-block.rst b/awscli/examples/networkmanager/delete-public-access-block.rst
index 563a8b5069b9..54fd0ee6dc40 100755
--- a/awscli/examples/networkmanager/delete-public-access-block.rst
+++ b/awscli/examples/networkmanager/delete-public-access-block.rst
@@ -3,6 +3,6 @@
 The following ``delete-public-access-block`` example removes the block public access configuration on the specified bucket. ::
 
     aws s3api delete-public-access-block \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 This command produces no output.
diff --git a/awscli/examples/networkmanager/get-bucket-analytics-configuration.rst b/awscli/examples/networkmanager/get-bucket-analytics-configuration.rst
index e9e0bba7eb41..b6f1ffe97f48 100755
--- a/awscli/examples/networkmanager/get-bucket-analytics-configuration.rst
+++ b/awscli/examples/networkmanager/get-bucket-analytics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``get-bucket-analytics-configuration`` example displays the analytics configuration for the specified bucket and ID. ::
 
     aws s3api get-bucket-analytics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 1
 
 Output::
diff --git a/awscli/examples/networkmanager/get-bucket-metrics-configuration.rst b/awscli/examples/networkmanager/get-bucket-metrics-configuration.rst
index d0628a55f7e2..bfed5f1804de 100755
--- a/awscli/examples/networkmanager/get-bucket-metrics-configuration.rst
+++ b/awscli/examples/networkmanager/get-bucket-metrics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``get-bucket-metrics-configuration`` example displays the metrics configuration for the specified bucket and ID. ::
 
     aws s3api get-bucket-metrics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 123
 
 Output::
diff --git a/awscli/examples/networkmanager/get-object-retention.rst b/awscli/examples/networkmanager/get-object-retention.rst
index ebd67e632b54..d2930010a993 100755
--- a/awscli/examples/networkmanager/get-object-retention.rst
+++ b/awscli/examples/networkmanager/get-object-retention.rst
@@ -3,7 +3,7 @@
 The following ``get-object-retention`` example retrieves the object retention configuration for the specified object. ::
 
     aws s3api get-object-retention \
-        --bucket my-bucket-with-object-lock \
+        --bucket amzn-s3-demo-bucket-with-object-lock \
         --key doc1.rtf
 
 Output::
diff --git a/awscli/examples/networkmanager/get-public-access-block.rst b/awscli/examples/networkmanager/get-public-access-block.rst
index 8bf9dcdbea6d..abd1b972aac5 100755
--- a/awscli/examples/networkmanager/get-public-access-block.rst
+++ b/awscli/examples/networkmanager/get-public-access-block.rst
@@ -2,7 +2,7 @@
 
 The following ``get-public-access-block`` example displays the block public access configuration for the specified bucket. ::
 
-    aws s3api get-public-access-block --bucket my-bucket
+    aws s3api get-public-access-block --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/networkmanager/list-bucket-analytics-configurations.rst b/awscli/examples/networkmanager/list-bucket-analytics-configurations.rst
index cedf797292d1..93d5131d76cc 100755
--- a/awscli/examples/networkmanager/list-bucket-analytics-configurations.rst
+++ b/awscli/examples/networkmanager/list-bucket-analytics-configurations.rst
@@ -3,7 +3,7 @@
 The following ``list-bucket-analytics-configurations`` retrieves a list of analytics configurations for the specified bucket. ::
 
     aws s3api list-bucket-analytics-configurations \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/networkmanager/list-bucket-metrics-configurations.rst b/awscli/examples/networkmanager/list-bucket-metrics-configurations.rst
index 769c4d7404b6..79145dd11cc0 100755
--- a/awscli/examples/networkmanager/list-bucket-metrics-configurations.rst
+++ b/awscli/examples/networkmanager/list-bucket-metrics-configurations.rst
@@ -3,7 +3,7 @@
 The following ``list-bucket-metrics-configurations`` example retrieves a list of metrics configurations for the specified bucket. ::
 
     aws s3api list-bucket-metrics-configurations \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/networkmanager/put-bucket-metrics-configuration.rst b/awscli/examples/networkmanager/put-bucket-metrics-configuration.rst
index 024118e03e96..7e6b3123eab3 100755
--- a/awscli/examples/networkmanager/put-bucket-metrics-configuration.rst
+++ b/awscli/examples/networkmanager/put-bucket-metrics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``put-bucket-metrics-configuration`` example sets a metric configuration with ID 123 for the specified bucket. ::
 
     aws s3api put-bucket-metrics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 123 \
         --metrics-configuration '{"Id": "123", "Filter": {"Prefix": "logs"}}'
 
diff --git a/awscli/examples/networkmanager/put-object-retention.rst b/awscli/examples/networkmanager/put-object-retention.rst
index f2fc164f16cf..092a22937b15 100755
--- a/awscli/examples/networkmanager/put-object-retention.rst
+++ b/awscli/examples/networkmanager/put-object-retention.rst
@@ -3,7 +3,7 @@
 The following ``put-object-retention`` example sets an object retention configuration for the specified object until 2025-01-01. ::
 
     aws s3api put-object-retention \
-        --bucket my-bucket-with-object-lock \
+        --bucket amzn-s3-demo-bucket-with-object-lock \
         --key doc1.rtf \
         --retention '{ "Mode": "GOVERNANCE", "RetainUntilDate": "2025-01-01T00:00:00" }'
 
diff --git a/awscli/examples/networkmanager/put-public-access-block.rst b/awscli/examples/networkmanager/put-public-access-block.rst
index f06bf915f85d..5d082bc98d34 100755
--- a/awscli/examples/networkmanager/put-public-access-block.rst
+++ b/awscli/examples/networkmanager/put-public-access-block.rst
@@ -3,7 +3,7 @@
 The following ``put-public-access-block`` example sets a restrictive block public access configuration for the specified bucket. ::
 
     aws s3api put-public-access-block \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --public-access-block-configuration "BlockPublicAcls=true,IgnorePublicAcls=true,BlockPublicPolicy=true,RestrictPublicBuckets=true"
 
 This command produces no output.
diff --git a/awscli/examples/robomaker/create-robot-application-version.rst b/awscli/examples/robomaker/create-robot-application-version.rst
index a3ff727f1fe5..bc080204de6d 100644
--- a/awscli/examples/robomaker/create-robot-application-version.rst
+++ b/awscli/examples/robomaker/create-robot-application-version.rst
@@ -14,7 +14,7 @@ Output::
     "version": "1",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-robot-application.tar.gz",
             "etag": "f8cf5526f1c6e7b3a72c3ed3f79c5493-70",
             "architecture": "ARMHF"
diff --git a/awscli/examples/robomaker/create-robot-application.rst b/awscli/examples/robomaker/create-robot-application.rst
index ae992690ed9c..372c81d992e4 100644
--- a/awscli/examples/robomaker/create-robot-application.rst
+++ b/awscli/examples/robomaker/create-robot-application.rst
@@ -4,7 +4,7 @@ This example creates a robot application.
 
 Command::
 
-   aws robomaker create-robot-application --name MyRobotApplication --sources s3Bucket=my-bucket,s3Key=my-robot-application.tar.gz,architecture=X86_64 --robot-software-suite name=ROS,version=Kinetic
+   aws robomaker create-robot-application --name MyRobotApplication --sources s3Bucket=amzn-s3-demo-bucket,s3Key=my-robot-application.tar.gz,architecture=X86_64 --robot-software-suite name=ROS,version=Kinetic
 
 Output::
 
@@ -14,7 +14,7 @@ Output::
     "version": "$LATEST",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-robot-application.tar.gz",
             "architecture": "ARMHF"
         }
diff --git a/awscli/examples/robomaker/create-simulation-application-version.rst b/awscli/examples/robomaker/create-simulation-application-version.rst
index 446b86928b29..b4a1e6e759cd 100644
--- a/awscli/examples/robomaker/create-simulation-application-version.rst
+++ b/awscli/examples/robomaker/create-simulation-application-version.rst
@@ -14,7 +14,7 @@ Output::
     "version": "1",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-simulation-application.tar.gz",
             "etag": "00d8a94ff113856688c4fce618ae0f45-94",
             "architecture": "X86_64"
diff --git a/awscli/examples/robomaker/create-simulation-application.rst b/awscli/examples/robomaker/create-simulation-application.rst
index 4c528e80f453..4f6cf95732c0 100644
--- a/awscli/examples/robomaker/create-simulation-application.rst
+++ b/awscli/examples/robomaker/create-simulation-application.rst
@@ -4,7 +4,7 @@ This example creates a simulation application.
 
 Command::
 
-   aws robomaker create-simulation-application  --name MyRobotApplication --sources s3Bucket=my-bucket,s3Key=my-simulation-application.tar.gz,architecture=ARMHF --robot-software-suite name=ROS,version=Kinetic --simulation-software-suite name=Gazebo,version=7 --rendering-engine name=OGRE,version=1.x
+   aws robomaker create-simulation-application  --name MyRobotApplication --sources s3Bucket=amzn-s3-demo-bucket,s3Key=my-simulation-application.tar.gz,architecture=ARMHF --robot-software-suite name=ROS,version=Kinetic --simulation-software-suite name=Gazebo,version=7 --rendering-engine name=OGRE,version=1.x
 
 Output::
 
@@ -14,7 +14,7 @@ Output::
     "version": "$LATEST",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-simulation-application.tar.gz",
             "architecture": "X86_64"
         }
diff --git a/awscli/examples/robomaker/describe-robot-application.rst b/awscli/examples/robomaker/describe-robot-application.rst
index 137513c01503..52f7fe664b38 100644
--- a/awscli/examples/robomaker/describe-robot-application.rst
+++ b/awscli/examples/robomaker/describe-robot-application.rst
@@ -14,7 +14,7 @@ Output::
     "version": "$LATEST",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-robot-application.tar.gz",
             "architecture": "X86_64"
         }
diff --git a/awscli/examples/robomaker/describe-simulation-application.rst b/awscli/examples/robomaker/describe-simulation-application.rst
index 578a7c7b1f35..d946bf8886dc 100644
--- a/awscli/examples/robomaker/describe-simulation-application.rst
+++ b/awscli/examples/robomaker/describe-simulation-application.rst
@@ -14,7 +14,7 @@ Output::
     "version": "$LATEST",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-simulation-application.tar.gz",
             "architecture": "X86_64"
         }
diff --git a/awscli/examples/robomaker/update-robot-application.rst b/awscli/examples/robomaker/update-robot-application.rst
index d6057c8ee468..429135c15601 100644
--- a/awscli/examples/robomaker/update-robot-application.rst
+++ b/awscli/examples/robomaker/update-robot-application.rst
@@ -4,7 +4,7 @@ This example updates a robot application.
 
 Command::
 
-   aws robomaker update-robot-application --application arn:aws:robomaker:us-west-2:111111111111:robot-application/MyRobotApplication/1551203485821 --sources s3Bucket=my-bucket,s3Key=my-robot-application.tar.gz,architecture=X86_64 --robot-software-suite name=ROS,version=Kinetic
+   aws robomaker update-robot-application --application arn:aws:robomaker:us-west-2:111111111111:robot-application/MyRobotApplication/1551203485821 --sources s3Bucket=amzn-s3-demo-bucket,s3Key=my-robot-application.tar.gz,architecture=X86_64 --robot-software-suite name=ROS,version=Kinetic
 
 Output::
 
@@ -14,7 +14,7 @@ Output::
     "version": "$LATEST",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-robot-application.tar.gz",
             "architecture": "X86_64"
         }
diff --git a/awscli/examples/robomaker/update-simulation-application.rst b/awscli/examples/robomaker/update-simulation-application.rst
index 54388e3fe804..b69a2a2b5236 100644
--- a/awscli/examples/robomaker/update-simulation-application.rst
+++ b/awscli/examples/robomaker/update-simulation-application.rst
@@ -4,7 +4,7 @@ This example updates a simulation application.
 
 Command::
 
-   aws robomaker update-simulation-application --application arn:aws:robomaker:us-west-2:111111111111:simulation-application/MySimulationApplication/1551203427605 --sources s3Bucket=my-bucket,s3Key=my-simulation-application.tar.gz,architecture=X86_64 --robot-software-suite name=ROS,version=Kinetic --simulation-software-suite name=Gazebo,version=7 --rendering-engine name=OGRE,version=1.x
+   aws robomaker update-simulation-application --application arn:aws:robomaker:us-west-2:111111111111:simulation-application/MySimulationApplication/1551203427605 --sources s3Bucket=amzn-s3-demo-bucket,s3Key=my-simulation-application.tar.gz,architecture=X86_64 --robot-software-suite name=ROS,version=Kinetic --simulation-software-suite name=Gazebo,version=7 --rendering-engine name=OGRE,version=1.x
 
 Output::
 
@@ -14,7 +14,7 @@ Output::
     "version": "$LATEST",
     "sources": [
         {
-            "s3Bucket": "my-bucket",
+            "s3Bucket": "amzn-s3-demo-bucket",
             "s3Key": "my-simulation-application.tar.gz",
             "architecture": "X86_64"
         }
diff --git a/awscli/examples/s3/website.rst b/awscli/examples/s3/website.rst
index 65ea8df9f3a5..2326e6d002bb 100644
--- a/awscli/examples/s3/website.rst
+++ b/awscli/examples/s3/website.rst
@@ -1,10 +1,10 @@
 **Configure an S3 bucket as a static website**
 
-The following command configures a bucket named ``my-bucket`` as a static website. The index document option specifies the file in ``my-bucket`` that visitors will be directed to when they navigate to the website URL. In this case, the bucket is in the us-west-2 region, so the site would appear at ``http://my-bucket.s3-website-us-west-2.amazonaws.com``. 
+The following command configures a bucket named ``amzn-s3-demo-bucket`` as a static website. The index document option specifies the file in ``amzn-s3-demo-bucket`` that visitors will be directed to when they navigate to the website URL. In this case, the bucket is in the us-west-2 region, so the site would appear at ``http://amzn-s3-demo-bucket.s3-website-us-west-2.amazonaws.com``. 
 
 All files in the bucket that appear on the static site must be configured to allow visitors to open them. File permissions are configured separately from the bucket website configuration. ::
 
-    aws s3 website s3://my-bucket/ \
+    aws s3 website s3://amzn-s3-demo-bucket/ \
         --index-document index.html \
         --error-document error.html
 
diff --git a/awscli/examples/s3api/abort-multipart-upload.rst b/awscli/examples/s3api/abort-multipart-upload.rst
index 0ab11e334f86..2a2ba1a85e47 100644
--- a/awscli/examples/s3api/abort-multipart-upload.rst
+++ b/awscli/examples/s3api/abort-multipart-upload.rst
@@ -1,9 +1,9 @@
 **To abort the specified multipart upload**
 
-The following ``abort-multipart-upload`` command aborts a multipart upload for the key ``multipart/01`` in the bucket ``my-bucket``. ::
+The following ``abort-multipart-upload`` command aborts a multipart upload for the key ``multipart/01`` in the bucket ``amzn-s3-demo-bucket``. ::
 
     aws s3api abort-multipart-upload \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key multipart/01 \
         --upload-id dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R
 
diff --git a/awscli/examples/s3api/complete-multipart-upload.rst b/awscli/examples/s3api/complete-multipart-upload.rst
index c6b82347cf21..f1271ec6e671 100644
--- a/awscli/examples/s3api/complete-multipart-upload.rst
+++ b/awscli/examples/s3api/complete-multipart-upload.rst
@@ -1,6 +1,6 @@
-The following command completes a multipart upload for the key ``multipart/01`` in the bucket ``my-bucket``::
+The following command completes a multipart upload for the key ``multipart/01`` in the bucket ``amzn-s3-demo-bucket``::
 
-  aws s3api complete-multipart-upload --multipart-upload file://mpustruct --bucket my-bucket --key 'multipart/01' --upload-id dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R
+  aws s3api complete-multipart-upload --multipart-upload file://mpustruct --bucket amzn-s3-demo-bucket --key 'multipart/01' --upload-id dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R
 
 The upload ID required by this command is output by ``create-multipart-upload`` and can also be retrieved with ``list-multipart-uploads``.
 
@@ -31,7 +31,7 @@ Output::
 
   {
       "ETag": "\"3944a9f7a4faab7f78788ff6210f63f0-3\"",
-      "Bucket": "my-bucket",
-      "Location": "https://my-bucket.s3.amazonaws.com/multipart%2F01",
+      "Bucket": "amzn-s3-demo-bucket",
+      "Location": "https://amzn-s3-demo-bucket.s3.amazonaws.com/multipart%2F01",
       "Key": "multipart/01"
   }
diff --git a/awscli/examples/s3api/create-bucket.rst b/awscli/examples/s3api/create-bucket.rst
index 8bbe58af45c7..62370f5e427d 100644
--- a/awscli/examples/s3api/create-bucket.rst
+++ b/awscli/examples/s3api/create-bucket.rst
@@ -1,52 +1,52 @@
 **Example 1: To create a bucket**
 
-The following ``create-bucket`` example creates a bucket named ``my-bucket``::
+The following ``create-bucket`` example creates a bucket named ``amzn-s3-demo-bucket``::
 
     aws s3api create-bucket \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --region us-east-1
 
 Output::
 
     {
-        "Location": "/my-bucket"
+        "Location": "/amzn-s3-demo-bucket"
     }
 
 For more information, see `Creating a bucket <https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-overview.html>`__ in the *Amazon S3 User Guide*.
 
 **Example 2: To create a bucket with owner enforced**
 
-The following ``create-bucket`` example creates a bucket named ``my-bucket`` that uses the bucket owner enforced setting for S3 Object Ownership. ::
+The following ``create-bucket`` example creates a bucket named ``amzn-s3-demo-bucket`` that uses the bucket owner enforced setting for S3 Object Ownership. ::
 
     aws s3api create-bucket \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --region us-east-1 \
         --object-ownership BucketOwnerEnforced
 
 Output::
 
     {
-        "Location": "/my-bucket"
+        "Location": "/amzn-s3-demo-bucket"
     }
 
 For more information, see `Controlling ownership of objects and disabling ACLs <https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html>`__ in the *Amazon S3 User Guide*.
 
 **Example 3: To create a bucket outside of the ``us-east-1`` region**
 
-The following ``create-bucket`` example creates a bucket named ``my-bucket`` in the
+The following ``create-bucket`` example creates a bucket named ``amzn-s3-demo-bucket`` in the
 ``eu-west-1`` region. Regions outside of ``us-east-1`` require the appropriate
 ``LocationConstraint`` to be specified in order to create the bucket in the
 desired region. ::
 
     aws s3api create-bucket \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --region eu-west-1 \
         --create-bucket-configuration LocationConstraint=eu-west-1 
 
 Output::
 
     {
-        "Location": "http://my-bucket.s3.amazonaws.com/"
+        "Location": "http://amzn-s3-demo-bucket.s3.amazonaws.com/"
     }
 
 For more information, see `Creating a bucket <https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-overview.html>`__ in the *Amazon S3 User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/s3api/create-multipart-upload.rst b/awscli/examples/s3api/create-multipart-upload.rst
index a0552e99a0de..ed096f03cee8 100644
--- a/awscli/examples/s3api/create-multipart-upload.rst
+++ b/awscli/examples/s3api/create-multipart-upload.rst
@@ -1,13 +1,13 @@
-The following command creates a multipart upload in the bucket ``my-bucket`` with the key ``multipart/01``::
+The following command creates a multipart upload in the bucket ``amzn-s3-demo-bucket`` with the key ``multipart/01``::
 
-  aws s3api create-multipart-upload --bucket my-bucket --key 'multipart/01'
+  aws s3api create-multipart-upload --bucket amzn-s3-demo-bucket --key 'multipart/01'
 
 Output::
 
   {
-      "Bucket": "my-bucket",
+      "Bucket": "amzn-s3-demo-bucket",
       "UploadId": "dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R",
       "Key": "multipart/01"
   }
 
-The completed file will be named ``01`` in a folder called ``multipart`` in the bucket ``my-bucket``. Save the upload ID, key and bucket name for use with the ``upload-part`` command.
\ No newline at end of file
+The completed file will be named ``01`` in a folder called ``multipart`` in the bucket ``amzn-s3-demo-bucket``. Save the upload ID, key and bucket name for use with the ``upload-part`` command.
\ No newline at end of file
diff --git a/awscli/examples/s3api/delete-bucket-analytics-configuration.rst b/awscli/examples/s3api/delete-bucket-analytics-configuration.rst
index 47d350e423f5..51c3d0a5f88a 100755
--- a/awscli/examples/s3api/delete-bucket-analytics-configuration.rst
+++ b/awscli/examples/s3api/delete-bucket-analytics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``delete-bucket-analytics-configuration`` example removes the analytics configuration for the specified bucket and ID. ::
 
     aws s3api delete-bucket-analytics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 1
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/s3api/delete-bucket-cors.rst b/awscli/examples/s3api/delete-bucket-cors.rst
index 53ca2a4e8f08..6c9ceeb74883 100644
--- a/awscli/examples/s3api/delete-bucket-cors.rst
+++ b/awscli/examples/s3api/delete-bucket-cors.rst
@@ -1,3 +1,3 @@
-The following command deletes a Cross-Origin Resource Sharing configuration from a bucket named ``my-bucket``::
+The following command deletes a Cross-Origin Resource Sharing configuration from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-bucket-cors --bucket my-bucket
+  aws s3api delete-bucket-cors --bucket amzn-s3-demo-bucket
diff --git a/awscli/examples/s3api/delete-bucket-encryption.rst b/awscli/examples/s3api/delete-bucket-encryption.rst
index da439a3203af..fd6e966909d3 100755
--- a/awscli/examples/s3api/delete-bucket-encryption.rst
+++ b/awscli/examples/s3api/delete-bucket-encryption.rst
@@ -3,6 +3,6 @@
 The following ``delete-bucket-encryption`` example deletes the server-side encryption configuration of the specified bucket. ::
 
     aws s3api delete-bucket-encryption \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 This command produces no output.
diff --git a/awscli/examples/s3api/delete-bucket-inventory-configuration.rst b/awscli/examples/s3api/delete-bucket-inventory-configuration.rst
index a9e062df24d4..6ddd5ab6d545 100755
--- a/awscli/examples/s3api/delete-bucket-inventory-configuration.rst
+++ b/awscli/examples/s3api/delete-bucket-inventory-configuration.rst
@@ -3,7 +3,7 @@
 The following ``delete-bucket-inventory-configuration`` example deletes the inventory configuration with ID ``1`` for the specified bucket. ::
 
     aws s3api delete-bucket-inventory-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 1
 
 This command produces no output.
diff --git a/awscli/examples/s3api/delete-bucket-lifecycle.rst b/awscli/examples/s3api/delete-bucket-lifecycle.rst
index 8d06f89305e7..3235ef5caa48 100644
--- a/awscli/examples/s3api/delete-bucket-lifecycle.rst
+++ b/awscli/examples/s3api/delete-bucket-lifecycle.rst
@@ -1,3 +1,3 @@
-The following command deletes a lifecycle configuration from a bucket named ``my-bucket``::
+The following command deletes a lifecycle configuration from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-bucket-lifecycle --bucket my-bucket
+  aws s3api delete-bucket-lifecycle --bucket amzn-s3-demo-bucket
diff --git a/awscli/examples/s3api/delete-bucket-metrics-configuration.rst b/awscli/examples/s3api/delete-bucket-metrics-configuration.rst
index 325d31ce2dc7..6b428609f898 100755
--- a/awscli/examples/s3api/delete-bucket-metrics-configuration.rst
+++ b/awscli/examples/s3api/delete-bucket-metrics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``delete-bucket-metrics-configuration`` example removes the metrics configuration for the specified bucket and ID. ::
 
     aws s3api delete-bucket-metrics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 123
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/s3api/delete-bucket-policy.rst b/awscli/examples/s3api/delete-bucket-policy.rst
index 0e104e57e475..bbd01103c8dd 100644
--- a/awscli/examples/s3api/delete-bucket-policy.rst
+++ b/awscli/examples/s3api/delete-bucket-policy.rst
@@ -1,3 +1,3 @@
-The following command deletes a bucket policy from a bucket named ``my-bucket``::
+The following command deletes a bucket policy from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-bucket-policy --bucket my-bucket
+  aws s3api delete-bucket-policy --bucket amzn-s3-demo-bucket
diff --git a/awscli/examples/s3api/delete-bucket-replication.rst b/awscli/examples/s3api/delete-bucket-replication.rst
index 50f9dfc38e5d..db8faac83e35 100644
--- a/awscli/examples/s3api/delete-bucket-replication.rst
+++ b/awscli/examples/s3api/delete-bucket-replication.rst
@@ -1,3 +1,3 @@
-The following command deletes a replication configuration from a bucket named ``my-bucket``::
+The following command deletes a replication configuration from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-bucket-replication --bucket my-bucket
+  aws s3api delete-bucket-replication --bucket amzn-s3-demo-bucket
diff --git a/awscli/examples/s3api/delete-bucket-tagging.rst b/awscli/examples/s3api/delete-bucket-tagging.rst
index 713a6ad29f48..cdce318063d8 100644
--- a/awscli/examples/s3api/delete-bucket-tagging.rst
+++ b/awscli/examples/s3api/delete-bucket-tagging.rst
@@ -1,3 +1,3 @@
-The following command deletes a tagging configuration from a bucket named ``my-bucket``::
+The following command deletes a tagging configuration from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-bucket-tagging --bucket my-bucket
+  aws s3api delete-bucket-tagging --bucket amzn-s3-demo-bucket
diff --git a/awscli/examples/s3api/delete-bucket-website.rst b/awscli/examples/s3api/delete-bucket-website.rst
index 155cd1e474a0..781e3322be9c 100644
--- a/awscli/examples/s3api/delete-bucket-website.rst
+++ b/awscli/examples/s3api/delete-bucket-website.rst
@@ -1,3 +1,3 @@
-The following command deletes a website configuration from a bucket named ``my-bucket``::
+The following command deletes a website configuration from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-bucket-website --bucket my-bucket
+  aws s3api delete-bucket-website --bucket amzn-s3-demo-bucket
diff --git a/awscli/examples/s3api/delete-bucket.rst b/awscli/examples/s3api/delete-bucket.rst
index 761eafb15e94..b1cc31522761 100644
--- a/awscli/examples/s3api/delete-bucket.rst
+++ b/awscli/examples/s3api/delete-bucket.rst
@@ -1,3 +1,3 @@
-The following command deletes a bucket named ``my-bucket``::
+The following command deletes a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-bucket --bucket my-bucket --region us-east-1
+  aws s3api delete-bucket --bucket amzn-s3-demo-bucket --region us-east-1
diff --git a/awscli/examples/s3api/delete-object-tagging.rst b/awscli/examples/s3api/delete-object-tagging.rst
index dbfd27da53f1..d29617f81859 100755
--- a/awscli/examples/s3api/delete-object-tagging.rst
+++ b/awscli/examples/s3api/delete-object-tagging.rst
@@ -3,7 +3,7 @@
 The following ``delete-object-tagging`` example deletes the tag with the specified key from the object ``doc1.rtf``. ::
 
     aws s3api delete-object-tagging \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc1.rtf
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/s3api/delete-object.rst b/awscli/examples/s3api/delete-object.rst
index 3a5df3c4e062..6f1a23963f38 100644
--- a/awscli/examples/s3api/delete-object.rst
+++ b/awscli/examples/s3api/delete-object.rst
@@ -1,6 +1,6 @@
-The following command deletes an object named ``test.txt`` from a bucket named ``my-bucket``::
+The following command deletes an object named ``test.txt`` from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-object --bucket my-bucket --key test.txt
+  aws s3api delete-object --bucket amzn-s3-demo-bucket --key test.txt
 
 If bucket versioning is enabled, the output will contain the version ID of the delete marker::
 
diff --git a/awscli/examples/s3api/delete-objects.rst b/awscli/examples/s3api/delete-objects.rst
index 2446efd51ab4..f08f728f26d1 100644
--- a/awscli/examples/s3api/delete-objects.rst
+++ b/awscli/examples/s3api/delete-objects.rst
@@ -1,6 +1,6 @@
-The following command deletes an object from a bucket named ``my-bucket``::
+The following command deletes an object from a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api delete-objects --bucket my-bucket --delete file://delete.json
+  aws s3api delete-objects --bucket amzn-s3-demo-bucket --delete file://delete.json
 
 ``delete.json`` is a JSON document in the current directory that specifies the object to delete::
 
diff --git a/awscli/examples/s3api/delete-public-access-block.rst b/awscli/examples/s3api/delete-public-access-block.rst
index 563a8b5069b9..54fd0ee6dc40 100755
--- a/awscli/examples/s3api/delete-public-access-block.rst
+++ b/awscli/examples/s3api/delete-public-access-block.rst
@@ -3,6 +3,6 @@
 The following ``delete-public-access-block`` example removes the block public access configuration on the specified bucket. ::
 
     aws s3api delete-public-access-block \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 This command produces no output.
diff --git a/awscli/examples/s3api/get-bucket-accelerate-configuration.rst b/awscli/examples/s3api/get-bucket-accelerate-configuration.rst
index c40bd611d6b4..3f18aa88bcfb 100644
--- a/awscli/examples/s3api/get-bucket-accelerate-configuration.rst
+++ b/awscli/examples/s3api/get-bucket-accelerate-configuration.rst
@@ -3,7 +3,7 @@
 The following ``get-bucket-accelerate-configuration`` example retrieves the accelerate configuration for the specified bucket. ::
 
     aws s3api get-bucket-accelerate-configuration \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-acl.rst b/awscli/examples/s3api/get-bucket-acl.rst
index 42f40386a31a..33870686cf53 100644
--- a/awscli/examples/s3api/get-bucket-acl.rst
+++ b/awscli/examples/s3api/get-bucket-acl.rst
@@ -1,6 +1,6 @@
-The following command retrieves the access control list for a bucket named ``my-bucket``::
+The following command retrieves the access control list for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-acl --bucket my-bucket
+  aws s3api get-bucket-acl --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-analytics-configuration.rst b/awscli/examples/s3api/get-bucket-analytics-configuration.rst
index e9e0bba7eb41..b6f1ffe97f48 100755
--- a/awscli/examples/s3api/get-bucket-analytics-configuration.rst
+++ b/awscli/examples/s3api/get-bucket-analytics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``get-bucket-analytics-configuration`` example displays the analytics configuration for the specified bucket and ID. ::
 
     aws s3api get-bucket-analytics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 1
 
 Output::
diff --git a/awscli/examples/s3api/get-bucket-cors.rst b/awscli/examples/s3api/get-bucket-cors.rst
index 2bbf9f68e6ae..b712b011e9ed 100644
--- a/awscli/examples/s3api/get-bucket-cors.rst
+++ b/awscli/examples/s3api/get-bucket-cors.rst
@@ -1,6 +1,6 @@
-The following command retrieves the Cross-Origin Resource Sharing configuration for a bucket named ``my-bucket``::
+The following command retrieves the Cross-Origin Resource Sharing configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-cors --bucket my-bucket
+  aws s3api get-bucket-cors --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-encryption.rst b/awscli/examples/s3api/get-bucket-encryption.rst
index f442f11b58c7..376f4bbdaecc 100755
--- a/awscli/examples/s3api/get-bucket-encryption.rst
+++ b/awscli/examples/s3api/get-bucket-encryption.rst
@@ -1,9 +1,9 @@
 **To retrieve the server-side encryption configuration for a bucket**
 
-The following ``get-bucket-encryption`` example retrieves the server-side encryption configuration for the bucket ``my-bucket``. ::
+The following ``get-bucket-encryption`` example retrieves the server-side encryption configuration for the bucket ``amzn-s3-demo-bucket``. ::
 
     aws s3api get-bucket-encryption \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-inventory-configuration.rst b/awscli/examples/s3api/get-bucket-inventory-configuration.rst
index 90a9524a2f79..52bc5d78099d 100755
--- a/awscli/examples/s3api/get-bucket-inventory-configuration.rst
+++ b/awscli/examples/s3api/get-bucket-inventory-configuration.rst
@@ -3,7 +3,7 @@
 The following ``get-bucket-inventory-configuration`` example retrieves the inventory configuration for the specified bucket with ID ``1``. ::
 
     aws s3api get-bucket-inventory-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 1
 
 Output::
@@ -14,7 +14,7 @@ Output::
             "Destination": {
                 "S3BucketDestination": {
                     "Format": "ORC",
-                    "Bucket": "arn:aws:s3:::my-bucket",
+                    "Bucket": "arn:aws:s3:::amzn-s3-demo-bucket",
                     "AccountId": "123456789012"
                 }
             },
diff --git a/awscli/examples/s3api/get-bucket-lifecycle-configuration.rst b/awscli/examples/s3api/get-bucket-lifecycle-configuration.rst
index 4a10dc8bd642..f279be5d73d5 100644
--- a/awscli/examples/s3api/get-bucket-lifecycle-configuration.rst
+++ b/awscli/examples/s3api/get-bucket-lifecycle-configuration.rst
@@ -1,6 +1,6 @@
-The following command retrieves the lifecycle configuration for a bucket named ``my-bucket``::
+The following command retrieves the lifecycle configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-lifecycle-configuration --bucket my-bucket
+  aws s3api get-bucket-lifecycle-configuration --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-lifecycle.rst b/awscli/examples/s3api/get-bucket-lifecycle.rst
index fcb23fa8bf07..f58960e1e8ff 100644
--- a/awscli/examples/s3api/get-bucket-lifecycle.rst
+++ b/awscli/examples/s3api/get-bucket-lifecycle.rst
@@ -1,6 +1,6 @@
-The following command retrieves the lifecycle configuration for a bucket named ``my-bucket``::
+The following command retrieves the lifecycle configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-lifecycle --bucket my-bucket
+  aws s3api get-bucket-lifecycle --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-location.rst b/awscli/examples/s3api/get-bucket-location.rst
index 092fa5e8afe0..0ad5c7ec973d 100644
--- a/awscli/examples/s3api/get-bucket-location.rst
+++ b/awscli/examples/s3api/get-bucket-location.rst
@@ -1,6 +1,6 @@
-The following command retrieves the location constraint for a bucket named ``my-bucket``, if a constraint exists::
+The following command retrieves the location constraint for a bucket named ``amzn-s3-demo-bucket``, if a constraint exists::
 
-  aws s3api get-bucket-location --bucket my-bucket
+  aws s3api get-bucket-location --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-logging.rst b/awscli/examples/s3api/get-bucket-logging.rst
index f1398a5b914b..6a1876ba3bfc 100755
--- a/awscli/examples/s3api/get-bucket-logging.rst
+++ b/awscli/examples/s3api/get-bucket-logging.rst
@@ -3,13 +3,13 @@
 The following ``get-bucket-logging`` example retrieves the logging status for the specified bucket. ::
 
     aws s3api get-bucket-logging \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
     {
         "LoggingEnabled": {
             "TargetPrefix": "",
-            "TargetBucket": "my-bucket-logs"
+            "TargetBucket": "amzn-s3-demo-bucket-logs"
               }
     }
diff --git a/awscli/examples/s3api/get-bucket-metrics-configuration.rst b/awscli/examples/s3api/get-bucket-metrics-configuration.rst
index d0628a55f7e2..bfed5f1804de 100755
--- a/awscli/examples/s3api/get-bucket-metrics-configuration.rst
+++ b/awscli/examples/s3api/get-bucket-metrics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``get-bucket-metrics-configuration`` example displays the metrics configuration for the specified bucket and ID. ::
 
     aws s3api get-bucket-metrics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 123
 
 Output::
diff --git a/awscli/examples/s3api/get-bucket-notification-configuration.rst b/awscli/examples/s3api/get-bucket-notification-configuration.rst
index 8eca1c3fa895..1f39bedd7481 100644
--- a/awscli/examples/s3api/get-bucket-notification-configuration.rst
+++ b/awscli/examples/s3api/get-bucket-notification-configuration.rst
@@ -1,6 +1,6 @@
-The following command retrieves the notification configuration for a bucket named ``my-bucket``::
+The following command retrieves the notification configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-notification-configuration --bucket my-bucket
+  aws s3api get-bucket-notification-configuration --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-notification.rst b/awscli/examples/s3api/get-bucket-notification.rst
index e8a591e66ee1..91eafc505918 100644
--- a/awscli/examples/s3api/get-bucket-notification.rst
+++ b/awscli/examples/s3api/get-bucket-notification.rst
@@ -1,6 +1,6 @@
-The following command retrieves the notification configuration for a bucket named ``my-bucket``::
+The following command retrieves the notification configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-notification --bucket my-bucket
+  aws s3api get-bucket-notification --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-policy-status.rst b/awscli/examples/s3api/get-bucket-policy-status.rst
index 599f1f128a17..5164c3e30173 100755
--- a/awscli/examples/s3api/get-bucket-policy-status.rst
+++ b/awscli/examples/s3api/get-bucket-policy-status.rst
@@ -1,9 +1,9 @@
 **To retrieve the policy status for a bucket indicating whether the bucket is public**
 
-The following ``get-bucket-policy-status`` example retrieves the policy status for the bucket ``my-bucket``. ::
+The following ``get-bucket-policy-status`` example retrieves the policy status for the bucket ``amzn-s3-demo-bucket``. ::
 
     aws s3api get-bucket-policy-status \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-policy.rst b/awscli/examples/s3api/get-bucket-policy.rst
index 606e3297fbd9..e0279f3a2f7f 100644
--- a/awscli/examples/s3api/get-bucket-policy.rst
+++ b/awscli/examples/s3api/get-bucket-policy.rst
@@ -1,11 +1,11 @@
-The following command retrieves the bucket policy for a bucket named ``my-bucket``::
+The following command retrieves the bucket policy for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-policy --bucket my-bucket
+  aws s3api get-bucket-policy --bucket amzn-s3-demo-bucket
 
 Output::
 
   {
-      "Policy": "{\"Version\":\"2008-10-17\",\"Statement\":[{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::my-bucket/*\"},{\"Sid\":\"\",\"Effect\":\"Deny\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::my-bucket/secret/*\"}]}"
+      "Policy": "{\"Version\":\"2008-10-17\",\"Statement\":[{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::amzn-s3-demo-bucket/*\"},{\"Sid\":\"\",\"Effect\":\"Deny\",\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::amzn-s3-demo-bucket/secret/*\"}]}"
   }
 
 Get and put a bucket policy
diff --git a/awscli/examples/s3api/get-bucket-replication.rst b/awscli/examples/s3api/get-bucket-replication.rst
index c056c701e844..23e1aae1e3ae 100644
--- a/awscli/examples/s3api/get-bucket-replication.rst
+++ b/awscli/examples/s3api/get-bucket-replication.rst
@@ -1,6 +1,6 @@
-The following command retrieves the replication configuration for a bucket named ``my-bucket``::
+The following command retrieves the replication configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-replication --bucket my-bucket
+  aws s3api get-bucket-replication --bucket amzn-s3-demo-bucket
 
 Output::
 
@@ -11,7 +11,7 @@ Output::
                   "Status": "Enabled",
                   "Prefix": "",
                   "Destination": {
-                      "Bucket": "arn:aws:s3:::my-bucket-backup",
+                      "Bucket": "arn:aws:s3:::amzn-s3-demo-bucket-backup",
                       "StorageClass": "STANDARD"
                   },
                   "ID": "ZmUwNzE4ZmQ4tMjVhOS00MTlkLOGI4NDkzZTIWJjNTUtYTA1"
diff --git a/awscli/examples/s3api/get-bucket-request-payment.rst b/awscli/examples/s3api/get-bucket-request-payment.rst
index 41c9f8d8f8d8..d53d664d8e8b 100644
--- a/awscli/examples/s3api/get-bucket-request-payment.rst
+++ b/awscli/examples/s3api/get-bucket-request-payment.rst
@@ -3,7 +3,7 @@
 The following ``get-bucket-request-payment`` example retrieves the requester pays configuration for the specified bucket. ::
 
     aws s3api get-bucket-request-payment \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-tagging.rst b/awscli/examples/s3api/get-bucket-tagging.rst
index fbbee96e7d9d..8d8906462e6c 100644
--- a/awscli/examples/s3api/get-bucket-tagging.rst
+++ b/awscli/examples/s3api/get-bucket-tagging.rst
@@ -1,6 +1,6 @@
-The following command retrieves the tagging configuration for a bucket named ``my-bucket``::
+The following command retrieves the tagging configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-tagging --bucket my-bucket
+  aws s3api get-bucket-tagging --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-versioning.rst b/awscli/examples/s3api/get-bucket-versioning.rst
index fea8280d06af..7ba6890a28c9 100644
--- a/awscli/examples/s3api/get-bucket-versioning.rst
+++ b/awscli/examples/s3api/get-bucket-versioning.rst
@@ -1,6 +1,6 @@
-The following command retrieves the versioning configuration for a bucket named ``my-bucket``::
+The following command retrieves the versioning configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-versioning --bucket my-bucket
+  aws s3api get-bucket-versioning --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-bucket-website.rst b/awscli/examples/s3api/get-bucket-website.rst
index e4a3682b4fe4..b0945d07e068 100644
--- a/awscli/examples/s3api/get-bucket-website.rst
+++ b/awscli/examples/s3api/get-bucket-website.rst
@@ -1,6 +1,6 @@
-The following command retrieves the static website configuration for a bucket named ``my-bucket``::
+The following command retrieves the static website configuration for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-bucket-website --bucket my-bucket
+  aws s3api get-bucket-website --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/get-object-acl.rst b/awscli/examples/s3api/get-object-acl.rst
index b487cdd93b94..5d89a58b2a86 100644
--- a/awscli/examples/s3api/get-object-acl.rst
+++ b/awscli/examples/s3api/get-object-acl.rst
@@ -1,6 +1,6 @@
-The following command retrieves the access control list for an object in a bucket named ``my-bucket``::
+The following command retrieves the access control list for an object in a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-object-acl --bucket my-bucket --key index.html
+  aws s3api get-object-acl --bucket amzn-s3-demo-bucket --key index.html
 
 Output::
 
diff --git a/awscli/examples/s3api/get-object-attributes.rst b/awscli/examples/s3api/get-object-attributes.rst
index 12f10f72bd3f..d9cc78c685df 100644
--- a/awscli/examples/s3api/get-object-attributes.rst
+++ b/awscli/examples/s3api/get-object-attributes.rst
@@ -3,7 +3,7 @@
 The following ``get-object-attributes`` example retrieves metadata from the object ``doc1.rtf``. ::
 
     aws s3api get-object-attributes \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc1.rtf \
         --object-attributes "StorageClass" "ETag" "ObjectSize"
 
diff --git a/awscli/examples/s3api/get-object-legal-hold.rst b/awscli/examples/s3api/get-object-legal-hold.rst
index 1163d94a0c35..74bd0f05f6a3 100644
--- a/awscli/examples/s3api/get-object-legal-hold.rst
+++ b/awscli/examples/s3api/get-object-legal-hold.rst
@@ -3,7 +3,7 @@
 The following ``get-object-legal-hold`` example retrieves the Legal Hold status for the specified object. ::
 
     aws s3api get-object-legal-hold \
-        --bucket my-bucket-with-object-lock \
+        --bucket amzn-s3-demo-bucket-with-object-lock \
         --key doc1.rtf
 
 Output::
diff --git a/awscli/examples/s3api/get-object-lock-configuration.rst b/awscli/examples/s3api/get-object-lock-configuration.rst
index 3be8c620185f..d75b2ba6a1ca 100755
--- a/awscli/examples/s3api/get-object-lock-configuration.rst
+++ b/awscli/examples/s3api/get-object-lock-configuration.rst
@@ -3,7 +3,7 @@
 The following ``get-object-lock-configuration`` example retrieves the object lock configuration for the specified bucket. ::
 
     aws s3api get-object-lock-configuration \
-        --bucket my-bucket-with-object-lock
+        --bucket amzn-s3-demo-bucket-with-object-lock
 
 Output::
 
diff --git a/awscli/examples/s3api/get-object-retention.rst b/awscli/examples/s3api/get-object-retention.rst
index ebd67e632b54..d2930010a993 100755
--- a/awscli/examples/s3api/get-object-retention.rst
+++ b/awscli/examples/s3api/get-object-retention.rst
@@ -3,7 +3,7 @@
 The following ``get-object-retention`` example retrieves the object retention configuration for the specified object. ::
 
     aws s3api get-object-retention \
-        --bucket my-bucket-with-object-lock \
+        --bucket amzn-s3-demo-bucket-with-object-lock \
         --key doc1.rtf
 
 Output::
diff --git a/awscli/examples/s3api/get-object-tagging.rst b/awscli/examples/s3api/get-object-tagging.rst
index 8fe3225c26a8..d942238876d2 100755
--- a/awscli/examples/s3api/get-object-tagging.rst
+++ b/awscli/examples/s3api/get-object-tagging.rst
@@ -3,7 +3,7 @@
 The following ``get-object-tagging`` example retrieves the values for the specified key from the specified object. ::
 
     aws s3api get-object-tagging \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc1.rtf
 
 Output::
@@ -20,7 +20,7 @@ Output::
 The following ``get-object-tagging`` example tries to retrieve the tag sets of the object ``doc2.rtf``, which has no tags. ::
 
     aws s3api get-object-tagging \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc2.rtf
 
 Output::
@@ -33,7 +33,7 @@ Output::
 The following ``get-object-tagging`` example retrieves the tag sets of the object ``doc3.rtf``, which has multiple tags. ::
 
     aws s3api get-object-tagging \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc3.rtf
 
 Output::
diff --git a/awscli/examples/s3api/get-object-torrent.rst b/awscli/examples/s3api/get-object-torrent.rst
index dc23e558d75a..989e9e6cfbb7 100644
--- a/awscli/examples/s3api/get-object-torrent.rst
+++ b/awscli/examples/s3api/get-object-torrent.rst
@@ -1,5 +1,5 @@
-The following command creates a torrent for an object in a bucket named ``my-bucket``::
+The following command creates a torrent for an object in a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api get-object-torrent --bucket my-bucket --key large-video-file.mp4 large-video-file.torrent
+  aws s3api get-object-torrent --bucket amzn-s3-demo-bucket --key large-video-file.mp4 large-video-file.torrent
 
 The torrent file is saved locally in the current folder. Note that the output filename (``large-video-file.torrent``) is specified without an option name and must be the last argument in the command.
\ No newline at end of file
diff --git a/awscli/examples/s3api/get-public-access-block.rst b/awscli/examples/s3api/get-public-access-block.rst
index 7cd897d1ea5d..2c2dea9220e8 100755
--- a/awscli/examples/s3api/get-public-access-block.rst
+++ b/awscli/examples/s3api/get-public-access-block.rst
@@ -3,7 +3,7 @@
 The following ``get-public-access-block`` example displays the block public access configuration for the specified bucket. ::
 
     aws s3api get-public-access-block \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/head-bucket.rst b/awscli/examples/s3api/head-bucket.rst
index 695c90f580a0..1a08f13f22e5 100644
--- a/awscli/examples/s3api/head-bucket.rst
+++ b/awscli/examples/s3api/head-bucket.rst
@@ -1,6 +1,6 @@
-The following command verifies access to a bucket named ``my-bucket``::
+The following command verifies access to a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api head-bucket --bucket my-bucket
+  aws s3api head-bucket --bucket amzn-s3-demo-bucket
 
 If the bucket exists and you have access to it, no output is returned. Otherwise, an error message will be shown. For example::
 
diff --git a/awscli/examples/s3api/head-object.rst b/awscli/examples/s3api/head-object.rst
index e432a649c85a..1c87881b65e0 100644
--- a/awscli/examples/s3api/head-object.rst
+++ b/awscli/examples/s3api/head-object.rst
@@ -1,6 +1,6 @@
-The following command retrieves metadata for an object in a bucket named ``my-bucket``::
+The following command retrieves metadata for an object in a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api head-object --bucket my-bucket --key index.html
+  aws s3api head-object --bucket amzn-s3-demo-bucket --key index.html
 
 Output::
 
diff --git a/awscli/examples/s3api/list-bucket-analytics-configurations.rst b/awscli/examples/s3api/list-bucket-analytics-configurations.rst
index cedf797292d1..93d5131d76cc 100755
--- a/awscli/examples/s3api/list-bucket-analytics-configurations.rst
+++ b/awscli/examples/s3api/list-bucket-analytics-configurations.rst
@@ -3,7 +3,7 @@
 The following ``list-bucket-analytics-configurations`` retrieves a list of analytics configurations for the specified bucket. ::
 
     aws s3api list-bucket-analytics-configurations \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/list-bucket-inventory-configurations.rst b/awscli/examples/s3api/list-bucket-inventory-configurations.rst
index 2b40ede04fdf..1a8c2e5fcbdc 100755
--- a/awscli/examples/s3api/list-bucket-inventory-configurations.rst
+++ b/awscli/examples/s3api/list-bucket-inventory-configurations.rst
@@ -3,7 +3,7 @@
 The following ``list-bucket-inventory-configurations`` example lists the inventory configurations for the specified bucket. ::
 
     aws s3api list-bucket-inventory-configurations \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
@@ -14,7 +14,7 @@ Output::
                 "Destination": {
                     "S3BucketDestination": {
                         "Format": "ORC",
-                        "Bucket": "arn:aws:s3:::my-bucket",
+                        "Bucket": "arn:aws:s3:::amzn-s3-demo-bucket",
                         "AccountId": "123456789012"
                     }
                 },
@@ -29,7 +29,7 @@ Output::
                 "Destination": {
                     "S3BucketDestination": {
                         "Format": "CSV",
-                        "Bucket": "arn:aws:s3:::my-bucket",
+                        "Bucket": "arn:aws:s3:::amzn-s3-demo-bucket",
                         "AccountId": "123456789012"
                     }
                 },
diff --git a/awscli/examples/s3api/list-bucket-metrics-configurations.rst b/awscli/examples/s3api/list-bucket-metrics-configurations.rst
index 769c4d7404b6..79145dd11cc0 100755
--- a/awscli/examples/s3api/list-bucket-metrics-configurations.rst
+++ b/awscli/examples/s3api/list-bucket-metrics-configurations.rst
@@ -3,7 +3,7 @@
 The following ``list-bucket-metrics-configurations`` example retrieves a list of metrics configurations for the specified bucket. ::
 
     aws s3api list-bucket-metrics-configurations \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/list-multipart-uploads.rst b/awscli/examples/s3api/list-multipart-uploads.rst
index 34d825f5b0bf..082bae3443e2 100644
--- a/awscli/examples/s3api/list-multipart-uploads.rst
+++ b/awscli/examples/s3api/list-multipart-uploads.rst
@@ -1,6 +1,6 @@
-The following command lists all of the active multipart uploads for a bucket named ``my-bucket``::
+The following command lists all of the active multipart uploads for a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api list-multipart-uploads --bucket my-bucket
+  aws s3api list-multipart-uploads --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/list-object-versions.rst b/awscli/examples/s3api/list-object-versions.rst
index dce635a23f90..5f21a6114e13 100644
--- a/awscli/examples/s3api/list-object-versions.rst
+++ b/awscli/examples/s3api/list-object-versions.rst
@@ -1,6 +1,6 @@
-The following command retrieves version information for an object in a bucket named ``my-bucket``::
+The following command retrieves version information for an object in a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api list-object-versions --bucket my-bucket --prefix index.html
+  aws s3api list-object-versions --bucket amzn-s3-demo-bucket --prefix index.html
 
 Output::
 
diff --git a/awscli/examples/s3api/list-objects-v2.rst b/awscli/examples/s3api/list-objects-v2.rst
index 0e98fcb3d1ea..2ecf04b7cbcc 100644
--- a/awscli/examples/s3api/list-objects-v2.rst
+++ b/awscli/examples/s3api/list-objects-v2.rst
@@ -3,7 +3,7 @@
 The following ``list-objects-v2`` example lists the objects in the specified bucket. ::
 
     aws s3api list-objects-v2 \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 Output::
 
diff --git a/awscli/examples/s3api/list-parts.rst b/awscli/examples/s3api/list-parts.rst
index 2e574da1c224..0328f7133fc9 100644
--- a/awscli/examples/s3api/list-parts.rst
+++ b/awscli/examples/s3api/list-parts.rst
@@ -1,6 +1,6 @@
-The following command lists all of the parts that have been uploaded for a multipart upload with key ``multipart/01`` in the bucket ``my-bucket``::
+The following command lists all of the parts that have been uploaded for a multipart upload with key ``multipart/01`` in the bucket ``amzn-s3-demo-bucket``::
 
-  aws s3api list-parts --bucket my-bucket --key 'multipart/01' --upload-id dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R
+  aws s3api list-parts --bucket amzn-s3-demo-bucket --key 'multipart/01' --upload-id dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R
 
 Output::
 
diff --git a/awscli/examples/s3api/put-bucket-accelerate-configuration.rst b/awscli/examples/s3api/put-bucket-accelerate-configuration.rst
index 0cbb96053791..0bad93b16b78 100644
--- a/awscli/examples/s3api/put-bucket-accelerate-configuration.rst
+++ b/awscli/examples/s3api/put-bucket-accelerate-configuration.rst
@@ -3,7 +3,7 @@
 The following ``put-bucket-accelerate-configuration`` example enables the accelerate configuration for the specified bucket. ::
 
     aws s3api put-bucket-accelerate-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --accelerate-configuration Status=Enabled
 
 This command produces no output.
diff --git a/awscli/examples/s3api/put-bucket-analytics-configuration.rst b/awscli/examples/s3api/put-bucket-analytics-configuration.rst
index 25dea1fcfbae..64ae218931ae 100644
--- a/awscli/examples/s3api/put-bucket-analytics-configuration.rst
+++ b/awscli/examples/s3api/put-bucket-analytics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``put-bucket-analytics-configuration`` example configures analytics for the specified bucket. ::
 
     aws s3api put-bucket-analytics-configuration \
-        --bucket my-bucket --id 1 \
+        --bucket amzn-s3-demo-bucket --id 1 \
         --analytics-configuration '{"Id": "1","StorageClassAnalysis": {}}'
 
 This command produces no output.
diff --git a/awscli/examples/s3api/put-bucket-encryption.rst b/awscli/examples/s3api/put-bucket-encryption.rst
index da892f68aad0..c9bed5350fca 100644
--- a/awscli/examples/s3api/put-bucket-encryption.rst
+++ b/awscli/examples/s3api/put-bucket-encryption.rst
@@ -3,7 +3,7 @@
 The following ``put-bucket-encryption`` example sets AES256 encryption as the default for the specified bucket. ::
 
     aws s3api put-bucket-encryption \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --server-side-encryption-configuration '{"Rules": [{"ApplyServerSideEncryptionByDefault": {"SSEAlgorithm": "AES256"}}]}'
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/s3api/put-bucket-inventory-configuration.rst b/awscli/examples/s3api/put-bucket-inventory-configuration.rst
index a5f260604033..71cb607dbf63 100755
--- a/awscli/examples/s3api/put-bucket-inventory-configuration.rst
+++ b/awscli/examples/s3api/put-bucket-inventory-configuration.rst
@@ -1,21 +1,21 @@
 **Example 1: To set an inventory configuration for a bucket**
 
-The following ``put-bucket-inventory-configuration`` example sets a weekly ORC-formatted inventory report for the bucket ``my-bucket``. ::
+The following ``put-bucket-inventory-configuration`` example sets a weekly ORC-formatted inventory report for the bucket ``amzn-s3-demo-bucket``. ::
 
     aws s3api put-bucket-inventory-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 1 \
-        --inventory-configuration '{"Destination": { "S3BucketDestination": { "AccountId": "123456789012", "Bucket": "arn:aws:s3:::my-bucket", "Format": "ORC" }}, "IsEnabled": true, "Id": "1", "IncludedObjectVersions": "Current", "Schedule": { "Frequency": "Weekly" }}'
+        --inventory-configuration '{"Destination": { "S3BucketDestination": { "AccountId": "123456789012", "Bucket": "arn:aws:s3:::amzn-s3-demo-bucket", "Format": "ORC" }}, "IsEnabled": true, "Id": "1", "IncludedObjectVersions": "Current", "Schedule": { "Frequency": "Weekly" }}'
 
 This command produces no output.
 
 **Example 2: To set an inventory configuration for a bucket**
 
-The following ``put-bucket-inventory-configuration`` example sets a daily CSV-formatted inventory report for the bucket ``my-bucket``. ::
+The following ``put-bucket-inventory-configuration`` example sets a daily CSV-formatted inventory report for the bucket ``amzn-s3-demo-bucket``. ::
 
     aws s3api put-bucket-inventory-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 2 \
-        --inventory-configuration '{"Destination": { "S3BucketDestination": { "AccountId": "123456789012", "Bucket": "arn:aws:s3:::my-bucket", "Format": "CSV" }}, "IsEnabled": true, "Id": "2", "IncludedObjectVersions": "Current", "Schedule": { "Frequency": "Daily" }}'
+        --inventory-configuration '{"Destination": { "S3BucketDestination": { "AccountId": "123456789012", "Bucket": "arn:aws:s3:::amzn-s3-demo-bucket", "Format": "CSV" }}, "IsEnabled": true, "Id": "2", "IncludedObjectVersions": "Current", "Schedule": { "Frequency": "Daily" }}'
 
 This command produces no output.
diff --git a/awscli/examples/s3api/put-bucket-lifecycle-configuration.rst b/awscli/examples/s3api/put-bucket-lifecycle-configuration.rst
index 243ea8ea51f5..c47e452d2aa8 100644
--- a/awscli/examples/s3api/put-bucket-lifecycle-configuration.rst
+++ b/awscli/examples/s3api/put-bucket-lifecycle-configuration.rst
@@ -1,6 +1,6 @@
-The following command applies a lifecycle configuration to a bucket named ``my-bucket``::
+The following command applies a lifecycle configuration to a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api put-bucket-lifecycle-configuration --bucket my-bucket --lifecycle-configuration  file://lifecycle.json
+  aws s3api put-bucket-lifecycle-configuration --bucket amzn-s3-demo-bucket --lifecycle-configuration  file://lifecycle.json
 
 The file ``lifecycle.json`` is a JSON document in the current folder that specifies two rules::
 
diff --git a/awscli/examples/s3api/put-bucket-lifecycle.rst b/awscli/examples/s3api/put-bucket-lifecycle.rst
index c236b7d220ca..f4fc8582bcc9 100644
--- a/awscli/examples/s3api/put-bucket-lifecycle.rst
+++ b/awscli/examples/s3api/put-bucket-lifecycle.rst
@@ -1,6 +1,6 @@
-The following command applies a lifecycle configuration to the bucket ``my-bucket``::
+The following command applies a lifecycle configuration to the bucket ``amzn-s3-demo-bucket``::
 
-  aws s3api put-bucket-lifecycle --bucket my-bucket --lifecycle-configuration file://lifecycle.json
+  aws s3api put-bucket-lifecycle --bucket amzn-s3-demo-bucket --lifecycle-configuration file://lifecycle.json
 
 The file ``lifecycle.json`` is a JSON document in the current folder that specifies two rules::
 
diff --git a/awscli/examples/s3api/put-bucket-metrics-configuration.rst b/awscli/examples/s3api/put-bucket-metrics-configuration.rst
index 024118e03e96..7e6b3123eab3 100755
--- a/awscli/examples/s3api/put-bucket-metrics-configuration.rst
+++ b/awscli/examples/s3api/put-bucket-metrics-configuration.rst
@@ -3,7 +3,7 @@
 The following ``put-bucket-metrics-configuration`` example sets a metric configuration with ID 123 for the specified bucket. ::
 
     aws s3api put-bucket-metrics-configuration \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --id 123 \
         --metrics-configuration '{"Id": "123", "Filter": {"Prefix": "logs"}}'
 
diff --git a/awscli/examples/s3api/put-bucket-notification-configuration.rst b/awscli/examples/s3api/put-bucket-notification-configuration.rst
index fccb49dbbfa2..3ac21e64fde9 100644
--- a/awscli/examples/s3api/put-bucket-notification-configuration.rst
+++ b/awscli/examples/s3api/put-bucket-notification-configuration.rst
@@ -1,45 +1,45 @@
-**To enable the specified notifications to a bucket**
-
-The following ``put-bucket-notification-configuration`` example applies a notification configuration to a bucket named ``my-bucket``. The file ``notification.json`` is a JSON document in the current folder that specifies an SNS topic and an event type to monitor. ::
-
-    aws s3api put-bucket-notification-configuration \
-        --bucket my-bucket \
-        --notification-configuration file://notification.json
-
-Contents of ``notification.json``::
-
-    {
-        "TopicConfigurations": [
-            {
-                "TopicArn": "arn:aws:sns:us-west-2:123456789012:s3-notification-topic",
-                "Events": [
-                    "s3:ObjectCreated:*"
-                ]
-            }
-        ]
-    }
-
-The SNS topic must have an IAM policy attached to it that allows Amazon S3 to publish to it. ::
-
-    {
-        "Version": "2008-10-17",
-        "Id": "example-ID",
-        "Statement": [
-            {
-                "Sid": "example-statement-ID",
-                "Effect": "Allow",
-                "Principal": {
-                    "Service": "s3.amazonaws.com"
-                },
-                "Action": [
-                    "SNS:Publish"
-                ],
-                "Resource": "arn:aws:sns:us-west-2:123456789012::s3-notification-topic",
-                "Condition": {
-                    "ArnLike": {
-                        "aws:SourceArn": "arn:aws:s3:*:*:my-bucket"
-                    }
-                }
-            }
-        ]
+**To enable the specified notifications to a bucket**
+
+The following ``put-bucket-notification-configuration`` example applies a notification configuration to a bucket named ``amzn-s3-demo-bucket``. The file ``notification.json`` is a JSON document in the current folder that specifies an SNS topic and an event type to monitor. ::
+
+    aws s3api put-bucket-notification-configuration \
+        --bucket amzn-s3-demo-bucket \
+        --notification-configuration file://notification.json
+
+Contents of ``notification.json``::
+
+    {
+        "TopicConfigurations": [
+            {
+                "TopicArn": "arn:aws:sns:us-west-2:123456789012:s3-notification-topic",
+                "Events": [
+                    "s3:ObjectCreated:*"
+                ]
+            }
+        ]
+    }
+
+The SNS topic must have an IAM policy attached to it that allows Amazon S3 to publish to it. ::
+
+    {
+        "Version": "2008-10-17",
+        "Id": "example-ID",
+        "Statement": [
+            {
+                "Sid": "example-statement-ID",
+                "Effect": "Allow",
+                "Principal": {
+                    "Service": "s3.amazonaws.com"
+                },
+                "Action": [
+                    "SNS:Publish"
+                ],
+                "Resource": "arn:aws:sns:us-west-2:123456789012::s3-notification-topic",
+                "Condition": {
+                    "ArnLike": {
+                        "aws:SourceArn": "arn:aws:s3:*:*:amzn-s3-demo-bucket"
+                    }
+                }
+            }
+        ]
     }
\ No newline at end of file
diff --git a/awscli/examples/s3api/put-bucket-notification.rst b/awscli/examples/s3api/put-bucket-notification.rst
index c31b512eee03..5790b354d3f4 100644
--- a/awscli/examples/s3api/put-bucket-notification.rst
+++ b/awscli/examples/s3api/put-bucket-notification.rst
@@ -1,6 +1,6 @@
-The applies a notification configuration to a bucket named ``my-bucket``::
+The applies a notification configuration to a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api put-bucket-notification --bucket my-bucket --notification-configuration file://notification.json
+  aws s3api put-bucket-notification --bucket amzn-s3-demo-bucket --notification-configuration file://notification.json
 
 The file ``notification.json`` is a JSON document in the current folder that specifies an SNS topic and an event type to monitor::
 
@@ -26,10 +26,10 @@ The SNS topic must have an IAM policy attached to it that allows Amazon S3 to pu
      "Action": [
       "SNS:Publish"
      ],
-     "Resource": "arn:aws:sns:us-west-2:123456789012:my-bucket",
+     "Resource": "arn:aws:sns:us-west-2:123456789012:amzn-s3-demo-bucket",
      "Condition": {
         "ArnLike": {          
-        "aws:SourceArn": "arn:aws:s3:*:*:my-bucket"    
+        "aws:SourceArn": "arn:aws:s3:*:*:amzn-s3-demo-bucket"    
       }
      }
     }
diff --git a/awscli/examples/s3api/put-bucket-request-payment.rst b/awscli/examples/s3api/put-bucket-request-payment.rst
index 988fb077978d..516496a23d77 100644
--- a/awscli/examples/s3api/put-bucket-request-payment.rst
+++ b/awscli/examples/s3api/put-bucket-request-payment.rst
@@ -3,7 +3,7 @@
 The following ``put-bucket-request-payment`` example enables ``requester pays`` for the specified bucket. ::
 
     aws s3api put-bucket-request-payment \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --request-payment-configuration '{"Payer":"Requester"}'
 
 This command produces no output.
@@ -13,7 +13,7 @@ This command produces no output.
 The following ``put-bucket-request-payment`` example disables ``requester pays`` for the specified bucket. ::
 
     aws s3api put-bucket-request-payment \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --request-payment-configuration '{"Payer":"BucketOwner"}'
 
 This command produces no output.
diff --git a/awscli/examples/s3api/put-bucket-tagging.rst b/awscli/examples/s3api/put-bucket-tagging.rst
index adc4327eb15b..c954c88fe461 100644
--- a/awscli/examples/s3api/put-bucket-tagging.rst
+++ b/awscli/examples/s3api/put-bucket-tagging.rst
@@ -1,6 +1,6 @@
-The following command applies a tagging configuration to a bucket named ``my-bucket``::
+The following command applies a tagging configuration to a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api put-bucket-tagging --bucket my-bucket --tagging file://tagging.json
+  aws s3api put-bucket-tagging --bucket amzn-s3-demo-bucket --tagging file://tagging.json
 
 The file ``tagging.json`` is a JSON document in the current folder that specifies tags::
 
@@ -13,6 +13,6 @@ The file ``tagging.json`` is a JSON document in the current folder that specifie
      ]
   }
 
-Or apply a tagging configuration to ``my-bucket`` directly from the command line::
+Or apply a tagging configuration to ``amzn-s3-demo-bucket`` directly from the command line::
 
-  aws s3api put-bucket-tagging --bucket my-bucket --tagging 'TagSet=[{Key=organization,Value=marketing}]'
+  aws s3api put-bucket-tagging --bucket amzn-s3-demo-bucket --tagging 'TagSet=[{Key=organization,Value=marketing}]'
diff --git a/awscli/examples/s3api/put-bucket-versioning.rst b/awscli/examples/s3api/put-bucket-versioning.rst
index e27c166e27fc..4d75859a112a 100644
--- a/awscli/examples/s3api/put-bucket-versioning.rst
+++ b/awscli/examples/s3api/put-bucket-versioning.rst
@@ -1,7 +1,7 @@
-The following command enables versioning on a bucket named ``my-bucket``::
+The following command enables versioning on a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api put-bucket-versioning --bucket my-bucket --versioning-configuration Status=Enabled
+  aws s3api put-bucket-versioning --bucket amzn-s3-demo-bucket --versioning-configuration Status=Enabled
 
 The following command enables versioning, and uses an mfa code ::
 
-  aws s3api put-bucket-versioning --bucket my-bucket --versioning-configuration Status=Enabled --mfa "SERIAL 123456"
+  aws s3api put-bucket-versioning --bucket amzn-s3-demo-bucket --versioning-configuration Status=Enabled --mfa "SERIAL 123456"
diff --git a/awscli/examples/s3api/put-bucket-website.rst b/awscli/examples/s3api/put-bucket-website.rst
index 0d13f0e128af..e84e3cde8481 100644
--- a/awscli/examples/s3api/put-bucket-website.rst
+++ b/awscli/examples/s3api/put-bucket-website.rst
@@ -1,6 +1,6 @@
-The applies a static website configuration to a bucket named ``my-bucket``::
+The applies a static website configuration to a bucket named ``amzn-s3-demo-bucket``::
 
-  aws s3api put-bucket-website --bucket my-bucket --website-configuration file://website.json
+  aws s3api put-bucket-website --bucket amzn-s3-demo-bucket --website-configuration file://website.json
 
 The file ``website.json`` is a JSON document in the current folder that specifies index and error pages for the website::
 
diff --git a/awscli/examples/s3api/put-object-legal-hold.rst b/awscli/examples/s3api/put-object-legal-hold.rst
index aba1214b9960..07862ae34f5e 100644
--- a/awscli/examples/s3api/put-object-legal-hold.rst
+++ b/awscli/examples/s3api/put-object-legal-hold.rst
@@ -3,7 +3,7 @@
 The following ``put-object-legal-hold`` example sets a Legal Hold on the object ``doc1.rtf``. ::
 
     aws s3api put-object-legal-hold \
-        --bucket my-bucket-with-object-lock \
+        --bucket amzn-s3-demo-bucket-with-object-lock \
         --key doc1.rtf \
         --legal-hold Status=ON
 
diff --git a/awscli/examples/s3api/put-object-lock-configuration.rst b/awscli/examples/s3api/put-object-lock-configuration.rst
index 10344a2042a1..358397bba28c 100755
--- a/awscli/examples/s3api/put-object-lock-configuration.rst
+++ b/awscli/examples/s3api/put-object-lock-configuration.rst
@@ -3,7 +3,7 @@
 The following ``put-object-lock-configuration`` example sets a 50-day object lock on the specified bucket. ::
 
     aws s3api put-object-lock-configuration \
-        --bucket my-bucket-with-object-lock \
+        --bucket amzn-s3-demo-bucket-with-object-lock \
         --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 50 }}}'
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/s3api/put-object-retention.rst b/awscli/examples/s3api/put-object-retention.rst
index f2fc164f16cf..092a22937b15 100755
--- a/awscli/examples/s3api/put-object-retention.rst
+++ b/awscli/examples/s3api/put-object-retention.rst
@@ -3,7 +3,7 @@
 The following ``put-object-retention`` example sets an object retention configuration for the specified object until 2025-01-01. ::
 
     aws s3api put-object-retention \
-        --bucket my-bucket-with-object-lock \
+        --bucket amzn-s3-demo-bucket-with-object-lock \
         --key doc1.rtf \
         --retention '{ "Mode": "GOVERNANCE", "RetainUntilDate": "2025-01-01T00:00:00" }'
 
diff --git a/awscli/examples/s3api/put-object-tagging.rst b/awscli/examples/s3api/put-object-tagging.rst
index b63810897f73..169aefdb58b9 100755
--- a/awscli/examples/s3api/put-object-tagging.rst
+++ b/awscli/examples/s3api/put-object-tagging.rst
@@ -3,7 +3,7 @@
 The following ``put-object-tagging`` example sets a tag with the key ``designation`` and the value ``confidential`` on the specified object. ::
 
     aws s3api put-object-tagging \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc1.rtf \
         --tagging '{"TagSet": [{ "Key": "designation", "Value": "confidential" }]}'
 
@@ -12,7 +12,7 @@ This command produces no output.
 The following ``put-object-tagging`` example sets multiple tags sets on the specified object. ::
 
     aws s3api put-object-tagging \
-        --bucket my-bucket-example \
+        --bucket amzn-s3-demo-bucket-example \
         --key doc3.rtf \
         --tagging '{"TagSet": [{ "Key": "designation", "Value": "confidential" }, { "Key": "department", "Value": "finance" }, { "Key": "team", "Value": "payroll" } ]}'
 
diff --git a/awscli/examples/s3api/put-public-access-block.rst b/awscli/examples/s3api/put-public-access-block.rst
index f06bf915f85d..5d082bc98d34 100755
--- a/awscli/examples/s3api/put-public-access-block.rst
+++ b/awscli/examples/s3api/put-public-access-block.rst
@@ -3,7 +3,7 @@
 The following ``put-public-access-block`` example sets a restrictive block public access configuration for the specified bucket. ::
 
     aws s3api put-public-access-block \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --public-access-block-configuration "BlockPublicAcls=true,IgnorePublicAcls=true,BlockPublicPolicy=true,RestrictPublicBuckets=true"
 
 This command produces no output.
diff --git a/awscli/examples/s3api/select-object-content.rst b/awscli/examples/s3api/select-object-content.rst
index 0385f8e30f22..5462af4f1f39 100755
--- a/awscli/examples/s3api/select-object-content.rst
+++ b/awscli/examples/s3api/select-object-content.rst
@@ -3,7 +3,7 @@
 The following ``select-object-content`` example filters the object ``my-data-file.csv`` with the specified SQL statement and sends output to a file. ::
 
     aws s3api select-object-content \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key my-data-file.csv \
         --expression "select * from s3object limit 100" \
         --expression-type 'SQL' \
diff --git a/awscli/examples/s3api/upload-part-copy.rst b/awscli/examples/s3api/upload-part-copy.rst
index 2c0504261e23..a1194464ca35 100755
--- a/awscli/examples/s3api/upload-part-copy.rst
+++ b/awscli/examples/s3api/upload-part-copy.rst
@@ -3,9 +3,9 @@
 The following ``upload-part-copy`` example uploads a part by copying data from an existing object as a data source. ::
 
     aws s3api upload-part-copy \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key "Map_Data_June.mp4" \
-        --copy-source "my-bucket/copy_of_Map_Data_June.mp4" \
+        --copy-source "amzn-s3-demo-bucket/copy_of_Map_Data_June.mp4" \
         --part-number 1 \
         --upload-id "bq0tdE1CDpWQYRPLHuNG50xAT6pA5D.m_RiBy0ggOH6b13pVRY7QjvLlf75iFdJqp_2wztk5hvpUM2SesXgrzbehG5hViyktrfANpAD0NO.Nk3XREBqvGeZF6U3ipiSm"
 
diff --git a/awscli/examples/s3api/upload-part.rst b/awscli/examples/s3api/upload-part.rst
index e8a35eb1f7c6..fb8f4a704040 100644
--- a/awscli/examples/s3api/upload-part.rst
+++ b/awscli/examples/s3api/upload-part.rst
@@ -1,6 +1,6 @@
 The following command uploads the first part in a multipart upload initiated with the ``create-multipart-upload`` command::
 
-  aws s3api upload-part --bucket my-bucket --key 'multipart/01' --part-number 1 --body part01 --upload-id  "dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R"
+  aws s3api upload-part --bucket amzn-s3-demo-bucket --key 'multipart/01' --part-number 1 --body part01 --upload-id  "dfRtDYU0WWCCcH43C3WFbkRONycyCpTJJvxu2i5GYkZljF.Yxwh6XG7WfS2vC4to6HiV6Yjlx.cph0gtNBtJ8P3URCSbB7rjxI5iEwVDmgaXZOGgkk5nVTW16HOQ5l0R"
 
 The ``body`` option takes the name or path of a local file for upload (do not use the file:// prefix). The minimum part size is 5 MB. Upload ID is returned by ``create-multipart-upload`` and can also be retrieved with ``list-multipart-uploads``. Bucket and key are specified when you create the multipart upload.
 
diff --git a/awscli/examples/s3api/wait/bucket-exists.rst b/awscli/examples/s3api/wait/bucket-exists.rst
index 35d0060386ad..b6c1d27fa7da 100755
--- a/awscli/examples/s3api/wait/bucket-exists.rst
+++ b/awscli/examples/s3api/wait/bucket-exists.rst
@@ -3,6 +3,6 @@
 The following ``wait bucket-exists`` example pauses and continues only after it can confirm that the specified bucket exists. ::
 
     aws s3api wait bucket-exists \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 This command produces no output.
diff --git a/awscli/examples/s3api/wait/bucket-not-exists.rst b/awscli/examples/s3api/wait/bucket-not-exists.rst
index 941f9f02ff7f..ef975b1ea132 100755
--- a/awscli/examples/s3api/wait/bucket-not-exists.rst
+++ b/awscli/examples/s3api/wait/bucket-not-exists.rst
@@ -3,6 +3,6 @@
 The following ``wait bucket-not-exists`` example pauses and continues only after it can confirm that the specified bucket doesn't exist. ::
 
     aws s3api wait bucket-not-exists \
-        --bucket my-bucket
+        --bucket amzn-s3-demo-bucket
 
 This command produces no output.
diff --git a/awscli/examples/s3api/wait/object-exists.rst b/awscli/examples/s3api/wait/object-exists.rst
index 787f4f838d7e..ddef8f8ea625 100755
--- a/awscli/examples/s3api/wait/object-exists.rst
+++ b/awscli/examples/s3api/wait/object-exists.rst
@@ -3,7 +3,7 @@
 The following ``wait object-not-exists`` example pauses and continues only after it can confirm that the specified object (``--key``) in the specified bucket exists. ::
 
     aws s3api wait object-exists \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc1.rtf
 
 This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/s3api/wait/object-not-exists.rst b/awscli/examples/s3api/wait/object-not-exists.rst
index 416cb930d07e..a19df3e412c4 100755
--- a/awscli/examples/s3api/wait/object-not-exists.rst
+++ b/awscli/examples/s3api/wait/object-not-exists.rst
@@ -3,7 +3,7 @@
 The following ``wait object-not-exists`` example pauses and continues only after it can confirm that the specified object (``--key``) in the specified bucket doesn't exist. ::
 
     aws s3api wait object-not-exists \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --key doc1.rtf
 
 This command produces no output.
\ No newline at end of file

From 90ad642b40709fec28dc81e72938939ae30f3fc0 Mon Sep 17 00:00:00 2001
From: David Souther <davidsouther+github@gmail.com>
Date: Fri, 31 Jan 2025 11:50:09 -0800
Subject: [PATCH 2/2] Update create-spot-datafeed-subscription.rst

---
 awscli/examples/ec2/create-spot-datafeed-subscription.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awscli/examples/ec2/create-spot-datafeed-subscription.rst b/awscli/examples/ec2/create-spot-datafeed-subscription.rst
index 8fbb00eb6b3a..29dd3992737b 100644
--- a/awscli/examples/ec2/create-spot-datafeed-subscription.rst
+++ b/awscli/examples/ec2/create-spot-datafeed-subscription.rst
@@ -3,14 +3,14 @@
 The following ``create-spot-datafeed-subscription`` example creates a Spot Instance data feed. ::
 
     aws ec2 create-spot-datafeed-subscription \
-        --bucket my-bucket \
+        --bucket amzn-s3-demo-bucket \
         --prefix spot-data-feed
 
 Output::
 
     {
         "SpotDatafeedSubscription": {
-            "Bucket": "my-bucket",
+            "Bucket": "amzn-s3-demo-bucket",
             "OwnerId": "123456789012",
             "Prefix": "spot-data-feed",
             "State": "Active"
@@ -19,6 +19,6 @@ Output::
 
 The data feed is stored in the Amazon S3 bucket that you specified. The file names for this data feed have the following format. ::
 
-    my-bucket.s3.amazonaws.com/spot-data-feed/123456789012.YYYY-MM-DD-HH.n.abcd1234.gz
+    amzn-s3-demo-bucket.s3.amazonaws.com/spot-data-feed/123456789012.YYYY-MM-DD-HH.n.abcd1234.gz
 
 For more information, see `Spot Instance data feed <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html>`__ in the *Amazon EC2 User Guide*.