Skip to content

Commit 3d07755

Browse files
committed
Merge branch 'main' into mountainduck/5
2 parents 6ffdb56 + 1278480 commit 3d07755

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1571
-875
lines changed

cli/index.md

+121-60
Large diffs are not rendered by default.

cryptomator/index.md

+17-47
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,14 @@ Choose *File → New Vault…* to create a new vault.
4040

4141
:::{image} _images/New_Encrypted_Vault_File_Menu_Option.png
4242
:alt: New Encrypted Vault File Menu Option
43-
:width: 400px
43+
:width: 600px
4444
:::
4545

4646
::::
4747
::::{group-tab} Mountain Duck
4848

4949
1. Choose *New Vault…* from the Finder Extension toolbar or context menu using right-click in Finder or Windows Explorer.
5050

51-
:::{image} _images/Mountain_Duck_Create_New_Vault_Finder_Extension.png
52-
:alt: Mountain Duck Create New Vault (Finder Extension)
53-
:width: 400px
54-
:::
55-
5651
:::{image} _images/Mountain_Duck_Create_New_Vault_Windows_Explorer.png
5752
:alt: Mountain Duck Create New Vault (Windows Explorer)
5853
:width: 400px
@@ -109,8 +104,8 @@ Choose the *Cryptomator* button in the toolbar or *File → Unlock Vault* and *F
109104

110105
Lock and unlock vaults within the Finder or Windows Explorer using the context menu:
111106

112-
`Mountain Duck → Cryptomator → Lock Vault`
113-
`Mountain Duck → Cryptomator → Unlock Vault`
107+
* *Mountain Duck → Cryptomator → Lock Vault*
108+
* *Mountain Duck → Cryptomator → Unlock Vault*
114109

115110
:::
116111
::::
@@ -121,25 +116,25 @@ The menu option is disabled if you have set Preferences → Cryptomator → Auto
121116

122117
### Save Passphrase
123118

124-
You can check *Add to Keychain* to save the passphrase to open the vault with the master key file in your login keychain. The checkbox is disabled by default. Another application that wants to access the vault passphrase from the login keychain will trigger a permission prompt.
119+
Check *Save Password* to save the master key file passphrase of vaults.
120+
121+
:::::{tabs}
122+
::::{group-tab} macOS
125123

126-
:::{image} _images/Keychain_Access_Crpytomator_Passphrase.png
124+
Manage your passwords with *Keychain Access.app* on Mac. Refer to the [Keychain Access User Guide](https://support.apple.com/kb/PH20093?locale=en_US). Another application that wants to access the vault passphrase from the login keychain will trigger a permission prompt.
125+
126+
:::{image} _images/Keychain_Access_Cryptomator_Passphrase.png
127127
:alt: Keychain Access Cryptomator Passphrase
128128
:width: 400px
129129
:::
130130

131-
::::{tabs}
132-
:::{group-tab} macOS
133-
134-
Manage your passwords with *Keychain Access.app* on Mac. Refer to [Keychain for Mac: Keychain Access overview](https://support.apple.com/kb/PH20093?locale=en_US).
135-
136-
:::
137-
:::{group-tab} Windows
131+
::::
132+
::::{group-tab} Windows
138133

139134
Passwords are saved in the *Credential Manager*. You can view and delete your saved login information in *Control Panel → User Accounts → Credential Manager → Windows Credentials*.
140135

141-
:::
142136
::::
137+
:::::
143138

144139
### File Transfers
145140

@@ -157,7 +152,7 @@ You can open and browse multiple vaults on a server in a single browser window.
157152

158153
:::{image} _images/Cryptomator_Vault_Browser.png
159154
:alt: Cryptomator Vault Browser
160-
:width: 400px
155+
:width: 600px
161156
:::
162157

163158
### Moving Files Into Vault
@@ -170,39 +165,14 @@ The vault must be unlocked before you move files to it, otherwise the files won'
170165

171166
### Access Vaults on Local Disk
172167

173-
Both [Cyberduck](https://cyberduck.io/) and [Mountain Duck](https://mountainduck.io/) support browsing your local disk to access vaults created on your computer. Create a new [bookmark](../cyberduck/bookmarks) to connect to your local disk.
174-
175-
:::{image} _images/local_disk_connection.png
176-
:alt: Local Disk Connection
177-
:width: 400px
178-
:::
179-
180-
In your local disk connection, you can access all directories which are saved on your local disk. This includes for example your local synchronized [Dropbox](../protocols/dropbox), [Google Drive](../protocols/googledrive) and [OneDrive](../protocols/onedrive) directories.
181-
182-
::::{admonition} Access a Cryptomator Vault on local disk on the example of Dropbox
183-
:class: note
184-
185-
1. Navigate to the Dropbox directory and open the subdirectories until you reach your vault.
186-
2. Double click your vault.
187-
3. Type your set password in the password box. If you want you can save the password for easier access to this directory for further usage.
188-
:::{image} _images/access_Cryptomator_vault_Mountain_Duck.png
189-
:alt: Mountain Duck Cryptomator Vault
190-
:width: 400px
191-
:::
192-
:::{image} _images/access_Cryptomator_vault_Cyberduck.png
193-
:alt: Cyberduck Access Cryptomator Vault
194-
:width: 400px
195-
:::
196-
4. Click the Continue button and your vault should open.
197-
198-
::::
168+
Both [Cyberduck](../cyberduck/index.md) and [Mountain Duck](../mountainduck/index.md) support browsing your local disk to access vaults created on your computer. Refer to the [tutorial](../tutorials/vault_localdisk.md).
199169

200170
## Known Limitations
201171

202-
- As [Name shortening](https://docs.cryptomator.org/en/latest/security/architecture/#name-shortening) is not supported the maximum length for a filename (including extension) is 146 characters. Note that using non-ASCII characters in your filenames may lower this limit.
172+
- As [name shortening](https://docs.cryptomator.org/en/latest/security/architecture/#name-shortening) is not supported, the maximum length for a filename (including extension) is 146 characters. Note that using non-ASCII characters in your filenames may lower this limit.
203173
- Changing the vault passphrase is currently not supported.
204174
- To delete a vault it cannot be unlocked. Choose *Cancel* in the vault password prompt to skip unlocking the vault after selecting the vault folder for delete.
205-
- Creating or accessing a vault in a vault is currently not supported using Cyberduck.
175+
- Creating or accessing a vault within a vault is currently not supported using Cyberduck.
206176
- Locking or unlocking a vault requires network connectivity using Mountain Duck regardless of the [connect mode](../mountainduck/connect/index.md).
207177

208178
## Preferences

0 commit comments

Comments
 (0)