Clean up the autocrypt doc a bit more

Co-authored-by: Richard Russon <rich@flatcap.org>

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 036c8d35d5b66d03965cb2412c0f501ea5f3faa3..11e5a3a5d981eaffaf2686cdc5eaa06015391774 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -17638,7 +17638,7 @@ bind index D purge-message
       <sect2 id="autocryptdoc-keyrings">
         <title>Alternative Key and Keyring Strategies</title>
         <para>
-          Mutt by default partitions Autocrypt from normal keyring
+          NeoMutt by default partitions Autocrypt from normal keyring
           encryption/signing.  It does this by using a separate GPG
           keyring (in <link linkend="autocrypt-dir">$autocrypt_dir</link>)
           and creating a new ECC key in that keyring for accounts.  There
@@ -17647,7 +17647,7 @@ bind index D purge-message
           keys are compact and better suited for email headers.  Autocrypt
           key selection is completely different from <quote>web of
           trust</quote> key selection, based on last-seen rules as opposed
-          to trust and validity.  It also allows Mutt to distinguish
+          to trust and validity.  It also allows NeoMutt to distinguish
           Autocrypt encrypted emails from regular encrypted emails, and
           set the mode appropriately when replying to each type of email.
         </para>
@@ -17657,24 +17657,19 @@ bind index D purge-message
           be accomplished.  The <emphasis>recommended</emphasis> way is to
           set <link linkend="autocrypt-dir">$autocrypt_dir</link> to your
           normal keyring directory (e.g. <literal>~/.gnupg</literal>).
-          Alternatively you can copy the key over to the Autocrypt keyring
-          (using something along the lines of <literal>gpg --export
-          [keyid] | gpg --homedir=~/.mutt/autocrypt --import</literal>
-          followed by <literal>gpg --export-secret-keys [keyid] | gpg
-          --homedir=~/.mutt/autocrypt --import</literal>).  During account
-          creation, choosing <quote>(s)elect existing GPG key</quote> will
-          then list and allow selecting your existing key for the new
-          account.
-        </para>
-        <para>
-        Copying your key over keeps Autocrypt keys out of your normal
-        keyring, but there is a severe downside.  NeoMutt
-        <emphasis>first</emphasis> tries to decrypt messages using the
-        Autocrypt keyring, and if that fails tries the normal keyring
-        second.  This means all encrypted emails to that key will be
-        decrypted, and have signatures verified from, the Autocrypt
-        keyring.  Keys signatures and web of trust from your normal
-        keyring will no longer show up in signatures when decrypting.
+          During account creation, choosing <quote>(s)elect existing GPG
+          key</quote> will then list and allow selecting your existing key
+          for the new account.
+        </para>
+        <para>
+          An alternative is to copy your key over to the Autocrypt keyring,
+          but there is a severe downside.  NeoMutt <emphasis>first</emphasis>
+          tries to decrypt messages using the Autocrypt keyring, and if
+          that fails tries the normal keyring second.  This means all
+          encrypted emails to that key will be decrypted, and have
+          signatures verified from, the Autocrypt keyring.  Keys signatures
+          and web of trust from your normal keyring will no longer show up
+          in signatures when decrypting.
         </para>
         <para>
           For that reason, if you want to use an existing key from your
@@ -17693,10 +17688,10 @@ bind index D purge-message
         <itemizedlist>
           <listitem>
             <para>
-              First, replying to an Autocrypt decrypted message by default
-              forces Autocrypt mode on.  By sharing the same key, all
-              replies will then start in Autocrypt mode, even if a message
-              wasn't sent by one of your Autocrypt peers.  <link
+              Replying to an Autocrypt decrypted message by default forces
+              Autocrypt mode on.  By sharing the same key, all replies
+              will then start in Autocrypt mode, even if a message wasn't
+              sent by one of your Autocrypt peers.  <link
               linkend="autocrypt-reply">$autocrypt_reply</link> can be
               <emphasis>unset</emphasis> to allow manual control of the
               mode when replying.
@@ -17704,13 +17699,13 @@ bind index D purge-message
           </listitem>
           <listitem>
             <para>
-              Second, when Mutt creates an account from a gpg key, it
-              exports the public key, base64 encodes it, and stores that
-              value in the sqlite3 database.  The value is then used in
-              the Autocrypt header added to outgoing emails.  The ECC keys
-              Mutt creates don't change, but if you use external keys that
-              expire, when you resign to extend the expiration you will
-              need to recreate the Autocrypt account using the <link
+              When NeoMutt creates an account from a gpg key, it exports the
+              public key, base64 encodes it, and stores that value in the
+              sqlite3 database.  The value is then used in the Autocrypt
+              header added to outgoing emails.  The ECC keys NeoMutt creates
+              don't change, but if you use external keys that expire, when
+              you resign to extend the expiration you will need to
+              recreate the Autocrypt account using the <link
               linkend="autocryptdoc-acctmgmt">account menu</link>.
               Otherwise the Autocrypt header will contain the old expired
               exported keydata.