From cd3537116342d43e78c8648ca744ad97ebca075f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg 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 --- src/tool_help.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src') 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 ", "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 ", - "Certificate file type (DER/PEM/ENG)"}, + "Certificate type (DER/PEM/ENG)"}, {" --ciphers ", "SSL ciphers to use"}, {" --compressed", @@ -131,10 +132,10 @@ static const struct helptxt helptext[] = { "EGD socket path for random data"}, {" --engine ", "Crypto engine to use"}, - {" --etag-save ", - "Get an ETag from response header and save it to a FILE"}, {" --etag-compare ", - "Get an ETag from a file and send a conditional request"}, + "Pass an ETag from a file as a custom header"}, + {" --etag-save ", + "Parse ETag from a request and save it to a file"}, {" --expect100-timeout ", "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 ", - "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 ", - "TLS 1.3 ciphersuites for proxy (OpenSSL)"}, + {" --proxy-tls13-ciphers ", + "TLS 1.3 proxy cipher suites"}, {" --proxy-tlsauthtype ", "TLS authentication type for HTTPS proxy"}, {" --proxy-tlspassword ", @@ -391,20 +392,20 @@ static const struct helptxt helptext[] = { "Specify request command to use"}, {" --request-target", "Specify the target for this request"}, - {" --resolve ", + {" --resolve ", "Resolve the host+port to this address"}, {" --retry ", "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 ", "Wait time between retries"}, - {" --retry-all-errors", - "Retry all errors (use with --retry)"}, {" --retry-max-time ", "Retry only within this period"}, - {" --sasl-authzid ", - "Use this identity to act as during SASL PLAIN authentication"}, + {" --sasl-authzid ", + "Identity for SASL PLAIN authentication"}, {" --sasl-ir", "Enable initial response in SASL authentication"}, {" --service-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 ", "Set maximum allowed TLS version"}, - {" --tls13-ciphers ", - "TLS 1.3 ciphersuites (OpenSSL)"}, + {" --tls13-ciphers ", + "TLS 1.3 cipher suites to use"}, {" --tlsauthtype ", "TLS authentication type"}, {" --tlspassword", -- cgit v1.2.3