doc: Fix typos

--
GnuPG-bug-id: 5071

Also fixed one in keyformat.txt [wk].

4 files changed, 7 insertions, 7 deletions

diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index 687c0763d..88c3a2d36 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -250,7 +250,7 @@ The currently defined protection modes are:
   they can easily be stripped by looking for the end of the list.
 
   The associated data required for this protection mode is the list
-  formiing the public key parameters.  For the above example this is
+  forming the public key parameters.  For the above example this is
   is this canonical encoded S-expression:
 
   (rsa
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 48e52e98f..361c434fa 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -421,7 +421,7 @@ fingerprint of the primary key the entire public key is deleted.
 @opindex delete-secret-keys
 Remove key from the secret keyring. In batch mode the key must be
 specified by fingerprint.  The option @option{--yes} can be used to
-advice gpg-agent not to request a confirmation.  This extra
+advise gpg-agent not to request a confirmation.  This extra
 pre-caution is done because @command{@gpgname} can't be sure that the
 secret key (as controlled by gpg-agent) is only used for the given
 OpenPGP public key.  If the exclamation mark syntax is used with the
@@ -434,7 +434,7 @@ primary key only the secret part of the primary key is deleted.
 @opindex delete-secret-and-public-key
 Same as @option{--delete-key}, but if a secret key exists, it will be
 removed first. In batch mode the key must be specified by fingerprint.
-The option @option{--yes} can be used to advice gpg-agent not to
+The option @option{--yes} can be used to advise gpg-agent not to
 request a confirmation.
 
 @item --export
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 17e30d243..50a2595ae 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -1271,9 +1271,9 @@ last file descriptor passed to the application.
 @xref{fun-assuan_sendfd, ,the assuan_sendfd function,assuan,the Libassuan
 manual}, on how to do descriptor passing.
 
-The @code{--armor} option may be used to advice the server that the
-input data is in @acronym{PEM} format, @code{--base64} advices that a
-raw base-64 encoding is used, @code{--binary} advices of raw binary
+The @code{--armor} option may be used to advise the server that the
+input data is in @acronym{PEM} format, @code{--base64} advises that a
+raw base-64 encoding is used, @code{--binary} advises of raw binary
 input (@acronym{BER}).  If none of these options is used, the server
 tries to figure out the used encoding, but this may not always be
 correct.
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index b75ee6457..0e3b3daad 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -3856,7 +3856,7 @@ build_ecc_privkey_template (app_t app, int keyno,
 }
 
 
-/* Helper for do_writekey to change the size of a key.  Not ethat
+/* Helper for do_writekey to change the size of a key.  Note that
    this deletes the entire key without asking.  */
 static gpg_error_t
 change_keyattr (app_t app, ctrl_t ctrl,