[git] GnuPG - branch, master, updated. gnupg-2.1.21-79-g7fb724c

[by Marcus Brinkmann]

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, master has been updated
       via  7fb724c61655c6f75c61572d65a46e21ae112574 (commit)
      from  ecd6c0160f49ae83001dfd150df6b1238fc479d5 (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 7fb724c61655c6f75c61572d65a46e21ae112574
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Sat Jul 1 14:28:08 2017 +0200

    doc: Document obsolete option in gpgsm.  Closes T2231.
    
    * doc/gpgsm.texi: Mark --prefer-system-dirmngr as obsolete.
    
    Signed-off-by: Marcus Brinkmann <mb at g10code.com>
    GnuPG-bug-id: 2231

diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 79db177..5d79ce5 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -365,10 +365,7 @@ default value is @file{@value{BINDIR}/dirmngr}.
 
 @item --prefer-system-dirmngr
 @opindex prefer-system-dirmngr
-If a system wide @command{dirmngr} is running in daemon mode, first try
-to connect to this one.  Fallback to a pipe based server if this does
-not work.  Under Windows this option is ignored because the system dirmngr is
-always used.
+This option is obsolete and ignored.
 
 @item --disable-dirmngr
 Entirely disable the use of the Dirmngr.

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

Summary of changes:
 doc/gpgsm.texi | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


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