aboutsummaryrefslogtreecommitdiffstats
path: root/doc/dirmngr.texi
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-07-12 11:57:00 +0000
committerWerner Koch <[email protected]>2019-07-12 11:57:00 +0000
commita5118b19c182b558635a6a11ef55b6b8a18c04e9 (patch)
tree16f59401d004b086e1a00c7dad8e4a7523af2fae /doc/dirmngr.texi
parentMerge branch 'master' into switch-to-gpgk (diff)
parentscd: Remove useless GNUPG_SCD_MAIN_HEADER macro. (diff)
downloadgnupg-a5118b19c182b558635a6a11ef55b6b8a18c04e9.tar.gz
gnupg-a5118b19c182b558635a6a11ef55b6b8a18c04e9.zip
Merge branch 'master' into switch-to-gpgk
Diffstat (limited to 'doc/dirmngr.texi')
-rw-r--r--doc/dirmngr.texi4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index f5910a884..eb49ad96c 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -251,7 +251,7 @@ The option @option{--use-tor} switches Dirmngr and thus GnuPG into
``Tor mode'' to route all network access via Tor (an anonymity
network). Certain other features are disabled in this mode. The
effect of @option{--use-tor} cannot be overridden by any other command
-or even be reloading gpg-agent. The use of @option{--no-use-tor}
+or even by reloading dirmngr. The use of @option{--no-use-tor}
disables the use of Tor. The default is to use Tor if it is available
on startup or after reloading dirmngr.
@@ -1178,5 +1178,3 @@ as a binary blob.
@c used for this. The first one starts a search and the second one is
@c used to retrieve certificate after certificate.
@c
-
-