[git] GnuPG - branch, master, updated. gnupg-2.1.17-55-g7345c64

by Werner Koch cvs at cvs.gnupg.org
Tue Jan 10 16:29:07 CET 2017


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  7345c64b0887e51d8c8c6eaf49c9dbf5b0f45228 (commit)
      from  88e42ef08d65d4d1bc29c6cea48df19ca0d5e2bd (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 7345c64b0887e51d8c8c6eaf49c9dbf5b0f45228
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 10 16:24:31 2017 +0100

    doc: Mention dirmngr.conf
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index fc617d8..4448bf0 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -131,6 +131,10 @@ will thus trigger reading of fresh CRLs.
 @node Dirmngr Options
 @section Option Summary
 
+Note that all long options with the exception of @option{--options}
+and @option{--homedir} may also be given in the configuration file
+after stripping off the two leading dashes.
+
 @table @gnupgtabopt
 
 @item --options @var{file}
@@ -497,11 +501,20 @@ certificate for that pool.  Otherwise, it will use the system CAs.
 @section Configuration
 
 Dirmngr makes use of several directories when running in daemon mode:
+There are a few configuration files whih control the operation of
+dirmngr.  By default they may all be found in the current home
+directory (@pxref{option --homedir}).
 
 @table @file
 
- at item ~/.gnupg
-This is the standard home directory for all configuration files.
+ at item dirmngr.conf
+ at efindex dirmngr.conf
+This is the standard configuration file read by @command{dirmngr} on
+startup.  It may contain any valid long option; the leading two dashes
+may not be entered and the option may not be abbreviated.  This file
+is also read after a @code{SIGHUP} however not all options will
+actually have an effect.  This default name may be changed on the
+command line (@pxref{option --options}).  You should backup this file.
 
 @item /etc/gnupg/trusted-certs
 This directory should be filled with certificates of Root CAs you

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

Summary of changes:
 doc/dirmngr.texi | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)


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




More information about the Gnupg-commits mailing list