help: add flags to output and ssh categories

- Add --output, --remove-on-error, --output-dir and --created-dirs to
  the output help category

- Add --hostpubmd5, --hostpubsha256, --insecure (-k), and --pubkey to
  the ssh help category

Closes #14076

diff --git a/docs/cmdline-opts/create-dirs.md b/docs/cmdline-opts/create-dirs.md
index fcbeb3343b6729eea402ed120526ce296f86610e..f1144946520ec6f29e4033201a34f1880ccf7372 100644 (file)
--- a/docs/cmdline-opts/create-dirs.md
+++ b/docs/cmdline-opts/create-dirs.md
@@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
 SPDX-License-Identifier: curl
 Long: create-dirs
 Help: Create necessary local directory hierarchy
-Category: curl
+Category: curl output
 Added: 7.10.3
 Multi: boolean
 See-also:

diff --git a/docs/cmdline-opts/hostpubmd5.md b/docs/cmdline-opts/hostpubmd5.md
index 7dc873254fc91a67278354059379c9c013ff2a4b..5d480a5bcd0421ee24ecceb0d714b22d6f9afb74 100644 (file)
--- a/docs/cmdline-opts/hostpubmd5.md
+++ b/docs/cmdline-opts/hostpubmd5.md
@@ -6,7 +6,7 @@ Arg: <md5>
 Help: Acceptable MD5 hash of host public key
 Protocols: SFTP SCP
 Added: 7.17.1
-Category: sftp scp
+Category: sftp scp ssh
 Multi: single
 See-also:
   - hostpubsha256

diff --git a/docs/cmdline-opts/hostpubsha256.md b/docs/cmdline-opts/hostpubsha256.md
index 8ec080551d89533940ddff0b9c691c25e3f10336..35aa8ff7da66bec957a47640df1c6d83b7d527c9 100644 (file)
--- a/docs/cmdline-opts/hostpubsha256.md
+++ b/docs/cmdline-opts/hostpubsha256.md
@@ -6,7 +6,7 @@ Arg: <sha256>
 Help: Acceptable SHA256 hash of host public key
 Protocols: SFTP SCP
 Added: 7.80.0
-Category: sftp scp
+Category: sftp scp ssh
 Multi: single
 See-also:
   - hostpubmd5

diff --git a/docs/cmdline-opts/insecure.md b/docs/cmdline-opts/insecure.md
index b1c056b448b9e5305fa0bac2415aba3bb67f5069..6b7009f251bb68a77e034244039844c3437617ec 100644 (file)
--- a/docs/cmdline-opts/insecure.md
+++ b/docs/cmdline-opts/insecure.md
@@ -5,7 +5,7 @@ Long: insecure
 Short: k
 Help: Allow insecure server connections
 Protocols: TLS SFTP SCP
-Category: tls sftp scp
+Category: tls sftp scp ssh
 Added: 7.10
 Multi: boolean
 See-also:

diff --git a/docs/cmdline-opts/output-dir.md b/docs/cmdline-opts/output-dir.md
index 04d780f29868a28dbb0bc66cadb9a4ec57284355..8d779df0c726a0c731a752196a94678e511b5d9b 100644 (file)
--- a/docs/cmdline-opts/output-dir.md
+++ b/docs/cmdline-opts/output-dir.md
@@ -5,7 +5,7 @@ Long: output-dir
 Arg: <dir>
 Help: Directory to save files in
 Added: 7.73.0
-Category: curl
+Category: curl output
 Multi: single
 See-also:
   - remote-name

diff --git a/docs/cmdline-opts/output.md b/docs/cmdline-opts/output.md
index 548e02f15c0b348a1002086e49304bc0e243c414..3ab7e7e5a8cba747cff0835f7eb10051c87f260c 100644 (file)
--- a/docs/cmdline-opts/output.md
+++ b/docs/cmdline-opts/output.md
@@ -5,7 +5,7 @@ Long: output
 Arg: <file>
 Short: o
 Help: Write to file instead of stdout
-Category: important curl
+Category: important curl output
 Added: 4.0
 Multi: per-URL
 See-also:

diff --git a/docs/cmdline-opts/pubkey.md b/docs/cmdline-opts/pubkey.md
index 94e50e4e94cf9ab90aac9052e0571026063d601c..373d113c3f645f2e7d6e47bc54d9a1713de9f48f 100644 (file)
--- a/docs/cmdline-opts/pubkey.md
+++ b/docs/cmdline-opts/pubkey.md
@@ -5,7 +5,7 @@ Long: pubkey
 Arg: <key>
 Protocols: SFTP SCP
 Help: SSH Public key filename
-Category: sftp scp auth
+Category: sftp scp ssh auth
 Added: 7.16.2
 Multi: single
 See-also:

diff --git a/docs/cmdline-opts/remove-on-error.md b/docs/cmdline-opts/remove-on-error.md
index b0064ae3187b78dafdb048497d0e14d3fa19f4af..54e8be874a5568e6ef5fa5bff255923085e442c7 100644 (file)
--- a/docs/cmdline-opts/remove-on-error.md
+++ b/docs/cmdline-opts/remove-on-error.md
@@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
 SPDX-License-Identifier: curl
 Long: remove-on-error
 Help: Remove output file on errors
-Category: curl
+Category: curl output
 Added: 7.83.0
 Multi: boolean
 See-also:

diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c
index 93941811c2d02aebdc866d2e5e9e1eb6b26e7dd0..fd25927a6263ac8e23e2012bedb297d111344729 100644 (file)
--- a/src/tool_listhelp.c
+++ b/src/tool_listhelp.c
@@ -98,7 +98,7 @@ const struct helptxt helptext[] = {
    CURLHELP_HTTP},
   {"    --create-dirs",
    "Create necessary local directory hierarchy",
-   CURLHELP_CURL},
+   CURLHELP_CURL | CURLHELP_OUTPUT},
   {"    --create-file-mode <mode>",
    "File mode for created files",
    CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_FILE | CURLHELP_UPLOAD},
@@ -266,10 +266,10 @@ const struct helptxt helptext[] = {
    CURLHELP_IMPORTANT | CURLHELP_CURL},
   {"    --hostpubmd5 <md5>",
    "Acceptable MD5 hash of host public key",
-   CURLHELP_SFTP | CURLHELP_SCP},
+   CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH},
   {"    --hostpubsha256 <sha256>",
    "Acceptable SHA256 hash of host public key",
-   CURLHELP_SFTP | CURLHELP_SCP},
+   CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH},
   {"    --hsts <filename>",
    "Enable HSTS with this cache file",
    CURLHELP_HTTP},
@@ -302,7 +302,7 @@ const struct helptxt helptext[] = {
    CURLHELP_IMPORTANT | CURLHELP_VERBOSE},
   {"-k, --insecure",
    "Allow insecure server connections",
-   CURLHELP_TLS | CURLHELP_SFTP | CURLHELP_SCP},
+   CURLHELP_TLS | CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH},
   {"    --interface <name>",
    "Use network interface",
    CURLHELP_CONNECTION},
@@ -440,10 +440,10 @@ const struct helptxt helptext[] = {
    CURLHELP_AUTH},
   {"-o, --output <file>",
    "Write to file instead of stdout",
-   CURLHELP_IMPORTANT | CURLHELP_CURL},
+   CURLHELP_IMPORTANT | CURLHELP_CURL | CURLHELP_OUTPUT},
   {"    --output-dir <dir>",
    "Directory to save files in",
-   CURLHELP_CURL},
+   CURLHELP_CURL | CURLHELP_OUTPUT},
   {"-Z, --parallel",
    "Perform transfers in parallel",
    CURLHELP_CONNECTION | CURLHELP_CURL},
@@ -581,7 +581,7 @@ const struct helptxt helptext[] = {
    CURLHELP_PROXY},
   {"    --pubkey <key>",
    "SSH Public key filename",
-   CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_AUTH},
+   CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH | CURLHELP_AUTH},
   {"-Q, --quote <command>",
    "Send command(s) to server before transfer",
    CURLHELP_FTP | CURLHELP_SFTP},
@@ -614,7 +614,7 @@ const struct helptxt helptext[] = {
    CURLHELP_OUTPUT},
   {"    --remove-on-error",
    "Remove output file on errors",
-   CURLHELP_CURL},
+   CURLHELP_CURL | CURLHELP_OUTPUT},
   {"-X, --request <method>",
    "Specify request method to use",
    CURLHELP_CONNECTION},