From 75763a3e882e2705a5a08141e69baac78d7354ab Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 1 Jul 2024 17:19:44 +0200 Subject: [PATCH] cmdline-opts: shorten six help texts o --location-trusted o --next o --parallel-immmediate o --pinnedpubkey o --proxy-pass o --proxy-ssl-allow-beast Closes #14075 --- docs/cmdline-opts/location-trusted.md | 2 +- docs/cmdline-opts/next.md | 2 +- docs/cmdline-opts/parallel-immediate.md | 2 +- docs/cmdline-opts/pinnedpubkey.md | 2 +- docs/cmdline-opts/proxy-pass.md | 2 +- docs/cmdline-opts/proxy-ssl-allow-beast.md | 2 +- src/tool_listhelp.c | 12 ++++++------ 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/cmdline-opts/location-trusted.md b/docs/cmdline-opts/location-trusted.md index 4f4e7def57a052..edbd0b53952534 100644 --- a/docs/cmdline-opts/location-trusted.md +++ b/docs/cmdline-opts/location-trusted.md @@ -2,7 +2,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: location-trusted -Help: Like --location, but send auth to other hosts +Help: As --location, but send auth to other hosts Protocols: HTTP Category: http auth Added: 7.10.4 diff --git a/docs/cmdline-opts/next.md b/docs/cmdline-opts/next.md index 2cf65c65a8f647..cb67e907f438c5 100644 --- a/docs/cmdline-opts/next.md +++ b/docs/cmdline-opts/next.md @@ -7,7 +7,7 @@ Tags: Protocols: Added: 7.36.0 Magic: divider -Help: Make next URL use its separate set of options +Help: Make next URL use separate options Category: curl Multi: append See-also: diff --git a/docs/cmdline-opts/parallel-immediate.md b/docs/cmdline-opts/parallel-immediate.md index 88b2a658f916db..cf8e20928b2a92 100644 --- a/docs/cmdline-opts/parallel-immediate.md +++ b/docs/cmdline-opts/parallel-immediate.md @@ -2,7 +2,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: parallel-immediate -Help: Do not wait for multiplexing (with --parallel) +Help: Do not wait for multiplexing Added: 7.68.0 Category: connection curl Multi: boolean diff --git a/docs/cmdline-opts/pinnedpubkey.md b/docs/cmdline-opts/pinnedpubkey.md index ab208cca9e8730..d21a18f69373c5 100644 --- a/docs/cmdline-opts/pinnedpubkey.md +++ b/docs/cmdline-opts/pinnedpubkey.md @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: pinnedpubkey Arg: -Help: FILE/HASHES Public key to verify peer against +Help: Public key to verify peer against Protocols: TLS Category: tls Added: 7.39.0 diff --git a/docs/cmdline-opts/proxy-pass.md b/docs/cmdline-opts/proxy-pass.md index 170082ce87950b..88cefd54c89478 100644 --- a/docs/cmdline-opts/proxy-pass.md +++ b/docs/cmdline-opts/proxy-pass.md @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: proxy-pass Arg: -Help: Passphrase for the private key for HTTPS proxy +Help: Passphrase for private key for HTTPS proxy Added: 7.52.0 Category: proxy tls auth Multi: single diff --git a/docs/cmdline-opts/proxy-ssl-allow-beast.md b/docs/cmdline-opts/proxy-ssl-allow-beast.md index 875e70ccb2d8ac..089038dec49d07 100644 --- a/docs/cmdline-opts/proxy-ssl-allow-beast.md +++ b/docs/cmdline-opts/proxy-ssl-allow-beast.md @@ -2,7 +2,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: proxy-ssl-allow-beast -Help: Allow security flaw for interop for HTTPS proxy +Help: Allow this security flaw for HTTPS proxy Added: 7.52.0 Category: proxy tls Multi: boolean diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c index dfc28b1a5643b9..93941811c2d02a 100644 --- a/src/tool_listhelp.c +++ b/src/tool_listhelp.c @@ -355,7 +355,7 @@ const struct helptxt helptext[] = { "Follow redirects", CURLHELP_HTTP}, {" --location-trusted", - "Like --location, but send auth to other hosts", + "As --location, but send auth to other hosts", CURLHELP_HTTP | CURLHELP_AUTH}, {" --login-options ", "Server login options", @@ -403,7 +403,7 @@ const struct helptxt helptext[] = { "Use either .netrc or URL", CURLHELP_CURL}, {"-:, --next", - "Make next URL use its separate set of options", + "Make next URL use separate options", CURLHELP_CURL}, {" --no-alpn", "Disable the ALPN TLS extension", @@ -448,7 +448,7 @@ const struct helptxt helptext[] = { "Perform transfers in parallel", CURLHELP_CONNECTION | CURLHELP_CURL}, {" --parallel-immediate", - "Do not wait for multiplexing (with --parallel)", + "Do not wait for multiplexing", CURLHELP_CONNECTION | CURLHELP_CURL}, {" --parallel-max ", "Maximum concurrency for parallel transfers", @@ -460,7 +460,7 @@ const struct helptxt helptext[] = { "Do not squash .. sequences in URL path", CURLHELP_CURL}, {" --pinnedpubkey ", - "FILE/HASHES Public key to verify peer against", + "Public key to verify peer against", CURLHELP_TLS}, {" --post301", "Do not switch to GET after a 301 redirect", @@ -541,7 +541,7 @@ const struct helptxt helptext[] = { "NTLM authentication with the proxy", CURLHELP_PROXY | CURLHELP_AUTH}, {" --proxy-pass ", - "Passphrase for the private key for HTTPS proxy", + "Passphrase for private key for HTTPS proxy", CURLHELP_PROXY | CURLHELP_TLS | CURLHELP_AUTH}, {" --proxy-pinnedpubkey ", "FILE/HASHES public key to verify proxy with", @@ -550,7 +550,7 @@ const struct helptxt helptext[] = { "SPNEGO proxy service name", CURLHELP_PROXY | CURLHELP_TLS}, {" --proxy-ssl-allow-beast", - "Allow security flaw for interop for HTTPS proxy", + "Allow this security flaw for HTTPS proxy", CURLHELP_PROXY | CURLHELP_TLS}, {" --proxy-ssl-auto-client-cert", "Auto client certificate for proxy",