kaiyou/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Releases Activity

Merge pull request 'tree-wide: fix some typos' (#598) from flokli/garage:fix-typos into main

Browse source 
Reviewed-on: Deuxfleurs/garage#598
This commit is contained in:
Alex 2023-07-14 15:51:44 +00:00
commit 6ba611361e
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/api/garage-admin-v0.yml
View file

@ -632,7 +632,7 @@ paths:
operationId: "UpdateBucket" operationId: "UpdateBucket"
summary: "Update a bucket" summary: "Update a bucket"
description: | 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. 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. In `websiteAccess`: if `enabled` is `true`, `indexDocument` must be specified.

4
doc/book/reference-manual/configuration.md
View file

@ -409,7 +409,7 @@ message that redirects the client to the correct region.
### `root_domain` {#root_domain} ### `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. 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, 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. 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` ### `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` 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` will be accessible either with hostname `deuxfleurs.fr.web.garage.eu`

2
doc/book/reference-manual/k2v.md
View file

@ -3,7 +3,7 @@ title = "K2V"
weight = 100 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 which is an alternative storage API designed to help efficiently store
many small values in buckets (in opposition to S3 which is more designed many small values in buckets (in opposition to S3 which is more designed
to store large blobs). to store large blobs).

4
doc/drafts/admin-api.md
View file

@ -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. 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`. 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. 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. In `websiteAccess`: if `enabled` is `true`, `indexDocument` must be specified.

2
src/garage/cli/structs.rs
View file

@ -216,7 +216,7 @@ pub struct WebsiteOpt {
#[structopt(short = "i", long = "index-document", default_value = "index.html")] #[structopt(short = "i", long = "index-document", default_value = "index.html")]
pub index_document: String, 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")] #[structopt(short = "e", long = "error-document")]
pub error_document: Option<String>, pub error_document: Option<String>,
} }

2
src/util/migrate.rs
View file

@ -27,7 +27,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static {
Self::Previous::decode(bytes).map(Self::migrate) 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<Vec<u8>, rmp_serde::encode::Error> { fn encode(&self) -> Result<Vec<u8>, rmp_serde::encode::Error> {
let mut wr = Vec::with_capacity(128); let mut wr = Vec::with_capacity(128);
wr.extend_from_slice(Self::VERSION_MARKER); wr.extend_from_slice(Self::VERSION_MARKER);