Skip to content

Commit ffd7c67

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/early-access-features
2 parents b70474f + 19dcc2d commit ffd7c67

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

docs/desktop/adding-vaults.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ sidebar_position: 3
66

77
# Adding Vaults
88

9-
You will be presented with two options when adding a vault:
9+
You will be presented with three options when adding a vault:
1010

1111
1. [`Create New Vault…`](#create-a-new-vault) - Choose this if you wish to create a new vault.
1212
2. [`Open Existing Vault…`](#open-an-existing-vault) - Choose this if you already have a vault and wish to open it.
13+
3. [`Recover Existing Vault…`](/docs/desktop/vault-recovery.md#add-recover-vault) - Choose this if you have a vault with missing configuration files that hasn’t yet been added and you want to restore it.
1314

1415
<Image src="/img/desktop/create-or-open-vault.png" alt="Create a new or open an existing vault" width="762" height="610" />
1516

docs/desktop/password-and-recovery-key.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ We cannot reset the password of a vault for you in any way. Only you can reset a
169169
Type or paste your recovery key in the new window.
170170

171171
:::note
172-
Cryptomator offers an auto completion feature to make things easier when typing a recovery key. It's helpful if your recovery key is printed on paper or stored it somewhere where you cannot copy it. The feature will kick in automatically once you start typing the first few letters of a word.
172+
Cryptomator offers an auto completion feature to make things easier when typing a recovery key. It's helpful if your recovery key is printed on paper or stored somewhere where you cannot copy it. The feature will kick in automatically once you start typing the first few letters of a word.
173173
:::
174174

175175
<Image src="/img/desktop/recoverykey-recover-enter.png" alt="Autocompletion during recovery key entry" width="512" height="384" />

docs/misc/contribute.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sidebar_position: 1
88

99
## How Can You Help Us? {#how-can-you-help-us}
1010

11-
Cryptomator is an open source project and wouldn't be possible without contributions from users who support the idea.
11+
Cryptomator is an open-source project and wouldn't be possible without contributions from users who support the idea.
1212

1313
There are several ways you can help us:
1414

@@ -24,4 +24,4 @@ There are several ways you can help us:
2424

2525
If you plan to help, please stick to our [Code of Conduct](https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md).
2626

27-
Our code is licensed under GPLv3 and this documentation under CC-BY-SA 4.0. If you contribute either, your grant us the rights to publish your contributions under those licenses. Also you have to digitally sign a [Contributor License Agreement (CLA)](https://gist.github.com/cryptobot/80c6654b7c8d5529cc365f1124cef50e). This is required to protect the maintainers of Cryptomator from legal problems with patent or copyright infringement. The CLA signature process is triggered by your first pull request automatically. You will be asked to authenticate with your GitHub account and your username will be stored even if you revoke any activity on GitHub.
27+
Our code is licensed under GPLv3 and this documentation under CC-BY-SA 4.0. If you contribute either, you grant us the rights to publish your contributions under those licenses. Also, you have to digitally sign a [Contributor License Agreement (CLA)](https://gist.github.com/cryptobot/80c6654b7c8d5529cc365f1124cef50e). This is required to protect the maintainers of Cryptomator from legal problems with patent or copyright infringement. The CLA signature process is triggered by your first pull request automatically. You will be asked to authenticate with your GitHub account and your username will be stored even if you revoke any activity on GitHub.
-21.4 KB
Loading

0 commit comments

Comments
 (0)