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

diff --git a/docs/cmdline-opts/location-trusted.md b/docs/cmdline-opts/location-trusted.md
index 4f4e7def57a0524fc623ca5cb2b22a301d8c3804..edbd0b5395253481355ce058186ff667afbe461c 100644 (file)
--- a/docs/cmdline-opts/location-trusted.md
+++ b/docs/cmdline-opts/location-trusted.md
@@ -2,7 +2,7 @@
 c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, 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 2cf65c65a8f6475ca8123256892dbf51050c9fa5..cb67e907f438c5559b811bfc0af18e00ea798fd2 100644 (file)
--- 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 88b2a658f916dbf5e9a8fb5d5b93b240856a9da4..cf8e20928b2a92694f57443bf0c3db9009b43552 100644 (file)
--- a/docs/cmdline-opts/parallel-immediate.md
+++ b/docs/cmdline-opts/parallel-immediate.md
@@ -2,7 +2,7 @@
 c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, 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 ab208cca9e8730fce15871b51e0c2b296677dedc..d21a18f69373c5e047989a46776016cde4a50a6f 100644 (file)
--- a/docs/cmdline-opts/pinnedpubkey.md
+++ b/docs/cmdline-opts/pinnedpubkey.md
@@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, 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

diff --git a/docs/cmdline-opts/proxy-pass.md b/docs/cmdline-opts/proxy-pass.md
index 170082ce87950bc8c6f127b864bf8d7840d4617f..88cefd54c8947836cad34ecc0897970c0d8d5ba8 100644 (file)
--- a/docs/cmdline-opts/proxy-pass.md
+++ b/docs/cmdline-opts/proxy-pass.md
@@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, 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

diff --git a/docs/cmdline-opts/proxy-ssl-allow-beast.md b/docs/cmdline-opts/proxy-ssl-allow-beast.md
index 875e70ccb2d8ac6fdc3fed8050a4db2d61677433..089038dec49d0780ea4266d1a6f1034cb2779bda 100644 (file)
--- 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, <daniel@haxx.se>, 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 dfc28b1a5643b9a82a17922e897f748595dbff69..93941811c2d02aebdc866d2e5e9e1eb6b26e7dd0 100644 (file)
--- 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 <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 <num>",
    "Maximum concurrency for parallel transfers",
@@ -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",
@@ -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",
@@ -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",