[Emacs-diffs] emacs-25 5f89658 1/2: Mention how to enable pinentry feature

[Daiki Ueno]

branch: emacs-25
commit 5f8965839d573032fc02be1298f37899cf61862d
Author: Daiki Ueno <address@hidden>
Commit: Daiki Ueno <address@hidden>

    Mention how to enable pinentry feature
    
    * etc/NEWS: Mention "gpgconf --reload gpg-agent".
    * lisp/net/pinentry.el: Likewise.
---
 etc/NEWS             |    4 +++-
 lisp/net/pinentry.el |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 6d57091..660af78 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1275,7 +1275,9 @@ few or no entries have changed.
 minibuffer instead of a graphical dialog, depending on whether the gpg
 command is called from Emacs (i.e., INSIDE_EMACS environment variable
 is set).  This feature requires newer versions of GnuPG (2.1.5 or
-later) and Pinentry (0.9.5 or later).
+later) and Pinentry (0.9.5 or later).  To use this feature, add
+"allow-emacs-pinentry" to "~/.gnupg/gpg-agent.conf" and reload the
+configuration with "gpgconf --reload gpg-agent".
 
 +++
 ** cl-generic.el provides CLOS-style multiple-dispatch generic functions.
diff --git a/lisp/net/pinentry.el b/lisp/net/pinentry.el
index 27374af..285f864 100644
--- a/lisp/net/pinentry.el
+++ b/lisp/net/pinentry.el
@@ -26,7 +26,8 @@
 ;; This package allows GnuPG passphrase to be prompted through the
 ;; minibuffer instead of graphical dialog.
 ;;
-;; To use, add allow-emacs-pinentry to ~/.gnupg/gpg-agent.conf, and
+;; To use, add "allow-emacs-pinentry" to "~/.gnupg/gpg-agent.conf",
+;; reload the configuration with "gpgconf --reload gpg-agent", and
 ;; start the server with M-x pinentry-start.
 ;;
 ;; The actual communication path between the relevant components is