Merge branch 'release'

[notmuch] / doc / man1 / notmuch-reply.rst

diff --git a/doc/man1/notmuch-reply.rst b/doc/man1/notmuch-reply.rst
index 4c86a92f8196b041b9b69fb09bfe135f6cb5554d..b01698344fa69fcb484c3110c86f5deb72f4a8f8 100644 (file)
--- a/doc/man1/notmuch-reply.rst
+++ b/doc/man1/notmuch-reply.rst
@@ -70,20 +70,26 @@ Supported options for **reply** include
         order, and copy values from the first that contains something
         other than only the user's addresses.
 
-``--decrypt``
-    Decrypt any MIME encrypted parts found in the selected content
-    (ie. "multipart/encrypted" parts). Status of the decryption will
-    be reported (currently only supported with --format=json and
-    --format=sexp) and on successful decryption the
-    multipart/encrypted part will be replaced by the decrypted
-    content.
-
-    If a session key is already known for the message, then it will be
-    decrypted automatically unless the user explicitly sets
-    ``--decrypt=false``.
-
-    Decryption expects a functioning **gpg-agent(1)** to provide any
-    needed credentials. Without one, the decryption will likely fail.
+    ``--decrypt=(false|auto|true)``
+
+        If ``true``, decrypt any MIME encrypted parts found in the
+        selected content (i.e., "multipart/encrypted" parts). Status
+        of the decryption will be reported (currently only supported
+        with --format=json and --format=sexp), and on successful
+        decryption the multipart/encrypted part will be replaced by
+        the decrypted content.
+
+        If ``auto``, and a session key is already known for the
+        message, then it will be decrypted, but notmuch will not try
+        to access the user's secret keys.
+
+        Use ``false`` to avoid even automatic decryption.
+
+        Non-automatic decryption expects a functioning
+        **gpg-agent(1)** to provide any needed credentials. Without
+        one, the decryption will likely fail.
+
+        Default: ``auto``
 
 See **notmuch-search-terms(7)** for details of the supported syntax for
 <search-terms>.