From 34a6a24544148f22461bb6b5f007930b4d1ac1c6 Mon Sep 17 00:00:00 2001 From: Gurjeet Singh Date: Sat, 13 Nov 2021 10:56:59 -0800 Subject: [PATCH] Use S3's proper product name, Amazon S3 Per Amazon's product page [1], S3 is officially called "Amazon S3". The restic project uses the phrase "AWS S3" in some places. This patch corrects the product name. [1]:https://aws.amazon.com/s3/ --- CHANGELOG.md | 2 +- README.md | 2 +- cmd/restic/integration_test.go | 2 +- doc/030_preparing_a_new_repo.rst | 4 ++-- doc/080_examples.rst | 6 +++--- doc/design.rst | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 383eda1b9..2ae77dcc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -604,7 +604,7 @@ Details reduced. Restic used to rebuild the index from scratch after pruning. This could lead to missing packs in - the index in some cases for eventually consistent backends such as e.g. AWS S3. This behavior is + the index in some cases for eventually consistent backends such as e.g. Amazon S3. This behavior is now changed and the index rebuilding uses the information already known by `prune`. By default, the `prune` command no longer removes all unused data. This behavior can be diff --git a/README.md b/README.md index acabdafae..8f72a0200 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Therefore, restic supports the following backends for storing backups natively: - [Local directory](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#local) - [sftp server (via SSH)](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#sftp) - [HTTP REST server](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#rest-server) ([protocol](https://restic.readthedocs.io/en/latest/100_references.html#rest-backend), [rest-server](https://github.com/restic/rest-server)) -- [AWS S3](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#amazon-s3) (either from Amazon or using the [Minio](https://minio.io) server) +- [Amazon S3](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#amazon-s3) (either from Amazon or using the [Minio](https://minio.io) server) - [OpenStack Swift](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#openstack-swift) - [BackBlaze B2](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#backblaze-b2) - [Microsoft Azure Blob Storage](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#microsoft-azure-blob-storage) diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go index 09269c575..960fbc7e7 100644 --- a/cmd/restic/integration_test.go +++ b/cmd/restic/integration_test.go @@ -1744,7 +1744,7 @@ func testEdgeCaseRepo(t *testing.T, tarfile string, optionsCheck CheckOptions, o // a listOnceBackend only allows listing once per filetype // listing filetypes more than once may cause problems with eventually consistent -// backends (like e.g. AWS S3) as the second listing may be inconsistent to what +// backends (like e.g. Amazon S3) as the second listing may be inconsistent to what // is expected by the first listing + some operations. type listOnceBackend struct { restic.Backend diff --git a/doc/030_preparing_a_new_repo.rst b/doc/030_preparing_a_new_repo.rst index 19fb5d17b..937ac1f51 100644 --- a/doc/030_preparing_a_new_repo.rst +++ b/doc/030_preparing_a_new_repo.rst @@ -257,7 +257,7 @@ Minio Server ************ `Minio `__ is an Open Source Object Storage, -written in Go and compatible with AWS S3 API. +written in Go and compatible with Amazon S3 API. - Download and Install `Minio Server `__. @@ -287,7 +287,7 @@ this command. Wasabi ************ -`Wasabi `__ is a low cost AWS S3 conformant object storage provider. +`Wasabi `__ is a low cost Amazon S3 conformant object storage provider. Due to it's S3 conformance, Wasabi can be used as a storage provider for a restic repository. - Create a Wasabi bucket using the `Wasabi Console `__. diff --git a/doc/080_examples.rst b/doc/080_examples.rst index 5aa10be24..5c33dfc61 100644 --- a/doc/080_examples.rst +++ b/doc/080_examples.rst @@ -21,7 +21,7 @@ Setting up restic with Amazon S3 Preface ======= -This tutorial will show you how to use restic with AWS S3. It will show you how +This tutorial will show you how to use restic with Amazon S3. It will show you how to navigate the AWS web interface, create an S3 bucket, create a user with access to only this bucket, and finally how to connect restic to this bucket. @@ -226,7 +226,7 @@ repository: the repository. Losing your password means that your data is irrecoverably lost. -restic is now ready to be used with AWS S3. Try to create a backup: +restic is now ready to be used with Amazon S3. Try to create a backup: .. code-block:: console @@ -247,7 +247,7 @@ restic is now ready to be used with AWS S3. Try to create a backup: ---------------------------------------------------------------------- 10fdbace 2017-03-26 16:41:50 blackbox /home/philip/restic-demo/test.bin -A snapshot was created and stored in the S3 bucket. By default backups to AWS S3 will use the ``STANDARD`` storage class. Available storage classes include ``STANDARD``, ``STANDARD_IA``, ``ONEZONE_IA``, ``INTELLIGENT_TIERING``, and ``REDUCED_REDUNDANCY``. A different storage class could have been specified in the above command by using ``-o`` or ``--option``: +A snapshot was created and stored in the S3 bucket. By default backups to Amazon S3 will use the ``STANDARD`` storage class. Available storage classes include ``STANDARD``, ``STANDARD_IA``, ``ONEZONE_IA``, ``INTELLIGENT_TIERING``, and ``REDUCED_REDUNDANCY``. A different storage class could have been specified in the above command by using ``-o`` or ``--option``: .. code-block:: console diff --git a/doc/design.rst b/doc/design.rst index 5c7ef6b20..c313c1a70 100644 --- a/doc/design.rst +++ b/doc/design.rst @@ -125,7 +125,7 @@ s3 backend ``s3.layout``. S3 Legacy Layout ---------------- -Unfortunately during development the AWS S3 backend uses slightly different +Unfortunately during development the Amazon S3 backend uses slightly different paths (directory names use singular instead of plural for ``key``, ``lock``, and ``snapshot`` files), and the pack files are stored directly below the ``data`` directory. The S3 Legacy repository layout looks like this: