From 202d3f0e3c3c8ea69ea6df34a9bdf9b401fb6404 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 14 Jul 2023 14:24:27 +0300 Subject: [PATCH 1/5] doc/api: fix typo --- doc/api/garage-admin-v0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/garage-admin-v0.yml b/doc/api/garage-admin-v0.yml index 51968894..83316d93 100644 --- a/doc/api/garage-admin-v0.yml +++ b/doc/api/garage-admin-v0.yml @@ -632,7 +632,7 @@ paths: operationId: "UpdateBucket" summary: "Update a bucket" description: | - All fields (`websiteAccess` and `quotas`) are optionnal. + All fields (`websiteAccess` and `quotas`) are optional. If they are present, the corresponding modifications are applied to the bucket, otherwise nothing is changed. In `websiteAccess`: if `enabled` is `true`, `indexDocument` must be specified. From 194549ca46736f56662a438c9b43340a58d1dcc3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 14 Jul 2023 14:24:40 +0300 Subject: [PATCH 2/5] doc/book: fix typo --- doc/book/reference-manual/configuration.md | 4 ++-- doc/book/reference-manual/k2v.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/book/reference-manual/configuration.md b/doc/book/reference-manual/configuration.md index 20a79aa6..b916bb61 100644 --- a/doc/book/reference-manual/configuration.md +++ b/doc/book/reference-manual/configuration.md @@ -409,7 +409,7 @@ message that redirects the client to the correct region. ### `root_domain` {#root_domain} -The optionnal suffix to access bucket using vhost-style in addition to path-style request. +The optional suffix to access bucket using vhost-style in addition to path-style request. Note path-style requests are always enabled, whether or not vhost-style is configured. Configuring vhost-style S3 required a wildcard DNS entry, and possibly a wildcard TLS certificate, but might be required by softwares not supporting path-style requests. @@ -432,7 +432,7 @@ This endpoint does not suport TLS: a reverse proxy should be used to provide it. ### `root_domain` -The optionnal suffix appended to bucket names for the corresponding HTTP Host. +The optional suffix appended to bucket names for the corresponding HTTP Host. For instance, if `root_domain` is `web.garage.eu`, a bucket called `deuxfleurs.fr` will be accessible either with hostname `deuxfleurs.fr.web.garage.eu` diff --git a/doc/book/reference-manual/k2v.md b/doc/book/reference-manual/k2v.md index ed069b27..c01f641e 100644 --- a/doc/book/reference-manual/k2v.md +++ b/doc/book/reference-manual/k2v.md @@ -3,7 +3,7 @@ title = "K2V" weight = 100 +++ -Starting with version 0.7.2, Garage introduces an optionnal feature, K2V, +Starting with version 0.7.2, Garage introduces an optional feature, K2V, which is an alternative storage API designed to help efficiently store many small values in buckets (in opposition to S3 which is more designed to store large blobs). From f0b7a0af3dfc2b550e1d86fa11f4e10a8337e6cb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 14 Jul 2023 14:25:14 +0300 Subject: [PATCH 3/5] doc/drafts: fix typo --- doc/drafts/admin-api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/drafts/admin-api.md b/doc/drafts/admin-api.md index 9a697a59..fb71dc83 100644 --- a/doc/drafts/admin-api.md +++ b/doc/drafts/admin-api.md @@ -453,7 +453,7 @@ Request body format: } ``` -All fields (`name`, `allow` and `deny`) are optionnal. +All fields (`name`, `allow` and `deny`) are optional. If they are present, the corresponding modifications are applied to the key, otherwise nothing is changed. The possible flags in `allow` and `deny` are: `createBucket`. @@ -609,7 +609,7 @@ Request body format: } ``` -All fields (`websiteAccess` and `quotas`) are optionnal. +All fields (`websiteAccess` and `quotas`) are optional. If they are present, the corresponding modifications are applied to the bucket, otherwise nothing is changed. In `websiteAccess`: if `enabled` is `true`, `indexDocument` must be specified. From b1ca1784a12f2eed4cb9d85cdf8c3c1b8a0147da Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 14 Jul 2023 14:25:33 +0300 Subject: [PATCH 4/5] src/garage/cli: fix typo --- src/garage/cli/structs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs index 01ae92da..6e585e53 100644 --- a/src/garage/cli/structs.rs +++ b/src/garage/cli/structs.rs @@ -216,7 +216,7 @@ pub struct WebsiteOpt { #[structopt(short = "i", long = "index-document", default_value = "index.html")] pub index_document: String, - /// Error document: the optionnal document returned when an error occurs + /// Error document: the optional document returned when an error occurs #[structopt(short = "e", long = "error-document")] pub error_document: Option, } From c855284760d4ac198f5acf2ae0e18f98870be98f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 14 Jul 2023 14:25:40 +0300 Subject: [PATCH 5/5] src/util: fix typo --- src/util/migrate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/migrate.rs b/src/util/migrate.rs index 1229fd9c..b9cce08a 100644 --- a/src/util/migrate.rs +++ b/src/util/migrate.rs @@ -27,7 +27,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static { Self::Previous::decode(bytes).map(Self::migrate) } - /// Encode this type with optionnal version marker + /// Encode this type with optional version marker fn encode(&self) -> Result, rmp_serde::encode::Error> { let mut wr = Vec::with_capacity(128); wr.extend_from_slice(Self::VERSION_MARKER);