Imported Upstream version 2.2.29upstream/2.2.29

9 files changed, 236 insertions, 242 deletions

diff --git a/doc/defsincdate b/doc/defsincdate
index 4079fcc..dffeffb 100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@ -1 +1 @@
-1623227654
+1624641324
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index d81cf35..2196c43 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -321,9 +321,8 @@ provided.  These are the same as the @option{--keyserver-options} of
 @command{gpg}, but apply only to this particular keyserver.
 
 Most keyservers synchronize with each other, so there is generally no
-need to send keys to more than one server. The keyserver
-@code{hkp://keys.gnupg.net} uses round robin DNS to give a different
-keyserver each time you use it.
+need to send keys to more than one server. Somes keyservers use round
+robin DNS to give a different keyserver each time you use it.
 
 If exactly two keyservers are configured and only one is a Tor hidden
 service (.onion), Dirmngr selects the keyserver to use depending on
@@ -331,7 +330,7 @@ whether Tor is locally running or not.  The check for a running Tor is
 done for each new connection.
 
 If no keyserver is explicitly configured, dirmngr will use the
-built-in default of @code{hkps://hkps.pool.sks-keyservers.net}.
+built-in default of @code{https://keyserver.ubuntu.com}.
 
 Windows users with a keyserver running on their Active Directory
 may use the short form @code{ldap:///} for @var{name} to access this directory.
@@ -591,10 +590,8 @@ the file is in PEM format a suffix of @code{.pem} is expected for
 @var{file}.  This option may be given multiple times to add more
 root certificates.  Tilde expansion is supported.
 
-If no @code{hkp-cacert} directive is present, dirmngr will make a
-reasonable choice: if the keyserver in question is the special pool
-@code{hkps.pool.sks-keyservers.net}, it will use the bundled root
-certificate for that pool.  Otherwise, it will use the system CAs.
+If no @code{hkp-cacert} directive is present, dirmngr will use the
+system CAs.
 
 @end table
 
diff --git a/doc/gnupg-card-architecture.pdf b/doc/gnupg-card-architecture.pdf
index b634b31..4886922 100644
--- a/doc/gnupg-card-architecture.pdf
+++ b/doc/gnupg-card-architecture.pdf
diff --git a/doc/gnupg-module-overview.pdf b/doc/gnupg-module-overview.pdf
index 3c56672..09ab7f4 100644
--- a/doc/gnupg-module-overview.pdf
+++ b/doc/gnupg-module-overview.pdf
@@ -344,8 +344,8 @@ endobj
 17 0 obj
 <<
 /Title (þÿ
-/CreationDate (D:20210610185913)
-/ModDate (D:20210610185913)
+/CreationDate (D:20210704161830)
+/ModDate (D:20210704161830)
 /Producer (https://imagemagick.org)
 >>
 endobj
diff --git a/doc/gnupg-module-overview.png b/doc/gnupg-module-overview.png
index ed8ca70..d9fdc20 100644
--- a/doc/gnupg-module-overview.png
+++ b/doc/gnupg-module-overview.png
diff --git a/doc/gnupg.info b/doc/gnupg.info
index 0f5f3db..dbff724 100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@ -1,6 +1,6 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.28-beta111, June
+This is the 'The GNU Privacy Guard Manual' (version 2.2.29-beta11, June
 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -23,200 +23,200 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-gnupg.info-1: 989
-gnupg.info-2: 302790
+gnupg.info-1: 988
+gnupg.info-2: 302561
 
 Tag Table:
 (Indirect)
-Node: Top989
-Node: Installation2915
-Node: Invoking GPG-AGENT5264
-Node: Agent Commands7030
-Node: Agent Options8834
-Ref: option --options9114
-Ref: option --homedir9440
-Ref: option --log-file14481
-Ref: option --no-allow-mark-trusted14854
-Ref: option --allow-preset-passphrase15058
-Ref: option --no-allow-loopback-pinentry15211
-Ref: option --extra-socket22602
-Ref: option --enable-ssh-support24068
-Ref: option --ssh-fingerprint-digest26405
-Node: Agent Configuration28062
-Node: Agent Signals33460
-Node: Agent Examples34920
-Node: Agent Protocol35487
-Node: Agent PKDECRYPT37641
-Node: Agent PKSIGN39553
-Node: Agent GENKEY41857
-Node: Agent IMPORT43754
-Node: Agent EXPORT44198
-Node: Agent ISTRUSTED44413
-Node: Agent GET_PASSPHRASE46788
-Node: Agent CLEAR_PASSPHRASE49229
-Node: Agent PRESET_PASSPHRASE49620
-Node: Agent GET_CONFIRMATION50458
-Node: Agent HAVEKEY51130
-Node: Agent LEARN51762
-Node: Agent PASSWD52060
-Node: Agent UPDATESTARTUPTTY52526
-Node: Agent GETEVENTCOUNTER53004
-Node: Agent GETINFO53806
-Node: Agent OPTION54510
-Node: Invoking DIRMNGR57568
-Node: Dirmngr Commands58466
-Node: Dirmngr Options60919
-Ref: Dirmngr Options-Footnote-178300
-Node: Dirmngr Configuration78435
-Node: Dirmngr Signals81565
-Node: Dirmngr Examples82593
-Node: Dirmngr Protocol83275
-Node: Dirmngr LOOKUP83925
-Node: Dirmngr ISVALID85296
-Node: Dirmngr CHECKCRL87869
-Node: Dirmngr CHECKOCSP88926
-Node: Dirmngr CACHECERT90232
-Node: Dirmngr VALIDATE91071
-Node: Invoking GPG91639
-Node: GPG Commands92869
-Node: General GPG Commands93763
-Node: Operational GPG Commands94452
-Ref: option --export-ownertrust111754
-Node: OpenPGP Key Management113867
-Node: GPG Options135828
-Node: GPG Configuration Options137161
-Ref: gpg-option --options150662
-Ref: trust-model-tofu155230
-Node: GPG Key related Options175410
-Node: GPG Input and Output180606
-Node: OpenPGP Options194310
-Node: Compliance Options199038
-Node: GPG Esoteric Options202189
-Ref: GPG Esoteric Options-Footnote-1229298
-Node: Deprecated Options229452
-Node: GPG Configuration230955
-Node: GPG Examples236425
-Node: Unattended Usage of GPG245112
-Node: Programmatic use of GnuPG245743
-Node: Ephemeral home directories246294
-Node: The quick key manipulation interface247601
-Node: Unattended GPG key generation248188
-Node: Invoking GPGSM257507
-Node: GPGSM Commands258376
-Node: General GPGSM Commands258814
-Node: Operational GPGSM Commands259502
-Node: Certificate Management261536
-Node: GPGSM Options266512
-Node: Configuration Options267086
-Ref: gpgsm-option --options267355
-Node: Certificate Options270635
-Ref: gpgsm-option --validation-model274239
-Node: Input and Output275219
-Ref: option --p12-charset275802
-Ref: gpgsm-option --with-key-data277046
-Ref: gpgsm-option --with-validation277320
-Node: CMS Options278198
-Node: Esoteric Options279218
-Node: GPGSM Configuration284645
-Node: GPGSM Examples290313
-Node: Unattended Usage290510
-Node: Automated signature checking291101
-Node: CSR and certificate creation292924
-Node: GPGSM Protocol297870
-Node: GPGSM ENCRYPT299126
-Node: GPGSM DECRYPT302790
-Node: GPGSM SIGN303626
-Node: GPGSM VERIFY305082
-Node: GPGSM GENKEY305598
-Node: GPGSM LISTKEYS306613
-Ref: gpgsm-cmd listkeys306772
-Node: GPGSM EXPORT307525
-Node: GPGSM IMPORT308489
-Node: GPGSM DELETE309230
-Node: GPGSM GETAUDITLOG309737
-Ref: gpgsm-cmd getauditlog309906
-Node: GPGSM GETINFO310250
-Node: GPGSM OPTION311099
-Node: Invoking SCDAEMON314452
-Node: Scdaemon Commands315126
-Node: Scdaemon Options316254
-Node: Card applications325604
-Node: OpenPGP Card326269
-Node: NKS Card326742
-Node: DINSIG Card327068
-Node: PKCS#15 Card327444
-Node: Geldkarte Card327714
-Node: SmartCard-HSM328105
-Node: Undefined Card328701
-Node: Scdaemon Configuration329114
-Node: Scdaemon Examples330152
-Node: Scdaemon Protocol330335
-Node: Scdaemon SERIALNO331854
-Node: Scdaemon LEARN332700
-Node: Scdaemon READCERT333547
-Node: Scdaemon READKEY333949
-Node: Scdaemon PKSIGN334235
-Node: Scdaemon PKDECRYPT334961
-Node: Scdaemon GETATTR335711
-Node: Scdaemon SETATTR335913
-Node: Scdaemon WRITEKEY336118
-Node: Scdaemon GENKEY336820
-Node: Scdaemon RANDOM337023
-Node: Scdaemon PASSWD337246
-Node: Scdaemon CHECKPIN337637
-Node: Scdaemon RESTART338640
-Node: Scdaemon APDU339173
-Node: Specify a User ID340146
-Ref: how-to-specify-a-user-id340304
-Node: Trust Values345162
-Ref: trust-values345291
-Node: Helper Tools345896
-Node: watchgnupg346669
-Ref: option watchgnupg --tcp347491
-Node: gpgv349069
-Node: addgnupghome354268
-Node: gpgconf354964
-Ref: gpgconf-Footnote-1357151
-Node: Invoking gpgconf357449
-Node: Format conventions364034
-Node: Listing components369365
-Node: Checking programs371448
-Node: Listing options374186
-Node: Changing options381682
-Node: Listing global options383384
-Node: Querying versions385155
-Node: Files used by gpgconf387853
-Node: applygnupgdefaults388329
-Node: gpg-preset-passphrase389073
-Node: Invoking gpg-preset-passphrase390108
-Node: gpg-connect-agent391510
-Node: Invoking gpg-connect-agent392224
-Node: Controlling gpg-connect-agent395770
-Node: dirmngr-client402243
-Node: gpgparsemail405594
-Node: gpgtar405907
-Node: Web Key Service409840
-Node: gpg-wks-client410153
-Node: gpg-wks-server415319
-Node: Howtos420676
-Node: Howto Create a Server Cert420948
-Node: System Notes429361
-Node: W32 Notes430572
-Node: Debugging430994
-Node: Debugging Tools431822
-Node: kbxutil432102
-Node: Debugging Hints433633
-Node: Common Problems434764
-Node: Architecture Details440001
-Node: Component interaction440311
-Ref: fig:moduleoverview440497
-Node: GnuPG-1 and GnuPG-2440604
-Ref: fig:cardarchitecture440894
-Node: Copying441009
-Node: Contributors478533
-Node: Glossary484788
-Node: Option Index487307
-Node: Environment Index566797
-Node: Index572244
+Node: Top988
+Node: Installation2913
+Node: Invoking GPG-AGENT5262
+Node: Agent Commands7028
+Node: Agent Options8832
+Ref: option --options9112
+Ref: option --homedir9438
+Ref: option --log-file14479
+Ref: option --no-allow-mark-trusted14852
+Ref: option --allow-preset-passphrase15056
+Ref: option --no-allow-loopback-pinentry15209
+Ref: option --extra-socket22600
+Ref: option --enable-ssh-support24066
+Ref: option --ssh-fingerprint-digest26403
+Node: Agent Configuration28060
+Node: Agent Signals33458
+Node: Agent Examples34918
+Node: Agent Protocol35485
+Node: Agent PKDECRYPT37639
+Node: Agent PKSIGN39551
+Node: Agent GENKEY41855
+Node: Agent IMPORT43752
+Node: Agent EXPORT44196
+Node: Agent ISTRUSTED44411
+Node: Agent GET_PASSPHRASE46786
+Node: Agent CLEAR_PASSPHRASE49227
+Node: Agent PRESET_PASSPHRASE49618
+Node: Agent GET_CONFIRMATION50456
+Node: Agent HAVEKEY51128
+Node: Agent LEARN51760
+Node: Agent PASSWD52058
+Node: Agent UPDATESTARTUPTTY52524
+Node: Agent GETEVENTCOUNTER53002
+Node: Agent GETINFO53804
+Node: Agent OPTION54508
+Node: Invoking DIRMNGR57566
+Node: Dirmngr Commands58464
+Node: Dirmngr Options60917
+Ref: Dirmngr Options-Footnote-178072
+Node: Dirmngr Configuration78207
+Node: Dirmngr Signals81337
+Node: Dirmngr Examples82365
+Node: Dirmngr Protocol83047
+Node: Dirmngr LOOKUP83697
+Node: Dirmngr ISVALID85068
+Node: Dirmngr CHECKCRL87641
+Node: Dirmngr CHECKOCSP88698
+Node: Dirmngr CACHECERT90004
+Node: Dirmngr VALIDATE90843
+Node: Invoking GPG91411
+Node: GPG Commands92641
+Node: General GPG Commands93535
+Node: Operational GPG Commands94224
+Ref: option --export-ownertrust111526
+Node: OpenPGP Key Management113639
+Node: GPG Options135600
+Node: GPG Configuration Options136933
+Ref: gpg-option --options150434
+Ref: trust-model-tofu155002
+Node: GPG Key related Options175182
+Node: GPG Input and Output180378
+Node: OpenPGP Options194082
+Node: Compliance Options198810
+Node: GPG Esoteric Options201961
+Ref: GPG Esoteric Options-Footnote-1229070
+Node: Deprecated Options229224
+Node: GPG Configuration230727
+Node: GPG Examples236197
+Node: Unattended Usage of GPG244884
+Node: Programmatic use of GnuPG245515
+Node: Ephemeral home directories246066
+Node: The quick key manipulation interface247373
+Node: Unattended GPG key generation247960
+Node: Invoking GPGSM257279
+Node: GPGSM Commands258148
+Node: General GPGSM Commands258586
+Node: Operational GPGSM Commands259274
+Node: Certificate Management261308
+Node: GPGSM Options266284
+Node: Configuration Options266858
+Ref: gpgsm-option --options267127
+Node: Certificate Options270407
+Ref: gpgsm-option --validation-model274011
+Node: Input and Output274991
+Ref: option --p12-charset275574
+Ref: gpgsm-option --with-key-data276818
+Ref: gpgsm-option --with-validation277092
+Node: CMS Options277970
+Node: Esoteric Options278990
+Node: GPGSM Configuration284417
+Node: GPGSM Examples290085
+Node: Unattended Usage290282
+Node: Automated signature checking290873
+Node: CSR and certificate creation292696
+Node: GPGSM Protocol297642
+Node: GPGSM ENCRYPT298898
+Node: GPGSM DECRYPT302561
+Node: GPGSM SIGN303397
+Node: GPGSM VERIFY304853
+Node: GPGSM GENKEY305369
+Node: GPGSM LISTKEYS306384
+Ref: gpgsm-cmd listkeys306543
+Node: GPGSM EXPORT307296
+Node: GPGSM IMPORT308260
+Node: GPGSM DELETE309001
+Node: GPGSM GETAUDITLOG309508
+Ref: gpgsm-cmd getauditlog309677
+Node: GPGSM GETINFO310021
+Node: GPGSM OPTION310870
+Node: Invoking SCDAEMON314223
+Node: Scdaemon Commands314897
+Node: Scdaemon Options316025
+Node: Card applications325375
+Node: OpenPGP Card326040
+Node: NKS Card326513
+Node: DINSIG Card326839
+Node: PKCS#15 Card327215
+Node: Geldkarte Card327485
+Node: SmartCard-HSM327876
+Node: Undefined Card328472
+Node: Scdaemon Configuration328885
+Node: Scdaemon Examples329923
+Node: Scdaemon Protocol330106
+Node: Scdaemon SERIALNO331625
+Node: Scdaemon LEARN332471
+Node: Scdaemon READCERT333318
+Node: Scdaemon READKEY333720
+Node: Scdaemon PKSIGN334006
+Node: Scdaemon PKDECRYPT334732
+Node: Scdaemon GETATTR335482
+Node: Scdaemon SETATTR335684
+Node: Scdaemon WRITEKEY335889
+Node: Scdaemon GENKEY336591
+Node: Scdaemon RANDOM336794
+Node: Scdaemon PASSWD337017
+Node: Scdaemon CHECKPIN337408
+Node: Scdaemon RESTART338411
+Node: Scdaemon APDU338944
+Node: Specify a User ID339917
+Ref: how-to-specify-a-user-id340075
+Node: Trust Values344933
+Ref: trust-values345062
+Node: Helper Tools345667
+Node: watchgnupg346440
+Ref: option watchgnupg --tcp347262
+Node: gpgv348840
+Node: addgnupghome354039
+Node: gpgconf354735
+Ref: gpgconf-Footnote-1356922
+Node: Invoking gpgconf357220
+Node: Format conventions363805
+Node: Listing components369136
+Node: Checking programs371219
+Node: Listing options373957
+Node: Changing options381453
+Node: Listing global options383155
+Node: Querying versions384926
+Node: Files used by gpgconf387624
+Node: applygnupgdefaults388100
+Node: gpg-preset-passphrase388844
+Node: Invoking gpg-preset-passphrase389879
+Node: gpg-connect-agent391281
+Node: Invoking gpg-connect-agent391995
+Node: Controlling gpg-connect-agent395541
+Node: dirmngr-client402014
+Node: gpgparsemail405365
+Node: gpgtar405678
+Node: Web Key Service409611
+Node: gpg-wks-client409924
+Node: gpg-wks-server415089
+Node: Howtos420446
+Node: Howto Create a Server Cert420718
+Node: System Notes429131
+Node: W32 Notes430342
+Node: Debugging430764
+Node: Debugging Tools431592
+Node: kbxutil431872
+Node: Debugging Hints433403
+Node: Common Problems434534
+Node: Architecture Details439771
+Node: Component interaction440081
+Ref: fig:moduleoverview440267
+Node: GnuPG-1 and GnuPG-2440374
+Ref: fig:cardarchitecture440664
+Node: Copying440779
+Node: Contributors478303
+Node: Glossary484558
+Node: Option Index487077
+Node: Environment Index566567
+Node: Index572014
 
 End Tag Table
diff --git a/doc/gnupg.info-1 b/doc/gnupg.info-1
index 3a9ce88..a041582 100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@ -1,6 +1,6 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.28-beta111, June
+This is the 'The GNU Privacy Guard Manual' (version 2.2.29-beta11, June
 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -27,7 +27,7 @@ File: gnupg.info,  Node: Top,  Next: Installation,  Up: (dir)
 Using the GNU Privacy Guard
 ***************************
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.28-beta111, June
+This is the 'The GNU Privacy Guard Manual' (version 2.2.29-beta11, June
 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -1726,9 +1726,8 @@ off the two leading dashes.
      only to this particular keyserver.
 
      Most keyservers synchronize with each other, so there is generally
-     no need to send keys to more than one server.  The keyserver
-     'hkp://keys.gnupg.net' uses round robin DNS to give a different
-     keyserver each time you use it.
+     no need to send keys to more than one server.  Somes keyservers use
+     round robin DNS to give a different keyserver each time you use it.
 
      If exactly two keyservers are configured and only one is a Tor
      hidden service (.onion), Dirmngr selects the keyserver to use
@@ -1736,7 +1735,7 @@ off the two leading dashes.
      a running Tor is done for each new connection.
 
      If no keyserver is explicitly configured, dirmngr will use the
-     built-in default of 'hkps://hkps.pool.sks-keyservers.net'.
+     built-in default of 'https://keyserver.ubuntu.com'.
 
      Windows users with a keyserver running on their Active Directory
      may use the short form 'ldap:///' for NAME to access this
@@ -1958,10 +1957,8 @@ off the two leading dashes.
      This option may be given multiple times to add more root
      certificates.  Tilde expansion is supported.
 
-     If no 'hkp-cacert' directive is present, dirmngr will make a
-     reasonable choice: if the keyserver in question is the special pool
-     'hkps.pool.sks-keyservers.net', it will use the bundled root
-     certificate for that pool.  Otherwise, it will use the system CAs.
+     If no 'hkp-cacert' directive is present, dirmngr will use the
+     system CAs.
 
    ---------- Footnotes ----------
 
diff --git a/doc/gnupg.info-2 b/doc/gnupg.info-2
index c4cb9ef..8343031 100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@ -1,6 +1,6 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.28-beta111, June
+This is the 'The GNU Privacy Guard Manual' (version 2.2.29-beta11, June
 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -2956,7 +2956,7 @@ File: gnupg.info,  Node: gpg-wks-client,  Next: gpg-wks-server,  Up: Web Key Ser
 ==========================
 
 The 'gpg-wks-client' is used to send requests to a Web Key Service
-provider.  This is usuallay done to upload a key into a Web Key
+provider.  This is usually done to upload a key into a Web Key
 Directory.
 
    With the '--supported' command the caller can test whether a site
@@ -4646,7 +4646,7 @@ Option Index
 
 * Menu:
 
-* add-servers:                           Dirmngr Options.     (line 311)
+* add-servers:                           Dirmngr Options.     (line 310)
 * agent-program:                         GPG Configuration Options.
                                                               (line 753)
 * agent-program <1>:                     Configuration Options.
@@ -4662,7 +4662,7 @@ Option Index
                                                               (line 548)
 * allow-non-selfsigned-uid:              GPG Esoteric Options.
                                                               (line 362)
-* allow-ocsp:                            Dirmngr Options.     (line 328)
+* allow-ocsp:                            Dirmngr Options.     (line 327)
 * allow-preset-passphrase:               Agent Options.       (line 164)
 * allow-secret-key-import:               GPG Esoteric Options.
                                                               (line 544)
@@ -4868,12 +4868,12 @@ Option Index
 * disable-dsa2:                          GPG Configuration Options.
                                                               (line 196)
 * disable-extended-key-format:           Agent Options.       (line 351)
-* disable-http:                          Dirmngr Options.     (line 218)
-* disable-ipv4:                          Dirmngr Options.     (line 212)
-* disable-ipv6:                          Dirmngr Options.     (line 212)
+* disable-http:                          Dirmngr Options.     (line 217)
+* disable-ipv4:                          Dirmngr Options.     (line 211)
+* disable-ipv6:                          Dirmngr Options.     (line 211)
 * disable-large-rsa:                     GPG Configuration Options.
                                                               (line 187)
-* disable-ldap:                          Dirmngr Options.     (line 215)
+* disable-ldap:                          Dirmngr Options.     (line 214)
 * disable-mdc:                           OpenPGP Options.     (line  25)
 * disable-ocsp:                          Certificate Options. (line  53)
 * disable-pinpad:                        Scdaemon Options.    (line 200)
@@ -5079,18 +5079,18 @@ Option Index
 * homedir <5>:                           Invoking gpgconf.    (line 115)
 * homedir <6>:                           Invoking gpg-connect-agent.
                                                               (line  21)
-* honor-http-proxy:                      Dirmngr Options.     (line 237)
-* http-proxy:                            Dirmngr Options.     (line 241)
+* honor-http-proxy:                      Dirmngr Options.     (line 236)
+* http-proxy:                            Dirmngr Options.     (line 240)
 * ignore-cache-for-signing:              Agent Options.       (line 192)
-* ignore-cert-extension:                 Dirmngr Options.     (line 377)
+* ignore-cert-extension:                 Dirmngr Options.     (line 376)
 * ignore-cert-extension <1>:             Certificate Options. (line  82)
 * ignore-crc-error:                      GPG Esoteric Options.
                                                               (line 387)
-* ignore-http-dp:                        Dirmngr Options.     (line 221)
-* ignore-ldap-dp:                        Dirmngr Options.     (line 228)
+* ignore-http-dp:                        Dirmngr Options.     (line 220)
+* ignore-ldap-dp:                        Dirmngr Options.     (line 227)
 * ignore-mdc-error:                      GPG Esoteric Options.
                                                               (line 394)
-* ignore-ocsp-service-url:               Dirmngr Options.     (line 233)
+* ignore-ocsp-service-url:               Dirmngr Options.     (line 232)
 * ignore-time-conflict:                  GPG Esoteric Options.
                                                               (line 373)
 * ignore-time-conflict <1>:              gpgv.                (line  63)
@@ -5214,12 +5214,12 @@ Option Index
 * launch:                                Invoking gpgconf.    (line  76)
 * lc-ctype:                              Agent Options.       (line 323)
 * lc-messages:                           Agent Options.       (line 323)
-* ldap-proxy:                            Dirmngr Options.     (line 246)
-* ldapserver:                            Dirmngr Options.     (line 276)
+* ldap-proxy:                            Dirmngr Options.     (line 245)
+* ldapserver:                            Dirmngr Options.     (line 275)
 * ldapserver <1>:                        Configuration Options.
                                                               (line  44)
-* ldapserverlist-file:                   Dirmngr Options.     (line 257)
-* ldaptimeout:                           Dirmngr Options.     (line 307)
+* ldapserverlist-file:                   Dirmngr Options.     (line 256)
+* ldaptimeout:                           Dirmngr Options.     (line 306)
 * learn-card:                            Certificate Management.
                                                               (line 104)
 * legacy-list-mode:                      GPG Input and Output.
@@ -5326,7 +5326,7 @@ Option Index
 * max-output:                            GPG Input and Output.
                                                               (line  19)
 * max-passphrase-days:                   Agent Options.       (line 254)
-* max-replies:                           Dirmngr Options.     (line 374)
+* max-replies:                           Dirmngr Options.     (line 373)
 * min-cert-level:                        GPG Configuration Options.
                                                               (line 397)
 * min-passphrase-len:                    Agent Options.       (line 229)
@@ -5334,7 +5334,7 @@ Option Index
 * multi-server:                          Scdaemon Commands.   (line  26)
 * multifile:                             Operational GPG Commands.
                                                               (line 100)
-* nameserver:                            Dirmngr Options.     (line 204)
+* nameserver:                            Dirmngr Options.     (line 203)
 * no:                                    GPG Configuration Options.
                                                               (line  67)
 * no-allow-external-cache:               Agent Options.       (line 177)
@@ -5402,12 +5402,12 @@ Option Index
                                                               (line 266)
 * null:                                  gpgtar.              (line  86)
 * ocsp:                                  dirmngr-client.      (line  61)
-* ocsp-current-period:                   Dirmngr Options.     (line 369)
-* ocsp-max-clock-skew:                   Dirmngr Options.     (line 361)
-* ocsp-max-period:                       Dirmngr Options.     (line 365)
-* ocsp-responder:                        Dirmngr Options.     (line 335)
-* ocsp-signer:                           Dirmngr Options.     (line 340)
-* only-ldap-proxy:                       Dirmngr Options.     (line 252)
+* ocsp-current-period:                   Dirmngr Options.     (line 368)
+* ocsp-max-clock-skew:                   Dirmngr Options.     (line 360)
+* ocsp-max-period:                       Dirmngr Options.     (line 364)
+* ocsp-responder:                        Dirmngr Options.     (line 334)
+* ocsp-signer:                           Dirmngr Options.     (line 339)
+* only-ldap-proxy:                       Dirmngr Options.     (line 251)
 * openpgp:                               Compliance Options.  (line  19)
 * openpgp <1>:                           gpgtar.              (line  95)
 * options:                               Agent Options.       (line  10)
@@ -5830,7 +5830,7 @@ Environment Variable and File Index
 * HKCU\Software\GNU\GnuPG:HomeDir <6>:   Invoking gpg-connect-agent.
                                                               (line  21)
 * HOME:                                  GPG Configuration.   (line 103)
-* http_proxy:                            Dirmngr Options.     (line 241)
+* http_proxy:                            Dirmngr Options.     (line 240)
 * LANGUAGE:                              GPG Configuration.   (line 121)
 * LC_CTYPE:                              GPGSM OPTION.        (line  27)
 * LC_MESSAGES:                           GPGSM OPTION.        (line  29)
diff --git a/doc/wks.texi b/doc/wks.texi
index 119e31c..b0cd5df 100644
--- a/doc/wks.texi
+++ b/doc/wks.texi
@@ -57,7 +57,7 @@ Directory.
 
 @mansect description
 The @command{gpg-wks-client} is used to send requests to a Web Key
-Service provider.  This is usuallay done to upload a key into a Web
+Service provider.  This is usually done to upload a key into a Web
 Key Directory.
 
 With the @option{--supported} command the caller can test whether a