From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 2 Apr 2018 05:59:27 +0000 (+0300)
Subject: ; * etc/NEWS: Improve the entry about pinentry.el removal.
X-Git-Tag: emacs-26.1-rc1~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb8b13f;p=emacs.git

; * etc/NEWS: Improve the entry about pinentry.el removal.
---

diff --git a/etc/NEWS b/etc/NEWS
index 4adedfce1ae..4f7bf316207 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1505,7 +1505,10 @@ library was useless, and we removed it.  GnuPG 2.0 is no longer
 supported by the upstream project.
 
 To adapt to the change, you may need to set 'epa-pinentry-mode' to the
-symbol 'loopback'.
+symbol 'loopback'.  Alternatively, leave 'epa-pinentry-mode' at its
+default value of nil, and remove the 'allow-emacs-pinentry' setting
+from your 'gpg-agent.conf' configuration file, usually found in the
+'~/.gnupg' directory.
 
 Note that previously, it was said that passphrase input through
 minibuffer would be much less secure than other graphical pinentry