curl: move more options to deprecated category

--no-npn, --sslv2, --sslv3

Closes #14109

diff --git a/docs/cmdline-opts/no-npn.md b/docs/cmdline-opts/no-npn.md
index d8ad6a251f7bd1d510601b1b1c050fd67875ebfc..dbb69e91bb504c89692364d18899dee5dd5fc917 100644 (file)
--- a/docs/cmdline-opts/no-npn.md
+++ b/docs/cmdline-opts/no-npn.md
@@ -8,7 +8,7 @@ Added: 7.36.0
 Mutexed:
 Requires: TLS
 Help: Disable the NPN TLS extension
-Category: tls http
+Category: deprecated
 Multi: boolean
 See-also:
   - no-alpn

diff --git a/docs/cmdline-opts/sslv2.md b/docs/cmdline-opts/sslv2.md
index 3bd36f02cd455668c74cb1cc1d6e4ae546454121..ea92a2cb461d18debf534815479835627b9543d9 100644 (file)
--- a/docs/cmdline-opts/sslv2.md
+++ b/docs/cmdline-opts/sslv2.md
@@ -9,7 +9,7 @@ Added: 5.9
 Mutexed: sslv3 tlsv1 tlsv1.1 tlsv1.2
 Requires: TLS
 Help: SSLv2
-Category: tls
+Category: deprecated
 Multi: mutex
 See-also:
   - http1.1

diff --git a/docs/cmdline-opts/sslv3.md b/docs/cmdline-opts/sslv3.md
index 32d4c1206690ca83ec73713747fd64d1f1eaa474..f022124e10b78fbd765dc376a01470ad9bad8f92 100644 (file)
--- a/docs/cmdline-opts/sslv3.md
+++ b/docs/cmdline-opts/sslv3.md
@@ -9,7 +9,7 @@ Added: 5.9
 Mutexed: sslv2 tlsv1 tlsv1.1 tlsv1.2
 Requires: TLS
 Help: SSLv3
-Category: tls
+Category: deprecated
 Multi: mutex
 See-also:
   - http1.1

diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c
index 46bbfd19698fdb3d5af30491d7257ec867e690d3..a825a03154d5a3a06cf4f3e5debe1739ae692cdf 100644 (file)
--- a/src/tool_listhelp.c
+++ b/src/tool_listhelp.c
@@ -422,7 +422,7 @@ const struct helptxt helptext[] = {
    CURLHELP_CONNECTION},
   {"    --no-npn",
    "Disable the NPN TLS extension",
-   CURLHELP_TLS | CURLHELP_HTTP},
+   CURLHELP_DEPRECATED},
   {"    --no-progress-meter",
    "Do not show the progress meter",
    CURLHELP_VERBOSE},
@@ -711,10 +711,10 @@ const struct helptxt helptext[] = {
    CURLHELP_TLS},
   {"-2, --sslv2",
    "SSLv2",
-   CURLHELP_TLS},
+   CURLHELP_DEPRECATED},
   {"-3, --sslv3",
    "SSLv3",
-   CURLHELP_TLS},
+   CURLHELP_DEPRECATED},
   {"    --stderr <file>",
    "Where to redirect stderr",
    CURLHELP_VERBOSE | CURLHELP_GLOBAL},