debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

doc/{reply, show}: match indentation

Browse source 
This is essentially a conflict resolution Jani's normalization and
Daniel's doc changes, but it's easier to do as a second commit.
This commit is contained in:
David Bremner 2017-12-31 09:34:28 -04:00
parent 99407db25c
commit d0dffdae31
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
doc/man1/notmuch-reply.rst
View file

@ -70,26 +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=(false|auto|true)``
``--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 ``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.
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.
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.
Non-automatic decryption expects a functioning
**gpg-agent(1)** to provide any needed credentials. Without
one, the decryption will likely fail.
Default: ``auto``
Default: ``auto``
See **notmuch-search-terms(7)** for details of the supported syntax for
<search-terms>.

32
doc/man1/notmuch-show.rst
View file

@ -110,27 +110,27 @@ Supported options for **show** include
supported with --format=json and --format=sexp), and the
multipart/signed part will be replaced by the signed data.
``--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.
``--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 keys.
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 keys.
Use ``false`` to avoid even automatic decryption.
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 fail.
Non-automatic decryption expects a functioning
**gpg-agent(1)** to provide any needed credentials. Without
one, the decryption will fail.
Note: ``true`` implies --verify.
Note: ``true`` implies --verify.
Default: ``auto``
Default: ``auto``
``--exclude=(true|false)``
Specify whether to omit threads only matching search.tag\_exclude