Merge branch 'main' into sto-com

Author: fghaas

docs/background/object-storage.md

@@ -1,12 +1,12 @@
 # Object storage in {{brand}}
 
-Object storage in {{brand}} is implemented via the [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/index.html), also known as `radosgw` (commonly pronounced "[rados](https://docs.ceph.com/en/latest/glossary/#term-RADOS) gateway").
+Object storage in {{brand}} is implemented via the [Ceph Object Gateway](https://docs.ceph.com/en/tentacle/radosgw/index.html), also known as `radosgw` (commonly pronounced "[rados](https://docs.ceph.com/en/tentacle/glossary/#term-RADOS) gateway").
 
 This facility exposes access to objects via two RESTful APIs: the [Amazon S3 API](https://docs.aws.amazon.com/AmazonS3/latest/API/), and the [OpenStack Swift API](https://docs.openstack.org/api-ref/object-store/).
 It is, however, important to understand that radosgw shares no code with Amazon S3, nor with OpenStack Swift.
 
 As such, object storage in {{brand}} is not expected to behave *exactly* as Amazon S3 or OpenStack Swift, although it tracks their behavior very closely.
-The Ceph upstream documentation lists API deviations from the respective reference implementations, for both the [S3](https://docs.ceph.com/en/latest/radosgw/s3/) and the [Swift](https://docs.ceph.com/en/latest/radosgw/swift/) API.
+The Ceph upstream documentation lists API deviations from the respective reference implementations, for both the [S3](https://docs.ceph.com/en/tentacle/radosgw/s3/) and the [Swift](https://docs.ceph.com/en/tentacle/radosgw/swift/) API.
 Our [reference section](../reference/index.md) lists additional [limitations](../reference/limitations/object-storage.md) specific to {{brand}}.
 
 ## Object storage integration with OpenStack authentication

docs/howto/object-storage/s3/object-lock.md

@@ -179,7 +179,7 @@ To configure the legal hold for all objects in a bucket, use the following comma
     ```bash
     aws --profile {{api_region|lower}} \
       s3api list-objects \
-      --bucket <bucket-name \
+      --bucket <bucket-name> \
       | jq .Contents[].Key \
       | xargs -n1 aws --profile {{api_region|lower}} s3api put-object-legal-hold --legal-hold Status=ON --bucket <bucket-name> --key
     ```

docs/howto/object-storage/s3/presign.md

@@ -25,7 +25,7 @@ To create a pre-signed URL for an object, you use the following command (replace
     ```bash
     aws --profile {{api_region|lower}} \
       s3 presign \
-      --expires-in <seconds>
+      --expires-in <seconds> \
       s3://<bucket-name>/<object-name>
     ```
 === "mc"
@@ -111,7 +111,7 @@ To ensure that an object named `bar.pdf` in a bucket named `foo` is always downl
 === "s3cmd"
     ```bash
     s3cmd -c ~/.s3cfg-{{api_region|lower}} modify \
-      --add-header 'Content-Disposition: attachment; filename="bar.pdf"'
+      --add-header 'Content-Disposition: attachment; filename="bar.pdf"' \
       s3://foo/bar.pdf
     ```
 
@@ -122,9 +122,9 @@ To ensure that an object named `bar.pdf` in a bucket named `foo` is always downl
     ```bash
     aws --profile {{api_region|lower}} \
       s3api copy-object \
-      --copy-source <bucket-name>/<object-name>
+      --copy-source <bucket-name>/<object-name> \
       --content-disposition 'attachment;filename="bar.pdf"' \
-      --metadata-directive replace
+      --metadata-directive replace \
       --bucket <bucket-name> \
       --key <object-name>
     ```
@@ -134,7 +134,7 @@ To ensure that an object named `bar.pdf` in a bucket named `foo` is always downl
     `s3cmd` comes with a handy `modify --add-header` subcommand for updating object metadata in-place:
     ```bash
     s3cmd -c ~/.s3cfg-{{api_region|lower}} modify \
-      --add-header 'Content-Disposition: attachment; filename="bar.pdf"'
+      --add-header 'Content-Disposition: attachment; filename="bar.pdf"' \
       s3://foo/bar.pdf
     ```
 

docs/howto/object-storage/s3/public-bucket.md

@@ -11,7 +11,7 @@ Making a bucket globally readable entails setting a *bucket policy* that enables
 
 ## Prerequisites
 
-Object versioning requires that you configure your environment with [working S3-compatible credentials](credentials.md).
+To set up a public bucket, you must first configure your environment with [working S3-compatible credentials](credentials.md).
 
 ## Setting a public read policy for a bucket
 

docs/howto/object-storage/s3/sse-c.md

@@ -52,7 +52,7 @@ In order to generate encryption key and store it in Barbican, proceed as follows
 
 ## Managing encrypted objects in S3
 
-Once you have your encryption secret available, you can create or access enabled objects.
+Once you have your encryption secret available, you can create or access encrypted objects.
 
 === "aws"
     1. Create an S3 bucket:
@@ -94,14 +94,14 @@ Once you have your encryption secret available, you can create or access enabled
        ```bash
        mc cp \
          --recursive \
-         --encrypt-key "{{api_region|lower}}/{{brand|lower|replace(' ','')}}-encrypted=${secret}"
+         --encrypt-key "{{api_region|lower}}/{{brand|lower|replace(' ','')}}-encrypted=${secret}" \
          ~/media/ {{api_region|lower}}/{{brand|lower|replace(' ','')}}-encrypted
        ```
     3. Retrieve a file from S3 and decrypt it.
        Again, specify the encryption key in the same manner:
        ```bash
        mc cp \
-         --encrypt-key "{{api_region|lower}}/{{brand|lower|replace(' ','')}}-encrypted=${secret}"
+         --encrypt-key "{{api_region|lower}}/{{brand|lower|replace(' ','')}}-encrypted=${secret}" \
          {{api_region|lower}}/{{brand|lower|replace(' ','')}}-encrypted/file.png .
        ```
 
@@ -129,7 +129,7 @@ Once you have your encryption secret available, you can create or access enabled
        env_auth = false
        access_key_id = <access key id>
        secret_access_key = <secret key>
-       endpoint = {{api_region|lower}}.{{api_domain}}
+       endpoint = s3-{{api_region|lower}}.{{api_domain}}
        acl = private
        sse_customer_algorithm = AES256
        ```

docs/howto/object-storage/swift/versioning.md

@@ -5,7 +5,7 @@ Using the Swift API, you have the option to retain multiple versions of an objec
 ## Prerequisites
 
 In order to manage object versioning, be sure that you have [installed and configured](index.md) the `swift` command-line interface (CLI).
-There is presently no way to set object expiry with the `openstack` CLI.
+There is presently no way to manage object versioning with the `openstack` CLI.
 
 Also, ensure that you have configured a [private container](private-container.md), i.e. one with an empty Read ACL.
 The examples in this how-to guide assume that your container is named `private-container`, and that it presently contains a single object named `testobj.txt`.

docs/reference/versions/index.md

@@ -21,4 +21,4 @@ In {{brand_public}} we upgrade OpenStack releases annually; this means that we n
 
 [Ceph major releases](https://docs.ceph.com/en/latest/releases/index.html#release-timeline) are also named in alphabetical order, and occur on a roughly annual schedule.
 
-{{brand}} currently runs Ceph [Reef](https://docs.ceph.com/en/latest/releases/reef/) and [Tentacle](https://docs.ceph.com/en/latest/releases/tentacle/).
+{{brand}} currently runs Ceph [Reef](https://docs.ceph.com/en/reef/releases/reef/) and [Tentacle](https://docs.ceph.com/en/tentacle/releases/tentacle/).