From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 18 Aug 2015 02:19:41 +0000 (+0900)
Subject: ; pinentry.el: Update header comment and fix typos
X-Git-Tag: emacs-25.0.90~1368
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a23c477d90ce7401c24de8610be7d1340cd8ee3;p=emacs.git

; pinentry.el: Update header comment and fix typos
---

diff --git a/lisp/net/pinentry.el b/lisp/net/pinentry.el
index 05cb124f2cb..13a15c964ab 100644
--- a/lisp/net/pinentry.el
+++ b/lisp/net/pinentry.el
@@ -43,10 +43,8 @@
 ;; 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>.
+;; NOTE: As of August 2015, this feature requires newer versions of
+;; GnuPG (2.1.5+) and Pinentry (0.9.5+).
 
 ;;; Code:
 
@@ -56,12 +54,12 @@
   :group 'external)
 
 (defcustom pinentry-popup-prompt-window t
-  "If non-nil, display status information from epa commands in another window."
+  "If non-nil, display multiline prompt in another window."
   :type 'boolean
   :group 'pinentry)
 
 (defcustom pinentry-prompt-window-height 5
-  "Number of lines used to display status information."
+  "Number of lines used to display multiline prompt."
   :type 'integer
   :group 'pinentry)