agent,dirmngr,g13,kbx,scd,gpgsm,tools: Fix help/usage strings.

* agent/command.c (hlp_get_passphrase, hlp_scd, hlp_putval): Fix.
* dirmngr/server.c (hlp_checkcrl, hlp_ad_query, hlp_getinfo): Fix.
* g13/server.c (hlp_create): Likewise.
* kbx/kbxserver.c (hlp_delete, hlp_getinfo): Likewise.
* scd/command.c (hlp_learn, hlp_getattr, hlp_setattr): Likewise.
(hlp_writekey, hlp_getinfo, hlp_restart, hlp_apdu): Likewise.
(hlp_keyinfo): Likewise.
* sm/server.c (hlp_encrypt, hlp_export): Likewise.
* tools/gpg-auth.c (my_strusage): Likewise.
* tools/gpg-card.c (cmd_yubikey): Likewise.

--

Signed-off-by: NIIBE Yutaka <[email protected]>

8 files changed, 21 insertions, 21 deletions

diff --git a/agent/command.c b/agent/command.c
index b59168caa..945bb52b7 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2007,7 +2007,7 @@ static const char hlp_get_passphrase[] =
   "\n"
   "If the option \"--no-ask\" is used and the passphrase is not in the\n"
   "cache the user will not be asked to enter a passphrase but the error\n"
-  "code GPG_ERR_NO_DATA is returned.  \n"
+  "code GPG_ERR_NO_DATA is returned.\n"
   "\n"
   "If the option\"--newsymkey\" is used the agent asks for a new passphrase\n"
   "to be used in symmetric-only encryption.  This must not be empty.\n"
@@ -2709,7 +2709,7 @@ leave:
 
 static const char hlp_scd[] =
   "SCD <commands to pass to the scdaemon>\n"
-  " \n"
+  "\n"
   "This is a general quote command to redirect everything to the\n"
   "SCdaemon.";
 static gpg_error_t
@@ -3814,7 +3814,7 @@ static const char hlp_putval[] =
   "daemon's service may now first try connect to get the information\n"
   "for that service from gpg-agent through the GETVAL command and then\n"
   "try to connect to that daemon.  Only if that fails they may start\n"
-  "an own instance of the service daemon. \n"
+  "an own instance of the service daemon.\n"
   "\n"
   "KEY is an arbitrary symbol with the same syntax rules as keys\n"
   "for shell environment variables.  PERCENT_ESCAPED_VALUE is the\n"
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 2c3d378ff..2ff063564 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -1532,7 +1532,7 @@ static const char hlp_checkcrl[] =
   "Check whether the certificate with FINGERPRINT (SHA-1 hash of the\n"
   "entire X.509 certificate blob) is valid or not by consulting the\n"
   "CRL responsible for this certificate.  If the fingerprint has not\n"
-  "been given or the certificate is not known, the function \n"
+  "been given or the certificate is not known, the function\n"
   "inquires the certificate using an\n"
   "\n"
   "  INQUIRE TARGETCERT\n"
@@ -2843,7 +2843,7 @@ cmd_ks_del (assuan_context_t ctx, char *line)
 
 
 static const char hlp_ad_query[] =
-  "AD_QUERY [--first|--next] [--] <filter> \n"
+  "AD_QUERY [--first|--next] [--] <filter>\n"
   "\n"
   "Query properties from a Windows Active Directory.\n"
   "Options:\n"
@@ -3076,7 +3076,7 @@ cmd_loadswdb (assuan_context_t ctx, char *line)
 static const char hlp_getinfo[] =
   "GETINFO <what>\n"
   "\n"
-  "Multi purpose command to return certain information.  \n"
+  "Multi purpose command to return certain information.\n"
   "Supported values of WHAT are:\n"
   "\n"
   "version     - Return the version of the program\n"
diff --git a/g13/server.c b/g13/server.c
index 341a6b281..edd5f5d2a 100644
--- a/g13/server.c
+++ b/g13/server.c
@@ -421,7 +421,7 @@ cmd_signer (assuan_context_t ctx, char *line)
 static const char hlp_create[] =
   "CREATE [options] <filename>\n"
   "\n"
-  "Create a new container.  On success the OPEN command is \n"
+  "Create a new container.  On success the OPEN command is\n"
   "implicitly done for the new container.";
 static gpg_error_t
 cmd_create (assuan_context_t ctx, char *line)
diff --git a/kbx/kbxserver.c b/kbx/kbxserver.c
index 32b5338a2..9ba83bcff 100644
--- a/kbx/kbxserver.c
+++ b/kbx/kbxserver.c
@@ -625,7 +625,7 @@ cmd_store (assuan_context_t ctx, char *line)
 
 
 static const char hlp_delete[] =
-  "DELETE <ubid> \n"
+  "DELETE <ubid>\n"
   "\n"
   "Delete a key into the database.  The UBID identifies the key.\n";
 static gpg_error_t
@@ -810,7 +810,7 @@ cmd_transaction (assuan_context_t ctx, char *line)
 static const char hlp_getinfo[] =
   "GETINFO <what>\n"
   "\n"
-  "Multi purpose command to return certain information.  \n"
+  "Multi purpose command to return certain information.\n"
   "Supported values of WHAT are:\n"
   "\n"
   "version     - Return the version of the program.\n"
diff --git a/scd/command.c b/scd/command.c
index 70665d07d..fcc3a73c4 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -539,7 +539,7 @@ static const char hlp_learn[] =
   "  S PUBKEY-URL <url>\n"
   "\n"
   "The URL to be used for locating the entire public key.\n"
-  "  \n"
+  "\n"
   "If KEYGRIP is given the card holding a key with that keygrip is used.\n"
   "If --demand is used the card with the specified S/N is used.\n"
   "Note, that this function may even be used on a locked card.";
@@ -1261,7 +1261,7 @@ static const char hlp_getattr[] =
   "returned through status message, see the LEARN command for details.\n"
   "\n"
   "However, the current implementation assumes that Name is not escaped;\n"
-  "this works as long as no one uses arbitrary escaping. \n"
+  "this works as long as no one uses arbitrary escaping.\n"
   "\n"
   "Note, that this function may even be used on a locked card.\n"
   "When KEYGRIP is specified, it accesses directly with the KEYGRIP.";
@@ -1302,7 +1302,7 @@ cmd_getattr (assuan_context_t ctx, char *line)
 
 
 static const char hlp_setattr[] =
-  "SETATTR [--inquire] <name> <value> \n"
+  "SETATTR [--inquire] <name> <value>\n"
   "\n"
   "This command is used to store data on a smartcard.  The allowed\n"
   "names and values are depend on the currently selected smartcard\n"
@@ -1451,7 +1451,7 @@ cmd_writecert (assuan_context_t ctx, char *line)
 
 
 static const char hlp_writekey[] =
-  "WRITEKEY [--force] <keyid> \n"
+  "WRITEKEY [--force] <keyid>\n"
   "\n"
   "This command is used to store a secret key on a smartcard.  The\n"
   "allowed keyids depend on the currently selected smartcard\n"
@@ -1884,7 +1884,7 @@ cmd_unlock (assuan_context_t ctx, char *line)
 static const char hlp_getinfo[] =
   "GETINFO <what>\n"
   "\n"
-  "Multi purpose command to return certain information.  \n"
+  "Multi purpose command to return certain information.\n"
   "Supported values of WHAT are:\n"
   "\n"
   "  version     - Return the version of the program.\n"
@@ -2067,7 +2067,7 @@ static const char hlp_restart[] =
   "\n"
   "Restart the current connection; this is a kind of warm reset.  It\n"
   "deletes the context used by this connection but does not send a\n"
-  "RESET to the card.  Thus the card itself won't get reset. \n"
+  "RESET to the card.  Thus the card itself won't get reset.\n"
   "\n"
   "This is used by gpg-agent to reuse a primary pipe connection and\n"
   "may be used by clients to backup from a conflict in the serial\n"
@@ -2128,7 +2128,7 @@ static const char hlp_apdu[] =
   "level functions and sends the data directly to the card.  HEXSTRING\n"
   "is expected to be a proper APDU.  If HEXSTRING is not given no\n"
   "commands are set to the card but the command will implicitly check\n"
-  "whether the card is ready for use. \n"
+  "whether the card is ready for use.\n"
   "\n"
   "Using the option \"--atr\" returns the ATR of the card as a status\n"
   "message before any data like this:\n"
@@ -2304,7 +2304,7 @@ static const char hlp_keyinfo[] =
   "IDSTR is a string used to distinguish keys on a smartcard.  If it\n"
   "      is not known a dash is used instead.\n"
   "\n"
-  "USAGE is a string of capabilities of the key, 's' for sign, \n"
+  "USAGE is a string of capabilities of the key, 's' for sign,\n"
   "'e' for encryption, 'a' for auth, and 'c' for cert.  If it is not\n"
   "known a dash is used instead.\n"
   "\n"
diff --git a/sm/server.c b/sm/server.c
index d434347b6..2e133eaf7 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -457,7 +457,7 @@ cmd_signer (assuan_context_t ctx, char *line)
 
 
 static const char hlp_encrypt[] =
-  "ENCRYPT \n"
+  "ENCRYPT\n"
   "\n"
   "Do the actual encryption process. Takes the plaintext from the INPUT\n"
   "command, writes to the ciphertext to the file descriptor set with\n"
@@ -789,7 +789,7 @@ static const char hlp_export[] =
   "\n"
   "Export the certificates selected by PATTERN.  With --data the output\n"
   "is returned using Assuan D lines; the default is to use the sink given\n"
-  "by the last \"OUTPUT\" command.  The options --armor or --base64 encode \n"
+  "by the last \"OUTPUT\" command.  The options --armor or --base64 encode\n"
   "the output using the PEM respective a plain base-64 format; the default\n"
   "is a binary format which is only suitable for a single certificate.\n"
   "With --secret the secret key is exported using the PKCS#8 format,\n"
diff --git a/tools/gpg-auth.c b/tools/gpg-auth.c
index 0c6b967c4..9abac1cb9 100644
--- a/tools/gpg-auth.c
+++ b/tools/gpg-auth.c
@@ -138,7 +138,7 @@ my_strusage( int level )
       break;
     case 41:
       p = ("Syntax: gpg-auth"
-           " [options] \n\n"
+           " [options]\n\n"
            "Tool to authenticate a user using a smartcard.\n"
            "Use option \"--help\" to list all options.");
       break;
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 061f72017..3a9fc778c 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -3658,7 +3658,7 @@ cmd_yubikey (card_info_t info, char *argstr)
       ("YUBIKEY <cmd> args\n\n"
        "Various commands pertaining to Yubikey tokens with <cmd> being:\n"
        "\n"
-       "  LIST \n"
+       "  LIST\n"
        "\n"
        "List supported and enabled applications.\n"
        "\n"