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
This commit is contained in:
Daniel Stenberg 2020-05-12 09:13:43 +02:00
parent 32aade5c91
commit cd35371163
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 20 additions and 19 deletions

View File

@ -1,6 +1,6 @@
Long: happy-eyeballs-timeout-ms Long: happy-eyeballs-timeout-ms
Arg: <milliseconds> 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 Added: 7.59.0
--- ---
Happy eyeballs is an algorithm that attempts to connect to both IPv4 and IPv6 Happy eyeballs is an algorithm that attempts to connect to both IPv4 and IPv6

View File

@ -1,5 +1,5 @@
Long: resolve Long: resolve
Arg: <host:port:address[,address]...> Arg: <host:port:addr[,addr]...>
Help: Resolve the host+port to this address Help: Resolve the host+port to this address
Added: 7.21.3 Added: 7.21.3
--- ---

View File

@ -1,5 +1,5 @@
Long: ssl-revoke-best-effort 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 Added: 7.70.0
--- ---
(Schannel) This option tells curl to ignore certificate revocation checks when (Schannel) This option tells curl to ignore certificate revocation checks when

View File

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