diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/examples/gpgconf.conf | 8 | ||||
| -rw-r--r-- | doc/tools.texi | 9 |
3 files changed, 16 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 563853036..0c2f2c9dc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -40,6 +40,8 @@ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \ help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt \ help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt +profiles = + EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem qualified.txt \ gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png \ gnupg-module-overview.png gnupg-module-overview.pdf \ @@ -54,7 +56,7 @@ BUILT_SOURCES = gnupg-module-overview.png gnupg-module-overview.pdf \ info_TEXINFOS = gnupg.texi -dist_pkgdata_DATA = $(helpfiles) +dist_pkgdata_DATA = $(helpfiles) $(profiles) nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \ $(examples) diff --git a/doc/examples/gpgconf.conf b/doc/examples/gpgconf.conf index ec8685acb..f40160249 100644 --- a/doc/examples/gpgconf.conf +++ b/doc/examples/gpgconf.conf @@ -8,7 +8,7 @@ # Empty lines and comment lines, indicated by a hash mark as first non # white space character, are ignored. The line is separated by white # space into fields. The first field is used to match the user or -# group and must start at the first column, the file is processes +# group and must start at the first column, the file is processed # sequential until a matching rule is found. A rule may contain # several lines; continuation lines are indicated by a indenting them. # @@ -23,7 +23,7 @@ # * - Matches any user. # All other variants are not defined and reserved for future use. # -# <component> and <option> are as specified by gpgconf. +# <component> and <option> are as specified by gpgconf. # <flag> may be one of: # default - Delete the option so that the default is used. # no-change - Mark the field as non changeable by gpgconf. @@ -35,7 +35,7 @@ # gpg-agent min-passphrase-len 6 # # * gpg-agent min-passphrase-len [no-change] 8 -# gpg-agent min-passphrase-nonalpha [no-change] 1 +# gpg-agent min-passphrase-nonalpha [no-change] 1 # gpg-agent max-passphrase-days [no-change] 700 # gpg-agent enable-passphrase-history [no-change] # gpg-agent enforce-passphrase-constraints [default] @@ -44,7 +44,7 @@ # gpg-agent max-cache-ttl-ssh [no-change] 10800 # gpg-agent allow-mark-trusted [default] # gpg-agent allow-mark-trusted [no-change] -# gpgsm enable-ocsp +# gpgsm enable-ocsp #=========== # All users in the group "staff" are allowed to change the value for # --allow-mark-trusted; gpgconf's default is not to allow a change diff --git a/doc/tools.texi b/doc/tools.texi index b1ed61584..d321b699a 100644 --- a/doc/tools.texi +++ b/doc/tools.texi @@ -279,6 +279,15 @@ Change the options of the component @var{component}. @item --check-options @var{component} Check the options for the component @var{component}. +@item --apply-profile @var{file} +Apply the configuration settings listed in @var{file} to the +configuration files. If @var{file} has no suffix and no slashes the +command first tries to read a file with the suffix @code{.prf} from +the the data directory (@code{gpgconf --list-dirs datadir}) before it +reads the file verbatim. A profile is divided into sections using the +bracketed component name. Each section then lists the option which +shall go into the respective configuration file. + @item --apply-defaults Update all configuration files with values taken from the global configuration file (usually @file{/etc/gnupg/gpgconf.conf}). |