feat(gen): remove mentions of S3 only

SamyOubouaziz · SamyOubouaziz · commit ac2b66d4df44 · 2024-10-25T15:25:26.000+02:00
diff --git a/managed-services/iot-hub/how-to/understand-event-messages.mdx b/managed-services/iot-hub/how-to/understand-event-messages.mdx
@@ -62,7 +62,7 @@ This section shows you the types of message that can be received in IoT Hub Even
 
 ### Amazon S3 route errors
 - `"'BUCKET_NAME' s3 bucket write failed. Error HTTP_STATUS_CODE: ERROR_CODE (request-id: REQUEST_ID)"`:
-    The route failed to write to the specified s3 bucket.
+    The route failed to write to the specified Object Storage bucket.
     `BUCKET_NAME` is the name of the bucket route attempt to write to, `HTTP_STATUS_CODE` and `ERROR_CODE` are standard [S3 error codes](https://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html#ErrorCodeList)
 
 ## Database errors
diff --git a/managed-services/iot-hub/reference-content/routes.mdx b/managed-services/iot-hub/reference-content/routes.mdx
@@ -8,7 +8,7 @@ content:
 excerpt: |
   This page provides detailed information about Scaleway IoT Hub Routes.
 totalTime: PT5M
-tags: iot iot-hub route s3 database postgres postgresql mysql rest api inference
+tags: iot iot-hub route amazon-s3 database postgres postgresql mysql rest api inference
 dates:
   validation: 2024-05-06
   posted: 2021-08-31
diff --git a/network/load-balancer/how-to/set-up-s3-failover.mdx b/network/load-balancer/how-to/set-up-s3-failover.mdx
@@ -5,7 +5,7 @@ meta:
 content:
   h1: How to configure a customized error page
   paragraph: This page explains how to configure a customized error page for your Load Balancer, using the Scaleway Object Storage Bucket Website feature
-tags: s3-failover s3 failover load-balancer object-storage bucket
+tags: s3-failover amazon-s3 failover load-balancer object-storage bucket
 dates:
   validation: 2024-05-26
   posted: 2022-02-21
diff --git a/storage/object/api-cli/bucket-website-api.mdx b/storage/object/api-cli/bucket-website-api.mdx
@@ -179,7 +179,7 @@ If you want your website to be accessible, you need to set up a bucket policy.
 
 ### Configuring your URL
 
-You can access your website using the website endpoint of your bucket, generated by s3 under the default format:
+You can access your website using the website endpoint of your bucket, generated by Amazon S3 under the default format:
 
 `https://<bucket_name>.s3-website.<bucket_region>.scw.cloud`
 
diff --git a/storage/object/api-cli/combining-iam-and-object-storage.mdx b/storage/object/api-cli/combining-iam-and-object-storage.mdx
@@ -5,7 +5,7 @@ meta:
 content:
   h1: Combining IAM and bucket policies to set up granular access to Object Storage
   paragraph: Integrate IAM with Scaleway Object Storage for enhanced access control.
-tags: object storage command bucket s3 iam permissions acl policy
+tags: object storage command bucket amazon-s3 iam permissions acl policy
 dates:
   validation: 2024-05-14
   posted: 2023-01-17
diff --git a/storage/object/api-cli/installing-minio-client.mdx b/storage/object/api-cli/installing-minio-client.mdx
@@ -14,7 +14,7 @@ categories:
   - object-storage
 ---
 
-The [MinIO Client](https://min.io/docs/minio/linux/reference/minio-mc.html) (`mc`) is a command-line tool that allows you to manage your s3 projects, providing a modern alternative to UNIX commands.
+The [MinIO Client](https://min.io/docs/minio/linux/reference/minio-mc.html) (`mc`) is a command-line tool that allows you to manage your Object Storage projects, providing a modern alternative to UNIX commands.
 
 <Macro id="requirements" />
 
diff --git a/storage/object/api-cli/managing-lifecycle-cliv2.mdx b/storage/object/api-cli/managing-lifecycle-cliv2.mdx
@@ -27,7 +27,7 @@ categories:
 - A valid [API key](/identity-and-access-management/iam/how-to/create-api-keys/)
 - An [Object Storage bucket](/storage/object/how-to/create-a-bucket/)
 - Installed and initialized the [Scaleway CLI](/developer-tools/scaleway-cli/quickstart/)
-- Downloaded [S3cmd](https://github.com/s3tools/s3cmd), [rclone](https://rclone.org/downloads/) and [mc](https://github.com/minio/mc) s3 tools
+- Downloaded [S3cmd](https://github.com/s3tools/s3cmd), [rclone](https://rclone.org/downloads/) and [mc](https://github.com/minio/mc)
 
 
 ## Creating a configuration file for the Scaleway CLI
@@ -210,7 +210,7 @@ Run the following command in a terminal to remove an object from your bucket:
     ```
 
 <Message type="tip">
-  For more information about the s3 tools used in this documentation, refer to the official [rclone](https://rclone.org/docs/), [s3cmd](https://s3tools.org/s3cmd-howto), and [mc](https://github.com/minio/mc) documentation.
+  For more information about the Amazon S3-compatible tools used in this documentation, refer to the official [rclone](https://rclone.org/docs/), [s3cmd](https://s3tools.org/s3cmd-howto), and [mc](https://github.com/minio/mc) documentation.
 </Message>
 
 
diff --git a/storage/object/api-cli/setting-cors-rules.mdx b/storage/object/api-cli/setting-cors-rules.mdx
@@ -5,7 +5,7 @@ meta:
 content:
   h1: Setting CORS rules on Object Storage buckets
   paragraph: Set CORS rules to manage cross-origin requests in Scaleway Object Storage.
-tags: object storage object-storage s3 bucket cors cors-rule
+tags: object storage object-storage aws-s3 bucket cors cors-rule
 dates:
   validation: 2024-06-17
   posted: 2021-05-19
diff --git a/storage/object/concepts.mdx b/storage/object/concepts.mdx
@@ -15,7 +15,11 @@ categories:
 
 ## Access control list (ACL)
 
+<<<<<<< HEAD
 Access control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Amazon S3 checks its ACL and verifies that they have permission to carry out the request.
+=======
+Access control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Object Storage checks its ACL and verifies that they have permission to carry out the request.
+>>>>>>> 8888c6b0f (feat(gen): remove mentions of S3 only)
 
 ## Bucket
 
diff --git a/storage/object/how-to/create-bucket-policy.mdx b/storage/object/how-to/create-bucket-policy.mdx
@@ -5,7 +5,7 @@ meta:
 content:
   h1: How to create and manage bucket policies using the console
   paragraph: Create and apply bucket policies for Object Storage.
-tags: bucket policy bucket console object storage s3 access
+tags: bucket policy bucket console object storage aws-s3 access
 dates:
   validation: 2024-05-30
   posted: 2024-05-30
diff --git a/storage/object/reference-content/s3-iam-permissions-equivalence.mdx b/storage/object/reference-content/s3-iam-permissions-equivalence.mdx
@@ -3,9 +3,15 @@ meta:
   title: Amazon S3 and IAM permissions equivalence
   description: Understand how IAM permissions in Amazon S3 relate to Scaleway Object Storage.
 content:
+<<<<<<< HEAD
   h1: Amazon S3 and IAM permissions equivalence
   paragraph: Understand how IAM permissions in Amazon S3 relate to Scaleway Object Storage.
 tags: object-storage Amazon-S3 aws action equivalent iam permission set
+=======
+  h1: S3 and IAM permissions equivalence
+  paragraph: Understand how IAM permissions in S3 relate to Scaleway Object Storage.
+tags: object-storage aws-s3 aws action equivalent iam permission set
+>>>>>>> 8888c6b0f (feat(gen): remove mentions of S3 only)
 categories: 
   - storage
   - object
diff --git a/tutorials/configure-plex-s3/index.mdx b/tutorials/configure-plex-s3/index.mdx
@@ -1,7 +1,7 @@
 ---
 meta:
   title: Configuring Plex Media Server with Object Storage
-  description: This page shows how to set up an s3 media server with Plex and Object Storage
+  description: This page shows how to set up a media server with Plex and Object Storage
 content:
   h1: Configuring Plex Media Server with Object Storage
   paragraph: This page shows how to configure Plex media server with Object Storage
diff --git a/tutorials/encrypt-s3-data-rclone/index.mdx b/tutorials/encrypt-s3-data-rclone/index.mdx
@@ -7,7 +7,7 @@ content:
   paragraph: In this tutorial, you will learn how to encrypt your data using Rclone before uploading it to Scaleway Object Storage.
 categories:
   - object-storage
-tags: encryption s3 rclone
+tags: encryption amazon-s3 rclone
 dates:
   validation: 2024-09-16
   posted: 2020-06-10
diff --git a/tutorials/large-messages/index.mdx b/tutorials/large-messages/index.mdx
@@ -296,7 +296,7 @@ We continue using the Scaleway ecosystem and deploy the consumer using a Serverl
     secret_access_key = os.getenv("SECRET_ACCESS_KEY")
     ```
 
-10. Get the input file name from the body, define the PDF file name from this, and set up the s3 client to upload the file with Scaleway credentials.
+10. Get the input file name from the body, define the PDF file name from this, and set up the Amazon S3 client to upload the file with Scaleway credentials.
     ```python
     input_file = event['body']
     output_file = os.path.splitext(input_file)[0] + ".pdf"
@@ -318,7 +318,7 @@ We continue using the Scaleway ecosystem and deploy the consumer using a Serverl
         print("Successfully made pdf file")
     ```
 
-12. Download the image from the bucket using the s3 client.
+12. Download the image from the bucket using the Amazon S3 client.
     ```python
     s3.download_file(bucket_name, input_file, input_file)
     print("Object " + input_file + " downloaded")
