diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index bc41fac67..77090af52 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -659,7 +659,6 @@ Section "GnuPG" SEC_gnupg File "share/gnupg/sks-keyservers.netCA.pem" SetOutPath "$INSTDIR\share\doc\gnupg\examples" - File "share/doc/gnupg/examples/VS-NfD.prf" File "share/doc/gnupg/examples/Automatic.prf" File "share/doc/gnupg/examples/pwpattern.list" @@ -1324,7 +1323,6 @@ Section "-un.gnupg" Delete "$INSTDIR\bin\gpg-check-pattern.exe" Delete "$INSTDIR\bin\gpg-wks-client.exe" - Delete "$INSTDIR\share\doc\gnupg\examples\VS-NfD.prf" Delete "$INSTDIR\share\doc\gnupg\examples\Automatic.prf" Delete "$INSTDIR\share\doc\gnupg\examples\pwpattern.list" RMDir "$INSTDIR\share\doc\gnupg\examples" diff --git a/build-aux/speedo/w32/wixlib.wxs b/build-aux/speedo/w32/wixlib.wxs index d3ffc08b7..5d84336d6 100644 --- a/build-aux/speedo/w32/wixlib.wxs +++ b/build-aux/speedo/w32/wixlib.wxs @@ -157,9 +157,6 @@ and then manually edited: - - - diff --git a/doc/Makefile.am b/doc/Makefile.am index 06efa486c..2e2b185e9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -22,7 +22,7 @@ AM_CPPFLAGS = include $(top_srcdir)/am/cmacros.am examples = examples/README examples/scd-event examples/trustlist.txt \ - examples/VS-NfD.prf examples/Automatic.prf \ + examples/Automatic.prf \ examples/debug.prf \ examples/gpgconf.rnames examples/gpgconf.conf \ examples/systemd-user/README \ diff --git a/doc/examples/VS-NfD.prf b/doc/examples/VS-NfD.prf deleted file mode 100644 index edb9e018e..000000000 --- a/doc/examples/VS-NfD.prf +++ /dev/null @@ -1,24 +0,0 @@ -# VS-NfD.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 - -[gpgsm] -compliance de-vs -enable-crl-checks - -[gpg-agent] -default-cache-ttl 900 -max-cache-ttl 3600 -no-allow-mark-trusted -no-allow-external-cache -enforce-passphrase-constraints -min-passphrase-len 9 -min-passphrase-nonalpha 0 - -[dirmngr] -allow-ocsp