aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-11 17:09:37 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-11 17:09:37 +0100
commitdac254a6e7413498df0e3b626769c2d2be3a4cfb (patch)
tree3eca3ebc2d0c1f9c2c5029e3197bcc925eeafcfd /doc
parent638c5a3ce006eba9d90a6358655ba2091423efd7 (diff)
parent94d723f27cea7aa58d11af3e18a165283b40f19a (diff)
downloadgarage-dac254a6e7413498df0e3b626769c2d2be3a4cfb.tar.gz
garage-dac254a6e7413498df0e3b626769c2d2be3a4cfb.zip
Merge branch 'main' into k2v-watch-range-2
Diffstat (limited to 'doc')
-rw-r--r--doc/book/development/devenv.md2
-rw-r--r--doc/book/reference-manual/configuration.md6
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/book/development/devenv.md b/doc/book/development/devenv.md
index c2ef4e7d..8d7d2e95 100644
--- a/doc/book/development/devenv.md
+++ b/doc/book/development/devenv.md
@@ -39,7 +39,7 @@ Now you can enter our nix-shell, all the required packages will be downloaded bu
nix-shell
```
-You can use the traditionnal Rust development workflow:
+You can use the traditional Rust development workflow:
```bash
cargo build # compile the project
diff --git a/doc/book/reference-manual/configuration.md b/doc/book/reference-manual/configuration.md
index 2d9c3f0c..353963ef 100644
--- a/doc/book/reference-manual/configuration.md
+++ b/doc/book/reference-manual/configuration.md
@@ -96,7 +96,7 @@ Performance characteristics of the different DB engines are as follows:
- Sled: the default database engine, which tends to produce
large data files and also has performance issues, especially when the metadata folder
- is on a traditionnal HDD and not on SSD.
+ is on a traditional HDD and not on SSD.
- LMDB: the recommended alternative on 64-bit systems,
much more space-efficiant and slightly faster. Note that the data format of LMDB is not portable
between architectures, so for instance the Garage database of an x86-64
@@ -267,6 +267,10 @@ This key should be specified here in the form of a 32-byte hex-encoded
random string. Such a string can be generated with a command
such as `openssl rand -hex 32`.
+### `rpc_secret_file`
+
+Like `rpc_secret` above, just that this is the path to a file that Garage will try to read the secret from.
+
### `rpc_bind_addr`
The address and port on which to bind for inter-cluster communcations