From d0dffdae31251e158552cde64086fe964d567bbc Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 31 Dec 2017 09:34:28 -0400 Subject: [PATCH] doc/{reply, show}: match indentation This is essentially a conflict resolution Jani's normalization and Daniel's doc changes, but it's easier to do as a second commit. --- doc/man1/notmuch-reply.rst | 30 +++++++++++++++--------------- doc/man1/notmuch-show.rst | 32 ++++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/man1/notmuch-reply.rst b/doc/man1/notmuch-reply.rst index b0169834..c893ba04 100644 --- a/doc/man1/notmuch-reply.rst +++ b/doc/man1/notmuch-reply.rst @@ -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 . diff --git a/doc/man1/notmuch-show.rst b/doc/man1/notmuch-show.rst index ad72a740..2b825ccc 100644 --- a/doc/man1/notmuch-show.rst +++ b/doc/man1/notmuch-show.rst @@ -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 -- 2.45.2