Merge commit 'd76bcd7c0dcecb33e6955e25963028600c371588'

diff --git a/packages/pinentry/README b/packages/pinentry/README
deleted file mode 100644 (file)
index 2fb83ad..0000000
--- a/packages/pinentry/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a staging area for further refinement of pinentry.el, until it
-gets included in Emacs proper or ELPA.
-
-See the discussion on the GnuPG mailing list:
-https://lists.gnupg.org/pipermail/gnupg-devel/2015-May/029875.html
-https://lists.gnupg.org/pipermail/gnupg-devel/2015-June/029915.html
\ No newline at end of file

diff --git a/packages/pinentry/pinentry.el b/packages/pinentry/pinentry.el
index 31156f96c133425fb1daee78b8ee8ef489c98f89..7cbe9f50c4a7d95847936374f7705f40cc164d44 100644 (file)
--- a/packages/pinentry/pinentry.el
+++ b/packages/pinentry/pinentry.el
@@ -24,9 +24,7 @@
 ;;; Commentary:
 
 ;; This package allows GnuPG passphrase to be prompted through the
-;; minibuffer instead of graphical dialog.  As of June 2015, this
-;; feature requires newer versions of GnuPG (2.1.5 or later) and
-;; Pinentry (not yet released).
+;; minibuffer instead of graphical dialog.
 ;;
 ;; To use, add allow-emacs-pinentry to ~/.gnupg/gpg-agent.conf, and
 ;; start the server with M-x pinentry-start.
@@ -41,9 +39,14 @@
 ;;
 ;;   ${TMPDIR-/tmp}/emacs$(id -u)/pinentry
 ;;
-;; under the same directory as server.el uses.  The protocol is a
+;; under the same directory which server.el uses.  The protocol is a
 ;; subset of the Pinentry Assuan protocol described in (info
 ;; "(pinentry) Protocol").
+;;
+;; NOTE: As of June 2015, this feature requires newer versions of
+;; GnuPG (2.1.5+) and Pinentry (not yet released, possibly 0.9.5+).
+;; For details, see the discussion on gnupg-devel mailing list:
+;; <https://lists.gnupg.org/pipermail/gnupg-devel/2015-May/029875.html>.
 
 ;;; Code: