mail-crypt: Various cleanups

Author: sirainen

data/settings.js

@@ -2698,7 +2698,14 @@ If enabled, you cannot share a key to groups or someone without a public key.`
 		plugin: 'mail-crypt',
 		values: setting_types.STRING,
 		text: `
-Defines the elliptic curve to use for key generation.
+Defines the elliptic curve to use for key generation. A key pair is generated
+for the user, and a key pair is generated for each folder. The folder key is
+encrypted using the user key.
+
+This must be set if you wish to use [[link,mail_crypt_folder_keys,folder keys]]
+rather than [[link,mail_crypt_global_keys,global keys]]. With global keys
+(either RSA or EC keys), all keying material is taken from the global key
+settings and no key generation is performed.
 
 Any valid curve supported by the underlying cryptographic library is allowed.
 
@@ -2708,15 +2715,6 @@ Example:
 crypt_user_key_curve = secp521r1
 \`\`\`
 
-This must be set if you wish to use folder keys rather than global keys.
-
-With global keys (either RSA or EC keys), all keying material is taken
-from the setting and no key generation is performed.
-
-In folder-keys mode, a key pair is generated for the user, and a
-folder-specific key pair is generated. The latter is encrypted by means of
-the user's key pair.
-
 For EdDSA, you need to use X448 or X25519, case sensitive.`
 	},
 

docs/core/plugins/mail_crypt.md

@@ -14,6 +14,9 @@ dovecotlinks:
   mail_crypt_global_keys:
     hash: global-keys
     text: "Mail Crypt Plugin: Global Keys"
+  mail_crypt_folder_keys:
+    hash: folder-keys
+    text: "Mail Crypt Plugin: Folder Keys"
   mail_crypt_ec_key:
     hash: elliptic-curve-ec-key
     text: "Mail Crypt Plugin: Elliptic Curve (EC) Keys"
@@ -272,14 +275,15 @@ crypt_global_private_key main {
 }
 ```
 
-### Folder Keys Mode
+### Folder Keys
 
-In this mode, for the user a key pair is generated. Then for each folder a key
-pair is generated. This folder is encrypted using the user's key pair. A user
-can have more than one key pair but only one can be active.
+In this mode, a key pair is generated for the user. Then for each folder a key
+pair is generated. This folder is encrypted using the user key. A user
+can have more than one key pair for reading, but only one can be active for
+writing.
 
 * [[setting,crypt_user_key_curve]] must be set.
-* [[setting,mail_attribute]] must be set, as is is used to store the keys.
+* [[setting,mail_attribute]] must be set, as it is used to store the keys.
 
 #### Unencrypted User Keys
 
@@ -303,7 +307,7 @@ crypt_user_key_curve = secp521r1
 
 #### Encrypted User Keys
 
-In this version of the folder keys mode, the users private key is stored
+In this version of the folder keys mode, the user's private key is stored
 encrypted on the server.
 
 Example config for mandatory encrypted folder keys with Maildir: