diff options
| author | Werner Koch <wk@gnupg.org> | 2018-04-10 10:14:30 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-04-10 10:14:30 +0200 |
| commit | 36373798c0955241288fb4aec103830106dd7e1f (patch) | |
| tree | fe0ed178d1aeda3847c9c8133a2ed8488a84644a /doc/examples | |
| parent | Merge branch 'STABLE-BRANCH-2-2' into master (diff) | |
| parent | agent: Improve the unknown ssh flag detection. (diff) | |
| download | gnupg2-36373798c0955241288fb4aec103830106dd7e1f.tar.xz gnupg2-36373798c0955241288fb4aec103830106dd7e1f.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Fixed conflicts:
NEWS - keep master
configure.ac - merge
g10/card-util.c - mostly 2.2
g10/sig-check.c - 2.2
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/vsnfd.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/examples/vsnfd.prf b/doc/examples/vsnfd.prf index 1dc21e0a7..061e06982 100644 --- a/doc/examples/vsnfd.prf +++ b/doc/examples/vsnfd.prf @@ -1,12 +1,16 @@ # vsnfd.prf - Configure options for the VS-NfD mode -*- conf -*- +# +# The options for each tool are configured in a section ("[TOOL]"); +# see the respective man page for a description of these options and +# the gpgconf manpage for a description of this file's syntax. [gpg] compliance de-vs default-new-key-algo rsa3072/cert,sign+rsa3072/encr [gpgsm] -enable-crl-checks compliance de-vs +enable-crl-checks [gpg-agent] enable-extended-key-format |