[git] gnupg-doc - branch, master, updated. ba965893ef6c946c6be318f63f1f1b41e2eaeaaf

[by Ben McGinnes]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  ba965893ef6c946c6be318f63f1f1b41e2eaeaaf (commit)
       via  8e51ad1b7ab043e5e83f743dc091d987d720af03 (commit)
      from  5c1e39ab92b3f8b0e331374d22bfaf2ecf7a194e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ba965893ef6c946c6be318f63f1f1b41e2eaeaaf
Merge: 8e51ad1 5c1e39a
Author: Ben McGinnes <ben at adversary.org>
Date:   Sat Dec 30 07:57:58 2017 +1100

    Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc


commit 8e51ad1b7ab043e5e83f743dc091d987d720af03
Author: Ben McGinnes <ben at adversary.org>
Date:   Sat Dec 30 07:53:55 2017 +1100

    FAQ tweak
    
    * Inserted Neomutt as optional native MUA for OS X and *nix (Linux,
      BSD, etc.) systems.
    * Neomutt references the same footnote as Mutt (3), but with slight
      expansion and clarification on using GPGME with either.
    * Fixed grammatical error in Enigmail footnote (1).

diff --git a/web/faq/gnupg-faq.org b/web/faq/gnupg-faq.org
index da30a0d..b4fae61 100644
--- a/web/faq/gnupg-faq.org
+++ b/web/faq/gnupg-faq.org
@@ -689,10 +689,11 @@ is actively developed.
 | Thunderbird | yes (Enigmail) | (1) |
 | Gnus        | yes ([[https://www.emacswiki.org/emacs/EasyPG][EasyPG]])   | (2) |
 | Mutt        | native         | (3) |
+| Neomutt     | native         | (3) |
 | Apple Mail  | yes ([[https://www.gpgtools.org][GPGtools]]) | (4) |
 
 (1) With the Enigmail plugin, Thunderbird becomes one of the most
-    popular GnuPG-aware email clients.  it’s under active development
+    popular GnuPG-aware email clients.  It’s under active development
     and is compatible with the latest Thunderbird releases, with a
     friendly and welcoming user community.
 
@@ -700,7 +701,9 @@ is actively developed.
     install the plugin.  See the Gnus manual for configuration hints.
 
 (3) For best experience make sure to put ~set crypt_use_gpgme~ in your
-    =~/.muttrc= file.
+    =~/.muttrc= file.  Note that this requires installing Mutt or
+    Neomutt compiled with GPGME support, refer to the Mutt or Neomutt
+    documentation for details.
 
 (4) As of this writing, Apple Mail is incompatible with PGP/MIME.  This
     is a known bug and people are working on it.
@@ -716,12 +719,13 @@ is actively developed.
 | Thunderbird | yes (Enigmail) | (1) |
 | Gnus        | yes ([[https://www.emacswiki.org/emacs/EasyPG][EasyPG]])   | (2) |
 | Mutt        | native         | (3) |
+| Neomutt     | native         | (3) |
 | Kontact     | native         | (4) |
 | Evolution   | native         |     |
 | Claws-Mail  | yes (internal) |     |
 
 (1) With the Enigmail plugin, Thunderbird becomes one of the most
-    popular GnuPG-aware email clients.  it’s under active development
+    popular GnuPG-aware email clients.  It’s under active development
     and is compatible with the latest Thunderbird releases, with a
     friendly and welcoming user community.
 
@@ -729,7 +733,9 @@ is actively developed.
     install the plugin.  See the Gnus manual for configuration hints.
 
 (3) For best experience make sure to put ~set crypt_use_gpgme~ in your
-    =~/.muttrc= file.
+    =~/.muttrc= file.  Note that this requires installing Mutt or
+    Neomutt compiled with GPGME support, refer to the Mutt or Neomutt
+    documentation for details.
 
 (4) Kontact is KDE’s integrated personal information manager of KDE.
     It runs anywhere that KDE does, and even on some mobile devices as

-----------------------------------------------------------------------

Summary of changes:
 web/faq/gnupg-faq.org | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org