[Pkg-gnupg-commit] [gnupg2] 238/292: doc: Clarify dirmngr option --daemon.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 1854f0f6112651c4fc3b92372b98c932e830ed21
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 11 08:25:04 2016 +0100

    doc: Clarify dirmngr option --daemon.
    
    --
    
    With commit d83ba4897bf217d1045c58d1b99e52bd31c58812 all system daemon
    features have been removed and thus this should be reflected in the
    man page.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 doc/dirmngr.texi | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 6620a87..300068e 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -82,8 +82,9 @@ This is only used for testing.
 @item --daemon
 @opindex daemon
 Run in background daemon mode and listen for commands on a socket.
-Note that this also changes the default home directory and enables the
-internal certificate validation code.  This mode is deprecated.
+This is the way @command{dirmngr} is started on demand by the other
+GnuPG components.  To force starting @command{dirmngr} it is in
+general best to use @code{gpgconf --launch dirmngr}.
 
 @item --supervised
 @opindex supervised
@@ -141,21 +142,11 @@ per-user configuration file.  The default configuration file is named
 @item --homedir @var{dir}
 @opindex options
 Set the name of the home directory to @var{dir}.  This option is only
-effective when used on the command line.  The default depends on the
-running mode:
-
- at table @asis
-
- at item With @code{--daemon} given on the commandline
-the directory named @file{@value{SYSCONFDIR}} is used for configuration files
-and @file{@value{LOCALCACHEDIR}} for cached CRLs.
-
- at item Without @code{--daemon} given on the commandline
+effective when used on the command line.  The default os
 the directory named @file{.gnupg} directly below the home directory
 of the user unless the environment variable @code{GNUPGHOME} has been set
 in which case its value will be used.  All kind of data is stored below
 this directory.
- at end table
 
 
 @item -v
@@ -345,8 +336,7 @@ configured LDAP server if the connection using the "proxy" failed.
 @opindex ldapserverlist-file
 Read the list of LDAP servers to consult for CRLs and certificates from
 file instead of the default per-user ldap server list file. The default
-value for @var{file} is @file{dirmngr_ldapservers.conf} or
- at file{ldapservers.conf} when running in @option{--daemon} mode.
+value for @var{file} is @file{dirmngr_ldapservers.conf}.
 
 This server list file contains one LDAP server per line in the format
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git