summaryrefslogtreecommitdiffstats
path: root/doc/gpg.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/gpg.texi')
-rw-r--r--doc/gpg.texi9
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9f2a62d0e..16a4b5851 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2476,7 +2476,8 @@ opposite meaning. The options are:
signatures. Defaults to yes.
@item bulk-import
- When used with --use-keyboxd do the import within a single
+ When used the keyboxd (option "use-keyboxd" in @file{common.conf})
+ do the import within a single
transaction. This is an experimental feature.
@item import-minimal
@@ -3753,6 +3754,12 @@ current home directory (@pxref{option --homedir}).
name may be changed on the command line (@pxref{gpg-option --options}).
You should backup this file.
+ @item common.conf
+ @efindex common.conf
+ This is an optional configuration file read by @command{@gpgname} on
+ startup. It may contain options pertaining to all components of
+ GnuPG. Its current main use is for the "use-keyboxd" option.
+
@end table
Note that on larger installations, it is useful to put predefined files