Skip to content

Commit

Permalink
cmdline-opts: shorten six help texts
Browse files Browse the repository at this point in the history
 o --location-trusted
 o --next
 o --parallel-immmediate
 o --pinnedpubkey
 o --proxy-pass
 o --proxy-ssl-allow-beast

Closes curl#14075
  • Loading branch information
bagder committed Jul 2, 2024
1 parent 9784f9a commit 75763a3
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion docs/cmdline-opts/location-trusted.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
c: Copyright (C) Daniel Stenberg, <[email protected]>, 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
Expand Down
2 changes: 1 addition & 1 deletion docs/cmdline-opts/next.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/cmdline-opts/parallel-immediate.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
c: Copyright (C) Daniel Stenberg, <[email protected]>, 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
Expand Down
2 changes: 1 addition & 1 deletion docs/cmdline-opts/pinnedpubkey.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
SPDX-License-Identifier: curl
Long: pinnedpubkey
Arg: <hashes>
Help: FILE/HASHES Public key to verify peer against
Help: Public key to verify peer against
Protocols: TLS
Category: tls
Added: 7.39.0
Expand Down
2 changes: 1 addition & 1 deletion docs/cmdline-opts/proxy-pass.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
SPDX-License-Identifier: curl
Long: proxy-pass
Arg: <phrase>
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
Expand Down
2 changes: 1 addition & 1 deletion docs/cmdline-opts/proxy-ssl-allow-beast.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
c: Copyright (C) Daniel Stenberg, <[email protected]>, 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
Expand Down
12 changes: 6 additions & 6 deletions src/tool_listhelp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <options>",
"Server login options",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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 <num>",
"Maximum concurrency for parallel transfers",
Expand All @@ -460,7 +460,7 @@ const struct helptxt helptext[] = {
"Do not squash .. sequences in URL path",
CURLHELP_CURL},
{" --pinnedpubkey <hashes>",
"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",
Expand Down Expand Up @@ -541,7 +541,7 @@ const struct helptxt helptext[] = {
"NTLM authentication with the proxy",
CURLHELP_PROXY | CURLHELP_AUTH},
{" --proxy-pass <phrase>",
"Passphrase for the private key for HTTPS proxy",
"Passphrase for private key for HTTPS proxy",
CURLHELP_PROXY | CURLHELP_TLS | CURLHELP_AUTH},
{" --proxy-pinnedpubkey <hashes>",
"FILE/HASHES public key to verify proxy with",
Expand All @@ -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",
Expand Down

0 comments on commit 75763a3

Please sign in to comment.