From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 3 Mar 2025 11:13:38 +0000 (+0100)
Subject: docs/cmdline-opts: unify HTTP version style in --help output
X-Git-Tag: curl-8_13_0~291
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa18891dda283cd4bbb2dc67017e676ebbc838a7;p=thirdparty%2Fcurl.git

docs/cmdline-opts: unify HTTP version style in --help output

$ curl -h all | grep -- --http

Now:

     --http0.9                      Allow HTTP/0.9 responses
 -0, --http1.0                      Use HTTP/1.0
     --http1.1                      Use HTTP/1.1
     --http2                        Use HTTP/2
     --http2-prior-knowledge        Use HTTP/2 without HTTP/1.1 Upgrade
     --http3                        Use HTTP/3
     --http3-only                   Use HTTP/3 only

Before:

     --http0.9                      Allow HTTP 0.9 responses
 -0, --http1.0                      Use HTTP 1.0
     --http1.1                      Use HTTP 1.1
     --http2                        Use HTTP/2
     --http2-prior-knowledge        Use HTTP 2 without HTTP/1.1 Upgrade
     --http3                        Use HTTP v3
     --http3-only                   Use HTTP v3 only

Closes #16542
---

diff --git a/docs/cmdline-opts/http0.9.md b/docs/cmdline-opts/http0.9.md
index 54ef323156..41b76ffd7c 100644
--- a/docs/cmdline-opts/http0.9.md
+++ b/docs/cmdline-opts/http0.9.md
@@ -4,7 +4,7 @@ SPDX-License-Identifier: curl
 Long: http0.9
 Tags: Versions
 Protocols: HTTP
-Help: Allow HTTP 0.9 responses
+Help: Allow HTTP/0.9 responses
 Category: http
 Added: 7.64.0
 Multi: boolean
diff --git a/docs/cmdline-opts/http1.0.md b/docs/cmdline-opts/http1.0.md
index b810ccf3b7..0252f05230 100644
--- a/docs/cmdline-opts/http1.0.md
+++ b/docs/cmdline-opts/http1.0.md
@@ -7,7 +7,7 @@ Tags: Versions
 Protocols: HTTP
 Added: 7.9.1
 Mutexed: http1.1 http2 http2-prior-knowledge http3
-Help: Use HTTP 1.0
+Help: Use HTTP/1.0
 Category: http
 Multi: mutex
 See-also:
diff --git a/docs/cmdline-opts/http1.1.md b/docs/cmdline-opts/http1.1.md
index a223da1f9d..14e5c74702 100644
--- a/docs/cmdline-opts/http1.1.md
+++ b/docs/cmdline-opts/http1.1.md
@@ -6,7 +6,7 @@ Tags: Versions
 Protocols: HTTP
 Added: 7.33.0
 Mutexed: http1.0 http2 http2-prior-knowledge http3
-Help: Use HTTP 1.1
+Help: Use HTTP/1.1
 Category: http
 Multi: mutex
 See-also:
diff --git a/docs/cmdline-opts/http2-prior-knowledge.md b/docs/cmdline-opts/http2-prior-knowledge.md
index 5dffe26a73..25a32db7a1 100644
--- a/docs/cmdline-opts/http2-prior-knowledge.md
+++ b/docs/cmdline-opts/http2-prior-knowledge.md
@@ -7,7 +7,7 @@ Protocols: HTTP
 Added: 7.49.0
 Mutexed: http1.1 http1.0 http2 http3
 Requires: HTTP/2
-Help: Use HTTP 2 without HTTP/1.1 Upgrade
+Help: Use HTTP/2 without HTTP/1.1 Upgrade
 Category: http
 Multi: boolean
 See-also:
diff --git a/docs/cmdline-opts/http3-only.md b/docs/cmdline-opts/http3-only.md
index c565f8b95d..0ee5f1887e 100644
--- a/docs/cmdline-opts/http3-only.md
+++ b/docs/cmdline-opts/http3-only.md
@@ -7,7 +7,7 @@ Protocols: HTTP
 Added: 7.88.0
 Mutexed: http1.1 http1.0 http2 http2-prior-knowledge http3
 Requires: HTTP/3
-Help: Use HTTP v3 only
+Help: Use HTTP/3 only
 Category: http
 Multi: mutex
 See-also:
diff --git a/docs/cmdline-opts/http3.md b/docs/cmdline-opts/http3.md
index b5272a60f5..a66d797829 100644
--- a/docs/cmdline-opts/http3.md
+++ b/docs/cmdline-opts/http3.md
@@ -7,7 +7,7 @@ Protocols: HTTP
 Added: 7.66.0
 Mutexed: http1.1 http1.0 http2 http2-prior-knowledge http3-only
 Requires: HTTP/3
-Help: Use HTTP v3
+Help: Use HTTP/3
 Category: http
 Multi: mutex
 See-also:
diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c
index c79859d2d2..4605bf9cf0 100644
--- a/src/tool_listhelp.c
+++ b/src/tool_listhelp.c
@@ -279,25 +279,25 @@ const struct helptxt helptext[] = {
    "Enable HSTS with this cache file",
    CURLHELP_HTTP},
   {"    --http0.9",
-   "Allow HTTP 0.9 responses",
+   "Allow HTTP/0.9 responses",
    CURLHELP_HTTP},
   {"-0, --http1.0",
-   "Use HTTP 1.0",
+   "Use HTTP/1.0",
    CURLHELP_HTTP},
   {"    --http1.1",
-   "Use HTTP 1.1",
+   "Use HTTP/1.1",
    CURLHELP_HTTP},
   {"    --http2",
    "Use HTTP/2",
    CURLHELP_HTTP},
   {"    --http2-prior-knowledge",
-   "Use HTTP 2 without HTTP/1.1 Upgrade",
+   "Use HTTP/2 without HTTP/1.1 Upgrade",
    CURLHELP_HTTP},
   {"    --http3",
-   "Use HTTP v3",
+   "Use HTTP/3",
    CURLHELP_HTTP},
   {"    --http3-only",
-   "Use HTTP v3 only",
+   "Use HTTP/3 only",
    CURLHELP_HTTP},
   {"    --ignore-content-length",
    "Ignore the size of the remote resource",