summaryrefslogtreecommitdiff
path: root/alot
diff options
context:
space:
mode:
authorPatrick Totzke <patricktotzke@gmail.com>2016-03-11 11:54:14 +0000
committerPatrick Totzke <patricktotzke@gmail.com>2016-03-11 11:54:14 +0000
commitc5af54797496352e418c829e025cac8956138c3a (patch)
treec26d4b9a96fdf1503be3e729176f9fe2c89197c7 /alot
parent707ef0c77440d3fd7fef1e3b5bd6eb2240e4b251 (diff)
parent5415a816e1ebcb0262ff6a0b1a866339ecd816aa (diff)
Merge branch '0.3.8-settings-encrypt-by-default-854' into testing
Diffstat (limited to 'alot')
-rw-r--r--alot/defaults/alot.rc.spec19
1 files changed, 16 insertions, 3 deletions
diff --git a/alot/defaults/alot.rc.spec b/alot/defaults/alot.rc.spec
index 4abe2268..6f98dca0 100644
--- a/alot/defaults/alot.rc.spec
+++ b/alot/defaults/alot.rc.spec
@@ -228,7 +228,7 @@ prefer_plaintext = boolean(default=False)
# messages in that thread.
msg_summary_hides_threadwide_tags = boolean(default=True)
-# Key bindings
+# Key bindings
[bindings]
__many__ = string(default=None)
[[___many___]]
@@ -298,8 +298,21 @@ msg_summary_hides_threadwide_tags = boolean(default=True)
# Outgoing messages will be GPG signed by default if this is set to True.
sign_by_default = boolean(default=False)
- # Outgoing messages will be GPG encrypted by default if this is set to True.
- encrypt_by_default = boolean(default=False)
+ # Alot will try to GPG encrypt outgoing messages by default when this
+ # is set to `True` or `Valid`. If set to `True` the message will be
+ # encrypted for all recipients if a key for all of them is available
+ # in the key ring. If set to `Valid` it will be encrypted to all
+ # recipients if a valid key is available for all recipients.
+ # Otherwise (at least one key not available or not valid) the message
+ # will not be encrypted by default.
+ #
+ # .. note:: If the message will not be encrypted by default you can
+ # still use the :ref:`toggleencrypt
+ # <cmd.envelope.toggleencrypt>`, :ref:`encrypt
+ # <cmd.envelope.encrypt>` and :ref:`unencrypt
+ # <cmd.envelope.unencrypt>` commands to encrypt it.
+
+ encrypt_by_default = option('Valid', True, False, default=False)
# The GPG key ID you want to use with this account. If unset, alot will
# use your default key.