[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.20-9-gbedcef6

[by Werner Koch]

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 GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  bedcef635221398e7bbb5dc0df7b04e9a7ce97cf (commit)
      from  6a9e8e9161941266b9365def3fa74aca9352daa7 (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 bedcef635221398e7bbb5dc0df7b04e9a7ce97cf
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Apr 22 09:57:38 2016 +0200

    doc: Explain that gpg-preset-passphrase can't be used.
    
    --

diff --git a/doc/gpg.texi b/doc/gpg.texi
index ae582d3..b770e0e 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1640,7 +1640,9 @@ process. @option{--no-auto-check-trustdb} disables this option.
 @opindex use-agent
 Try to use the GnuPG-Agent.  With this option, GnuPG first tries to
 connect to the agent before it asks for a
-passphrase. @option{--no-use-agent} disables this option.
+passphrase. @option{--no-use-agent} disables this option.  Note, that
+the tool @command{gpg-preset-passphrase}, which comes with GnuPG-2,
+cannot be used to preset a passphrase for this version of GnuPG.
 
 @item --gpg-agent-info
 @opindex gpg-agent-info

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

Summary of changes:
 doc/gpg.texi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org