From cd3537116342d43e78c8648ca744ad97ebca075f Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 12 May 2020 09:13:43 +0200
Subject: tool: shorten 3 --help descriptions

--happy-eyeballs-timeout-ms, --resolve and --ssl-revoke-best-effort

gen.pl already warned about these lines but we didn't listen

Closes #5379
---
 docs/cmdline-opts/happy-eyeballs-timeout-ms.d |  2 +-
 docs/cmdline-opts/resolve.d                   |  2 +-
 docs/cmdline-opts/ssl-revoke-best-effort.d    |  2 +-
 src/tool_help.c                               | 33 ++++++++++++++-------------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/docs/cmdline-opts/happy-eyeballs-timeout-ms.d b/docs/cmdline-opts/happy-eyeballs-timeout-ms.d
index ec9a8c228..611a8f1d8 100644
--- a/docs/cmdline-opts/happy-eyeballs-timeout-ms.d
+++ b/docs/cmdline-opts/happy-eyeballs-timeout-ms.d
@@ -1,6 +1,6 @@
 Long: happy-eyeballs-timeout-ms
 Arg: <milliseconds>
-Help: How long to wait in milliseconds for IPv6 before trying IPv4
+Help: Time for IPv6 before trying IPv4
 Added: 7.59.0
 ---
 Happy eyeballs is an algorithm that attempts to connect to both IPv4 and IPv6
diff --git a/docs/cmdline-opts/resolve.d b/docs/cmdline-opts/resolve.d
index 9c37525bd..c1692f0f8 100644
--- a/docs/cmdline-opts/resolve.d
+++ b/docs/cmdline-opts/resolve.d
@@ -1,5 +1,5 @@
 Long: resolve
-Arg: <host:port:address[,address]...>
+Arg: <host:port:addr[,addr]...>
 Help: Resolve the host+port to this address
 Added: 7.21.3
 ---
diff --git a/docs/cmdline-opts/ssl-revoke-best-effort.d b/docs/cmdline-opts/ssl-revoke-best-effort.d
index 9b55699db..e339b8af0 100644
--- a/docs/cmdline-opts/ssl-revoke-best-effort.d
+++ b/docs/cmdline-opts/ssl-revoke-best-effort.d
@@ -1,5 +1,5 @@
 Long: ssl-revoke-best-effort
-Help: Ignore missing/offline cert CRL distribution points (Schannel)
+Help: Ignore missing/offline cert CRL dist points
 Added: 7.70.0
 ---
 (Schannel) This option tells curl to ignore certificate revocation checks when
diff --git a/src/tool_help.c b/src/tool_help.c
index e24bf0e9a..ae319271c 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -48,6 +48,7 @@ struct helptxt {
   const char *desc;
 };
 
+
 static const struct helptxt helptext[] = {
   {"    --abstract-unix-socket <path>",
    "Connect via abstract Unix domain socket"},
@@ -68,7 +69,7 @@ static const struct helptxt helptext[] = {
   {"    --cert-status",
    "Verify the status of the server certificate"},
   {"    --cert-type <type>",
-   "Certificate file type (DER/PEM/ENG)"},
+   "Certificate type (DER/PEM/ENG)"},
   {"    --ciphers <list of ciphers>",
    "SSL ciphers to use"},
   {"    --compressed",
@@ -131,10 +132,10 @@ static const struct helptxt helptext[] = {
    "EGD socket path for random data"},
   {"    --engine <name>",
    "Crypto engine to use"},
-  {"    --etag-save <file>",
-   "Get an ETag from response header and save it to a FILE"},
   {"    --etag-compare <file>",
-   "Get an ETag from a file and send a conditional request"},
+   "Pass an ETag from a file as a custom header"},
+  {"    --etag-save <file>",
+   "Parse ETag from a request and save it to a file"},
   {"    --expect100-timeout <seconds>",
    "How long to wait for 100-continue"},
   {"-f, --fail",
@@ -174,7 +175,7 @@ static const struct helptxt helptext[] = {
   {"-g, --globoff",
    "Disable URL sequences and ranges using {} and []"},
   {"    --happy-eyeballs-timeout-ms <milliseconds>",
-   "How long to wait in milliseconds for IPv6 before trying IPv4"},
+   "Time for IPv6 before trying IPv4"},
   {"    --haproxy-protocol",
    "Send HAProxy PROXY protocol v1 header"},
   {"-I, --head",
@@ -351,8 +352,8 @@ static const struct helptxt helptext[] = {
    "SPNEGO proxy service name"},
   {"    --proxy-ssl-allow-beast",
    "Allow security flaw for interop for HTTPS proxy"},
-  {"    --proxy-tls13-ciphers <list>",
-   "TLS 1.3 ciphersuites for proxy (OpenSSL)"},
+  {"    --proxy-tls13-ciphers <ciphersuite list>",
+   "TLS 1.3 proxy cipher suites"},
   {"    --proxy-tlsauthtype <type>",
    "TLS authentication type for HTTPS proxy"},
   {"    --proxy-tlspassword <string>",
@@ -391,20 +392,20 @@ static const struct helptxt helptext[] = {
    "Specify request command to use"},
   {"    --request-target",
    "Specify the target for this request"},
-  {"    --resolve <host:port:address[,address]...>",
+  {"    --resolve <host:port:addr[,addr]...>",
    "Resolve the host+port to this address"},
   {"    --retry <num>",
    "Retry request if transient problems occur"},
+  {"    --retry-all-errors",
+   "Retry all errors (use with --retry)"},
   {"    --retry-connrefused",
    "Retry on connection refused (use with --retry)"},
   {"    --retry-delay <seconds>",
    "Wait time between retries"},
-  {"    --retry-all-errors",
-   "Retry all errors (use with --retry)"},
   {"    --retry-max-time <seconds>",
    "Retry only within this period"},
-  {"    --sasl-authzid <identity> ",
-   "Use this identity to act as during SASL PLAIN authentication"},
+  {"    --sasl-authzid <identity>",
+   "Identity for SASL PLAIN authentication"},
   {"    --sasl-ir",
    "Enable initial response in SASL authentication"},
   {"    --service-name <name>",
@@ -439,10 +440,10 @@ static const struct helptxt helptext[] = {
    "Allow security flaw to improve interop"},
   {"    --ssl-no-revoke",
    "Disable cert revocation checks (Schannel)"},
-  {"    --ssl-revoke-best-effort",
-   "Ignore revocation offline or missing revocation list errors (Schannel)"},
   {"    --ssl-reqd",
    "Require SSL/TLS"},
+  {"    --ssl-revoke-best-effort",
+   "Ignore missing/offline cert CRL dist points"},
   {"-2, --sslv2",
    "Use SSLv2"},
   {"-3, --sslv3",
@@ -467,8 +468,8 @@ static const struct helptxt helptext[] = {
    "Transfer based on a time condition"},
   {"    --tls-max <VERSION>",
    "Set maximum allowed TLS version"},
-  {"    --tls13-ciphers <list>",
-   "TLS 1.3 ciphersuites (OpenSSL)"},
+  {"    --tls13-ciphers <ciphersuite list>",
+   "TLS 1.3 cipher suites to use"},
   {"    --tlsauthtype <type>",
    "TLS authentication type"},
   {"    --tlspassword",
-- 
cgit v1.2.3