From 2abfc759b98852cd916ebfb6207d296762b1171a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 4 Jul 2024 13:38:18 +0200 Subject: [PATCH] cmdline-opts: category cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Option cleanups: --get is not upload --form* are post - added several options into ldap, smtp, imap and pop3 - shortened the category descriptions in the list category curl fixes: --create-dirs removed from 'curl' --ftp-create-dirs removed from 'curl' --netrc moved to 'auth' from 'curl' --netrc-file moved to 'auth' from 'curl' --netrc-optional moved to 'auth' from 'curl' --no-buffer moved to 'output' from 'curl' --no-clobber removed from 'curl' --output removed from 'curl' --output-dir removed from 'curl' --remove-on-error removed from 'curl' Add a "global" category: - Made all "global" options set this category Add a "deprecated" category: - Moved the deprecated options to it (maybe they should not be in any category long term) Add a 'timeout' category - Put a number of appropriate options in it Add an 'ldap' category - Put the LDAP related option in there Remove categories "ECH" and "ipfs" - They should not be categories. Had only one single option each. Remove category "misc" - It should not be a category as it is impossible to know when to browse it. --use-ascii moved to ftp and output --xattr moved to output --service-name moved to auth Managen fixes: - errors if an option is given a category name that is not already setup for in code - verifies that options set `scope: global` also is put in category `global´ Closes #14101 --- docs/cmdline-opts/Makefile.am | 2 +- docs/cmdline-opts/connect-timeout.md | 2 +- docs/cmdline-opts/connect-to.md | 4 +- docs/cmdline-opts/create-dirs.md | 2 +- docs/cmdline-opts/ech.md | 2 +- docs/cmdline-opts/egd-file.md | 2 +- docs/cmdline-opts/expect100-timeout.md | 2 +- docs/cmdline-opts/fail-early.md | 2 +- docs/cmdline-opts/form-escape.md | 4 +- docs/cmdline-opts/form-string.md | 2 +- docs/cmdline-opts/form.md | 2 +- docs/cmdline-opts/ftp-create-dirs.md | 2 +- docs/cmdline-opts/get.md | 2 +- .../cmdline-opts/happy-eyeballs-timeout-ms.md | 2 +- docs/cmdline-opts/ipfs-gateway.md | 2 +- docs/cmdline-opts/keepalive-time.md | 2 +- docs/cmdline-opts/libcurl.md | 2 +- docs/cmdline-opts/login-options.md | 2 +- docs/cmdline-opts/max-time.md | 2 +- docs/cmdline-opts/metalink.md | 2 +- docs/cmdline-opts/netrc-file.md | 2 +- docs/cmdline-opts/netrc-optional.md | 2 +- docs/cmdline-opts/netrc.md | 2 +- docs/cmdline-opts/no-buffer.md | 2 +- docs/cmdline-opts/no-clobber.md | 2 +- docs/cmdline-opts/ntlm-wb.md | 2 +- docs/cmdline-opts/oauth2-bearer.md | 2 +- docs/cmdline-opts/output-dir.md | 2 +- docs/cmdline-opts/output.md | 2 +- docs/cmdline-opts/parallel-immediate.md | 2 +- docs/cmdline-opts/parallel-max.md | 2 +- docs/cmdline-opts/parallel.md | 2 +- docs/cmdline-opts/progress-bar.md | 2 +- docs/cmdline-opts/random-file.md | 2 +- docs/cmdline-opts/rate.md | 2 +- docs/cmdline-opts/remove-on-error.md | 2 +- docs/cmdline-opts/request.md | 2 +- docs/cmdline-opts/retry-delay.md | 2 +- docs/cmdline-opts/retry-max-time.md | 2 +- docs/cmdline-opts/service-name.md | 2 +- docs/cmdline-opts/show-error.md | 2 +- docs/cmdline-opts/socks5.md | 2 +- docs/cmdline-opts/speed-time.md | 2 +- docs/cmdline-opts/ssl-reqd.md | 2 +- docs/cmdline-opts/ssl.md | 2 +- docs/cmdline-opts/stderr.md | 2 +- docs/cmdline-opts/styled-output.md | 2 +- docs/cmdline-opts/trace-ascii.md | 2 +- docs/cmdline-opts/trace-config.md | 2 +- docs/cmdline-opts/trace-ids.md | 2 +- docs/cmdline-opts/trace-time.md | 2 +- docs/cmdline-opts/trace.md | 2 +- docs/cmdline-opts/use-ascii.md | 2 +- docs/cmdline-opts/verbose.md | 2 +- docs/cmdline-opts/xattr.md | 2 +- scripts/managen | 36 +++++- src/tool_help.c | 64 +++++----- src/tool_help.h | 58 ++++----- src/tool_listhelp.c | 117 ++++++++++-------- tests/data/test1462 | 46 +++---- tests/data/test1463 | 2 +- tests/data/test1464 | 2 +- tests/data/test1705 | 2 +- tests/data/test1706 | 2 +- 64 files changed, 239 insertions(+), 204 deletions(-) diff --git a/docs/cmdline-opts/Makefile.am b/docs/cmdline-opts/Makefile.am index 7d62c4f456..0aa8a44fa2 100644 --- a/docs/cmdline-opts/Makefile.am +++ b/docs/cmdline-opts/Makefile.am @@ -54,7 +54,7 @@ $(ASCIIPAGE): $(DPAGES) $(SUPPORT) mainpage.idx Makefile.inc $(MANAGEN) $(GEN)(rm -f $(ASCIIPAGE) && @PERL@ $(MANAGEN) -d $(srcdir) -I $(INCDIR) ascii $(DPAGES) > asciipage.tmp.$$$$ && mv asciipage.tmp.$$$$ $(ASCIIPAGE)) listhelp: - $(MANAGEN) listhelp $(DPAGES) > $(top_builddir)/src/tool_listhelp.c + $(MANAGEN) -d $(srcdir) listhelp $(DPAGES) > $(top_builddir)/src/tool_listhelp.c listcats: @$(MANAGEN) listcats $(DPAGES) diff --git a/docs/cmdline-opts/connect-timeout.md b/docs/cmdline-opts/connect-timeout.md index e1400811e9..dc5f927040 100644 --- a/docs/cmdline-opts/connect-timeout.md +++ b/docs/cmdline-opts/connect-timeout.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: connect-timeout Arg: Help: Maximum time allowed to connect -Category: connection +Category: connection timeout Added: 7.7 Multi: single See-also: diff --git a/docs/cmdline-opts/connect-to.md b/docs/cmdline-opts/connect-to.md index 2a1ec56436..5782561656 100644 --- a/docs/cmdline-opts/connect-to.md +++ b/docs/cmdline-opts/connect-to.md @@ -3,9 +3,9 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: connect-to Arg: -Help: Connect to host +Help: Connect to host2 instead of host1 Added: 7.49.0 -Category: connection +Category: connection dns Multi: append See-also: - resolve diff --git a/docs/cmdline-opts/create-dirs.md b/docs/cmdline-opts/create-dirs.md index f114494652..c509efb0f8 100644 --- a/docs/cmdline-opts/create-dirs.md +++ b/docs/cmdline-opts/create-dirs.md @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: create-dirs Help: Create necessary local directory hierarchy -Category: curl output +Category: output Added: 7.10.3 Multi: boolean See-also: diff --git a/docs/cmdline-opts/ech.md b/docs/cmdline-opts/ech.md index e1f605da2e..6c2ba31cb6 100644 --- a/docs/cmdline-opts/ech.md +++ b/docs/cmdline-opts/ech.md @@ -5,7 +5,7 @@ Long: ech Arg: Help: Configure ECH Added: 8.8.0 -Category: tls ECH +Category: tls Protocols: HTTPS Multi: single See-also: diff --git a/docs/cmdline-opts/egd-file.md b/docs/cmdline-opts/egd-file.md index b68b7d4967..ef16b99648 100644 --- a/docs/cmdline-opts/egd-file.md +++ b/docs/cmdline-opts/egd-file.md @@ -5,7 +5,7 @@ Long: egd-file Arg: Help: EGD socket path for random data Protocols: TLS -Category: tls +Category: deprecated Added: 7.7 Multi: single See-also: diff --git a/docs/cmdline-opts/expect100-timeout.md b/docs/cmdline-opts/expect100-timeout.md index ce69227ad9..854761818a 100644 --- a/docs/cmdline-opts/expect100-timeout.md +++ b/docs/cmdline-opts/expect100-timeout.md @@ -6,7 +6,7 @@ Arg: Help: How long to wait for 100-continue Protocols: HTTP Added: 7.47.0 -Category: http +Category: http timeout Multi: single See-also: - connect-timeout diff --git a/docs/cmdline-opts/fail-early.md b/docs/cmdline-opts/fail-early.md index bb22e14707..67edbf919e 100644 --- a/docs/cmdline-opts/fail-early.md +++ b/docs/cmdline-opts/fail-early.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: fail-early Help: Fail on first transfer error Added: 7.52.0 -Category: curl +Category: curl global Multi: boolean Scope: global See-also: diff --git a/docs/cmdline-opts/form-escape.md b/docs/cmdline-opts/form-escape.md index 083c29e16b..0f93fde7eb 100644 --- a/docs/cmdline-opts/form-escape.md +++ b/docs/cmdline-opts/form-escape.md @@ -3,9 +3,9 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: form-escape Help: Escape form fields using backslash -Protocols: HTTP +Protocols: HTTP imap smtp Added: 7.81.0 -Category: http upload +Category: http upload post Multi: single See-also: - form diff --git a/docs/cmdline-opts/form-string.md b/docs/cmdline-opts/form-string.md index 3c1f7b5327..e58ad625d9 100644 --- a/docs/cmdline-opts/form-string.md +++ b/docs/cmdline-opts/form-string.md @@ -5,7 +5,7 @@ Long: form-string Help: Specify multipart MIME data Protocols: HTTP SMTP IMAP Arg: -Category: http upload +Category: http upload post smtp imap Added: 7.13.2 Multi: append See-also: diff --git a/docs/cmdline-opts/form.md b/docs/cmdline-opts/form.md index 8a4c91e5ae..5daa571e64 100644 --- a/docs/cmdline-opts/form.md +++ b/docs/cmdline-opts/form.md @@ -7,7 +7,7 @@ Arg: Help: Specify multipart MIME data Protocols: HTTP SMTP IMAP Mutexed: data head upload-file -Category: http upload +Category: http upload post imap smtp Added: 5.0 Multi: append See-also: diff --git a/docs/cmdline-opts/ftp-create-dirs.md b/docs/cmdline-opts/ftp-create-dirs.md index 5151e336c8..3e851ccae9 100644 --- a/docs/cmdline-opts/ftp-create-dirs.md +++ b/docs/cmdline-opts/ftp-create-dirs.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: ftp-create-dirs Protocols: FTP SFTP Help: Create the remote dirs if not present -Category: ftp sftp curl +Category: ftp sftp Added: 7.10.7 Multi: boolean See-also: diff --git a/docs/cmdline-opts/get.md b/docs/cmdline-opts/get.md index 395cb884fc..ac0560ab69 100644 --- a/docs/cmdline-opts/get.md +++ b/docs/cmdline-opts/get.md @@ -5,7 +5,7 @@ Long: get Short: G Help: Put the post data in the URL and use GET Protocols: HTTP -Category: http upload +Category: http Added: 7.8.1 Multi: boolean See-also: diff --git a/docs/cmdline-opts/happy-eyeballs-timeout-ms.md b/docs/cmdline-opts/happy-eyeballs-timeout-ms.md index 8370ee92bb..f4b492db0d 100644 --- a/docs/cmdline-opts/happy-eyeballs-timeout-ms.md +++ b/docs/cmdline-opts/happy-eyeballs-timeout-ms.md @@ -5,7 +5,7 @@ Long: happy-eyeballs-timeout-ms Arg: Help: Time for IPv6 before IPv4 Added: 7.59.0 -Category: connection +Category: connection timeout Multi: single See-also: - max-time diff --git a/docs/cmdline-opts/ipfs-gateway.md b/docs/cmdline-opts/ipfs-gateway.md index 63429d83d1..70ca717a76 100644 --- a/docs/cmdline-opts/ipfs-gateway.md +++ b/docs/cmdline-opts/ipfs-gateway.md @@ -6,7 +6,7 @@ Arg: Help: Gateway for IPFS Protocols: IPFS Added: 8.4.0 -Category: ipfs +Category: curl Multi: single See-also: - help diff --git a/docs/cmdline-opts/keepalive-time.md b/docs/cmdline-opts/keepalive-time.md index 5fd7ab4b8c..4b10ff6f45 100644 --- a/docs/cmdline-opts/keepalive-time.md +++ b/docs/cmdline-opts/keepalive-time.md @@ -5,7 +5,7 @@ Long: keepalive-time Arg: Help: Interval time for keepalive probes Added: 7.18.0 -Category: connection +Category: connection timeout Multi: single See-also: - no-keepalive diff --git a/docs/cmdline-opts/libcurl.md b/docs/cmdline-opts/libcurl.md index eeae596d0a..60af605406 100644 --- a/docs/cmdline-opts/libcurl.md +++ b/docs/cmdline-opts/libcurl.md @@ -5,7 +5,7 @@ Long: libcurl Arg: Help: Generate libcurl code for this command line Added: 7.16.1 -Category: curl +Category: curl global Multi: single Scope: global See-also: diff --git a/docs/cmdline-opts/login-options.md b/docs/cmdline-opts/login-options.md index fdeeda52a3..fc8292a2b9 100644 --- a/docs/cmdline-opts/login-options.md +++ b/docs/cmdline-opts/login-options.md @@ -6,7 +6,7 @@ Arg: Protocols: IMAP LDAP POP3 SMTP Help: Server login options Added: 7.34.0 -Category: imap pop3 smtp auth +Category: imap pop3 smtp auth ldap Multi: single See-also: - user diff --git a/docs/cmdline-opts/max-time.md b/docs/cmdline-opts/max-time.md index 9102442aa9..1d19e49729 100644 --- a/docs/cmdline-opts/max-time.md +++ b/docs/cmdline-opts/max-time.md @@ -5,7 +5,7 @@ Long: max-time Short: m Arg: Help: Maximum time allowed for transfer -Category: connection +Category: connection timeout Added: 4.0 Multi: single See-also: diff --git a/docs/cmdline-opts/metalink.md b/docs/cmdline-opts/metalink.md index 0c39b46eda..d3d3e25746 100644 --- a/docs/cmdline-opts/metalink.md +++ b/docs/cmdline-opts/metalink.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: metalink Help: Process given URLs as metalink XML file Added: 7.27.0 -Category: misc +Category: deprecated Multi: single See-also: - parallel diff --git a/docs/cmdline-opts/netrc-file.md b/docs/cmdline-opts/netrc-file.md index 841f23c48d..3df72ce145 100644 --- a/docs/cmdline-opts/netrc-file.md +++ b/docs/cmdline-opts/netrc-file.md @@ -6,7 +6,7 @@ Help: Specify FILE for netrc Arg: Added: 7.21.5 Mutexed: netrc -Category: curl +Category: auth Multi: single See-also: - netrc diff --git a/docs/cmdline-opts/netrc-optional.md b/docs/cmdline-opts/netrc-optional.md index 6aa76954ae..9b9c068c88 100644 --- a/docs/cmdline-opts/netrc-optional.md +++ b/docs/cmdline-opts/netrc-optional.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: netrc-optional Help: Use either .netrc or URL Mutexed: netrc -Category: curl +Category: auth Added: 7.9.8 Multi: boolean See-also: diff --git a/docs/cmdline-opts/netrc.md b/docs/cmdline-opts/netrc.md index 4c07f9b75e..26e1ccd21a 100644 --- a/docs/cmdline-opts/netrc.md +++ b/docs/cmdline-opts/netrc.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: netrc Short: n Help: Must read .netrc for username and password -Category: curl +Category: auth Added: 4.6 Mutexed: netrc-file netrc-optional Multi: boolean diff --git a/docs/cmdline-opts/no-buffer.md b/docs/cmdline-opts/no-buffer.md index 41328b165e..e0860155c8 100644 --- a/docs/cmdline-opts/no-buffer.md +++ b/docs/cmdline-opts/no-buffer.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: no-buffer Short: N Help: Disable buffering of the output stream -Category: curl +Category: output Added: 6.5 Multi: boolean See-also: diff --git a/docs/cmdline-opts/no-clobber.md b/docs/cmdline-opts/no-clobber.md index 58646224c9..6909005638 100644 --- a/docs/cmdline-opts/no-clobber.md +++ b/docs/cmdline-opts/no-clobber.md @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: no-clobber Help: Do not overwrite files that already exist -Category: curl output +Category: output Added: 7.83.0 Multi: boolean See-also: diff --git a/docs/cmdline-opts/ntlm-wb.md b/docs/cmdline-opts/ntlm-wb.md index 4cc52b65e9..3a1d35cb16 100644 --- a/docs/cmdline-opts/ntlm-wb.md +++ b/docs/cmdline-opts/ntlm-wb.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: ntlm-wb Help: HTTP NTLM authentication with winbind Protocols: HTTP -Category: auth http +Category: deprecated Added: 7.22.0 Multi: mutex See-also: diff --git a/docs/cmdline-opts/oauth2-bearer.md b/docs/cmdline-opts/oauth2-bearer.md index ee9ec5dccf..b66477fc70 100644 --- a/docs/cmdline-opts/oauth2-bearer.md +++ b/docs/cmdline-opts/oauth2-bearer.md @@ -5,7 +5,7 @@ Long: oauth2-bearer Help: OAuth 2 Bearer Token Arg: Protocols: IMAP LDAP POP3 SMTP HTTP -Category: auth +Category: auth imap pop3 smtp ldap Added: 7.33.0 Multi: single See-also: diff --git a/docs/cmdline-opts/output-dir.md b/docs/cmdline-opts/output-dir.md index 8d779df0c7..468ecc8a11 100644 --- a/docs/cmdline-opts/output-dir.md +++ b/docs/cmdline-opts/output-dir.md @@ -5,7 +5,7 @@ Long: output-dir Arg: Help: Directory to save files in Added: 7.73.0 -Category: curl output +Category: output Multi: single See-also: - remote-name diff --git a/docs/cmdline-opts/output.md b/docs/cmdline-opts/output.md index 3ab7e7e5a8..48360a4989 100644 --- a/docs/cmdline-opts/output.md +++ b/docs/cmdline-opts/output.md @@ -5,7 +5,7 @@ Long: output Arg: Short: o Help: Write to file instead of stdout -Category: important curl output +Category: important output Added: 4.0 Multi: per-URL See-also: diff --git a/docs/cmdline-opts/parallel-immediate.md b/docs/cmdline-opts/parallel-immediate.md index cf8e20928b..4d7a3ad516 100644 --- a/docs/cmdline-opts/parallel-immediate.md +++ b/docs/cmdline-opts/parallel-immediate.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: parallel-immediate Help: Do not wait for multiplexing Added: 7.68.0 -Category: connection curl +Category: connection curl global Multi: boolean Scope: global See-also: diff --git a/docs/cmdline-opts/parallel-max.md b/docs/cmdline-opts/parallel-max.md index aa5142930d..6b3684b8f2 100644 --- a/docs/cmdline-opts/parallel-max.md +++ b/docs/cmdline-opts/parallel-max.md @@ -5,7 +5,7 @@ Long: parallel-max Arg: Help: Maximum concurrency for parallel transfers Added: 7.66.0 -Category: connection curl +Category: connection curl global Multi: single Scope: global See-also: diff --git a/docs/cmdline-opts/parallel.md b/docs/cmdline-opts/parallel.md index 9d59a4890a..fb9221bc6f 100644 --- a/docs/cmdline-opts/parallel.md +++ b/docs/cmdline-opts/parallel.md @@ -5,7 +5,7 @@ Short: Z Long: parallel Help: Perform transfers in parallel Added: 7.66.0 -Category: connection curl +Category: connection curl global Multi: boolean Scope: global See-also: diff --git a/docs/cmdline-opts/progress-bar.md b/docs/cmdline-opts/progress-bar.md index 7b9c599b98..6f08d7f7c7 100644 --- a/docs/cmdline-opts/progress-bar.md +++ b/docs/cmdline-opts/progress-bar.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Short: # Long: progress-bar Help: Display transfer progress as a bar -Category: verbose +Category: verbose global Added: 5.10 Multi: boolean Scope: global diff --git a/docs/cmdline-opts/random-file.md b/docs/cmdline-opts/random-file.md index 0f564d9d7e..e2c8624abf 100644 --- a/docs/cmdline-opts/random-file.md +++ b/docs/cmdline-opts/random-file.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: random-file Arg: Help: File for reading random data from -Category: misc +Category: deprecated Added: 7.7 Multi: single See-also: diff --git a/docs/cmdline-opts/rate.md b/docs/cmdline-opts/rate.md index fb2901e7e5..49d0010b8f 100644 --- a/docs/cmdline-opts/rate.md +++ b/docs/cmdline-opts/rate.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: rate Arg: Help: Request rate for serial transfers -Category: connection +Category: connection global Added: 7.84.0 Multi: single Scope: global diff --git a/docs/cmdline-opts/remove-on-error.md b/docs/cmdline-opts/remove-on-error.md index 54e8be874a..4f9cf90de1 100644 --- 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, , et al. SPDX-License-Identifier: curl Long: remove-on-error Help: Remove output file on errors -Category: curl output +Category: output Added: 7.83.0 Multi: boolean See-also: diff --git a/docs/cmdline-opts/request.md b/docs/cmdline-opts/request.md index 73ef63b2bf..86cf10deaf 100644 --- a/docs/cmdline-opts/request.md +++ b/docs/cmdline-opts/request.md @@ -5,7 +5,7 @@ Long: request Short: X Arg: Help: Specify request method to use -Category: connection +Category: connection pop3 ftp imap smtp Added: 6.0 Multi: single See-also: diff --git a/docs/cmdline-opts/retry-delay.md b/docs/cmdline-opts/retry-delay.md index b2a405b63f..fcee1767a4 100644 --- a/docs/cmdline-opts/retry-delay.md +++ b/docs/cmdline-opts/retry-delay.md @@ -5,7 +5,7 @@ Long: retry-delay Arg: Help: Wait time between retries Added: 7.12.3 -Category: curl +Category: curl timeout Multi: single See-also: - retry diff --git a/docs/cmdline-opts/retry-max-time.md b/docs/cmdline-opts/retry-max-time.md index f7346475b9..e95a381a45 100644 --- a/docs/cmdline-opts/retry-max-time.md +++ b/docs/cmdline-opts/retry-max-time.md @@ -5,7 +5,7 @@ Long: retry-max-time Arg: Help: Retry only within this period Added: 7.12.3 -Category: curl +Category: curl timeout Multi: single See-also: - retry diff --git a/docs/cmdline-opts/service-name.md b/docs/cmdline-opts/service-name.md index b39bad4f18..f98409aa25 100644 --- a/docs/cmdline-opts/service-name.md +++ b/docs/cmdline-opts/service-name.md @@ -5,7 +5,7 @@ Long: service-name Help: SPNEGO service name Arg: Added: 7.43.0 -Category: misc +Category: auth Multi: single See-also: - negotiate diff --git a/docs/cmdline-opts/show-error.md b/docs/cmdline-opts/show-error.md index 0517c37bb4..aaf865bc0e 100644 --- a/docs/cmdline-opts/show-error.md +++ b/docs/cmdline-opts/show-error.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: show-error Short: S Help: Show error even when -s is used -Category: curl +Category: curl global Added: 5.9 Multi: boolean Scope: global diff --git a/docs/cmdline-opts/socks5.md b/docs/cmdline-opts/socks5.md index f17dfeb71f..192adef4a7 100644 --- a/docs/cmdline-opts/socks5.md +++ b/docs/cmdline-opts/socks5.md @@ -33,4 +33,4 @@ used with an HTTP/HTTPS proxy (added in 7.52.0). In such a case, curl first connects to the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. -This option (as well as --socks4) does not work with IPV6, FTPS or LDAP. +This option does not work with FTPS or LDAP. diff --git a/docs/cmdline-opts/speed-time.md b/docs/cmdline-opts/speed-time.md index ef8759ee54..f27702bec3 100644 --- a/docs/cmdline-opts/speed-time.md +++ b/docs/cmdline-opts/speed-time.md @@ -5,7 +5,7 @@ Long: speed-time Short: y Arg: Help: Trigger 'speed-limit' abort after this time -Category: connection +Category: connection timeout Added: 4.7 Multi: single See-also: diff --git a/docs/cmdline-opts/ssl-reqd.md b/docs/cmdline-opts/ssl-reqd.md index 63f77807aa..f21c145f59 100644 --- a/docs/cmdline-opts/ssl-reqd.md +++ b/docs/cmdline-opts/ssl-reqd.md @@ -5,7 +5,7 @@ Long: ssl-reqd Help: Require SSL/TLS Protocols: FTP IMAP POP3 SMTP LDAP Added: 7.20.0 -Category: tls +Category: tls imap pop3 smtp ldap Multi: boolean See-also: - ssl diff --git a/docs/cmdline-opts/ssl.md b/docs/cmdline-opts/ssl.md index c83332f22f..0c0f28172a 100644 --- a/docs/cmdline-opts/ssl.md +++ b/docs/cmdline-opts/ssl.md @@ -5,7 +5,7 @@ Long: ssl Help: Try enabling TLS Protocols: FTP IMAP POP3 SMTP LDAP Added: 7.20.0 -Category: tls +Category: tls imap pop3 smtp ldap Multi: boolean See-also: - ssl-reqd diff --git a/docs/cmdline-opts/stderr.md b/docs/cmdline-opts/stderr.md index bb42497de3..7030e557b0 100644 --- a/docs/cmdline-opts/stderr.md +++ b/docs/cmdline-opts/stderr.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: stderr Arg: Help: Where to redirect stderr -Category: verbose +Category: verbose global Added: 6.2 Multi: single Scope: global diff --git a/docs/cmdline-opts/styled-output.md b/docs/cmdline-opts/styled-output.md index bb324532bd..8193896c5d 100644 --- a/docs/cmdline-opts/styled-output.md +++ b/docs/cmdline-opts/styled-output.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: styled-output Help: Enable styled output for HTTP headers Added: 7.61.0 -Category: verbose +Category: verbose global Multi: boolean Scope: global See-also: diff --git a/docs/cmdline-opts/trace-ascii.md b/docs/cmdline-opts/trace-ascii.md index 9311a80f18..f46f0a6f35 100644 --- a/docs/cmdline-opts/trace-ascii.md +++ b/docs/cmdline-opts/trace-ascii.md @@ -5,7 +5,7 @@ Long: trace-ascii Arg: Help: Like --trace, but without hex output Mutexed: trace verbose -Category: verbose +Category: verbose global Added: 7.9.7 Multi: single Scope: global diff --git a/docs/cmdline-opts/trace-config.md b/docs/cmdline-opts/trace-config.md index d7c7e0daa4..2f095401d2 100644 --- a/docs/cmdline-opts/trace-config.md +++ b/docs/cmdline-opts/trace-config.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: trace-config Arg: Help: Details to log in trace/verbose output -Category: verbose +Category: verbose global Added: 8.3.0 Multi: append Scope: global diff --git a/docs/cmdline-opts/trace-ids.md b/docs/cmdline-opts/trace-ids.md index bf54ecb342..dc7d61e7f7 100644 --- a/docs/cmdline-opts/trace-ids.md +++ b/docs/cmdline-opts/trace-ids.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: trace-ids Help: Transfer + connection ids in verbose output Added: 8.2.0 -Category: verbose +Category: verbose global Multi: boolean Scope: global See-also: diff --git a/docs/cmdline-opts/trace-time.md b/docs/cmdline-opts/trace-time.md index 79206ba9e0..d3e0f47c19 100644 --- a/docs/cmdline-opts/trace-time.md +++ b/docs/cmdline-opts/trace-time.md @@ -4,7 +4,7 @@ SPDX-License-Identifier: curl Long: trace-time Help: Add time stamps to trace/verbose output Added: 7.14.0 -Category: verbose +Category: verbose global Multi: boolean Scope: global See-also: diff --git a/docs/cmdline-opts/trace.md b/docs/cmdline-opts/trace.md index 649990ea66..875e756fd1 100644 --- a/docs/cmdline-opts/trace.md +++ b/docs/cmdline-opts/trace.md @@ -5,7 +5,7 @@ Long: trace Arg: Help: Write a debug trace to FILE Mutexed: verbose trace-ascii -Category: verbose +Category: verbose global Added: 7.9.7 Multi: single Scope: global diff --git a/docs/cmdline-opts/use-ascii.md b/docs/cmdline-opts/use-ascii.md index 3586aa212a..c452ffbb1c 100644 --- a/docs/cmdline-opts/use-ascii.md +++ b/docs/cmdline-opts/use-ascii.md @@ -5,7 +5,7 @@ Short: B Long: use-ascii Help: Use ASCII/text transfer Protocols: FTP LDAP -Category: misc +Category: ftp output ldap Added: 5.0 Multi: boolean See-also: diff --git a/docs/cmdline-opts/verbose.md b/docs/cmdline-opts/verbose.md index 53096c5462..9c42981ad4 100644 --- a/docs/cmdline-opts/verbose.md +++ b/docs/cmdline-opts/verbose.md @@ -5,7 +5,7 @@ Short: v Long: verbose Mutexed: trace trace-ascii Help: Make the operation more talkative -Category: important verbose +Category: important verbose global Added: 4.0 Multi: boolean Scope: global diff --git a/docs/cmdline-opts/xattr.md b/docs/cmdline-opts/xattr.md index bfa74cf5aa..9dd7dc585f 100644 --- a/docs/cmdline-opts/xattr.md +++ b/docs/cmdline-opts/xattr.md @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, , et al. SPDX-License-Identifier: curl Long: xattr Help: Store metadata in extended file attributes -Category: misc +Category: output Added: 7.21.3 Multi: boolean See-also: diff --git a/scripts/managen b/scripts/managen index fc30c4f91f..e57053532f 100755 --- a/scripts/managen +++ b/scripts/managen @@ -667,6 +667,10 @@ sub single { my $pre = $manpage ? "\n": "[1]"; if($scope) { + if($category !~ /global/) { + print STDERR "$f:$line:1:ERROR: global scope option does not have global category\n"; + return 2; + } if($scope eq "global") { push @desc, "\n" if(!$manpage); push @desc, "${pre}This option is global and does not need to be specified for each use of --next.\n"; @@ -885,7 +889,25 @@ sub header { printdesc($manpage, 0, @d); } + +sub sourcecategories { + my ($dir) = @_; + my %cats; + open(H, "<$dir/../../src/tool_help.h") || + die "can't find the header file"; + while() { + if(/^\#define CURLHELP_([A-Z0-9]*)/) { + $cats{lc($1)}++; + } + } + close(H); + return %cats; +} + sub listhelp { + my ($dir) = @_; + my %cats = sourcecategories($dir); + print <", "Maximum time allowed to connect", - CURLHELP_CONNECTION}, + CURLHELP_CONNECTION | CURLHELP_TIMEOUT}, {" --connect-to ", - "Connect to host", - CURLHELP_CONNECTION}, + "Connect to host2 instead of host1", + CURLHELP_CONNECTION | CURLHELP_DNS}, {"-C, --continue-at ", "Resumed transfer offset", CURLHELP_CONNECTION}, @@ -98,7 +98,7 @@ const struct helptxt helptext[] = { CURLHELP_HTTP}, {" --create-dirs", "Create necessary local directory hierarchy", - CURLHELP_CURL | CURLHELP_OUTPUT}, + CURLHELP_OUTPUT}, {" --create-file-mode ", "File mode for created files", CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_FILE | CURLHELP_UPLOAD}, @@ -170,10 +170,10 @@ const struct helptxt helptext[] = { CURLHELP_HTTP | CURLHELP_FTP}, {" --ech ", "Configure ECH", - CURLHELP_TLS | CURLHELP_ECH}, + CURLHELP_TLS}, {" --egd-file ", "EGD socket path for random data", - CURLHELP_TLS}, + CURLHELP_DEPRECATED}, {" --engine ", "Crypto engine to use", CURLHELP_TLS}, @@ -185,13 +185,13 @@ const struct helptxt helptext[] = { CURLHELP_HTTP}, {" --expect100-timeout ", "How long to wait for 100-continue", - CURLHELP_HTTP}, + CURLHELP_HTTP | CURLHELP_TIMEOUT}, {"-f, --fail", "Fail fast with no output on HTTP errors", CURLHELP_IMPORTANT | CURLHELP_HTTP}, {" --fail-early", "Fail on first transfer error", - CURLHELP_CURL}, + CURLHELP_CURL | CURLHELP_GLOBAL}, {" --fail-with-body", "Fail on HTTP errors but save the body", CURLHELP_HTTP | CURLHELP_OUTPUT}, @@ -200,13 +200,15 @@ const struct helptxt helptext[] = { CURLHELP_TLS}, {"-F, --form ", "Specify multipart MIME data", - CURLHELP_HTTP | CURLHELP_UPLOAD}, + CURLHELP_HTTP | CURLHELP_UPLOAD | CURLHELP_POST | CURLHELP_IMAP | + CURLHELP_SMTP}, {" --form-escape", "Escape form fields using backslash", - CURLHELP_HTTP | CURLHELP_UPLOAD}, + CURLHELP_HTTP | CURLHELP_UPLOAD | CURLHELP_POST}, {" --form-string ", "Specify multipart MIME data", - CURLHELP_HTTP | CURLHELP_UPLOAD}, + CURLHELP_HTTP | CURLHELP_UPLOAD | CURLHELP_POST | CURLHELP_SMTP | + CURLHELP_IMAP}, {" --ftp-account ", "Account data string", CURLHELP_FTP | CURLHELP_AUTH}, @@ -215,7 +217,7 @@ const struct helptxt helptext[] = { CURLHELP_FTP}, {" --ftp-create-dirs", "Create the remote dirs if not present", - CURLHELP_FTP | CURLHELP_SFTP | CURLHELP_CURL}, + CURLHELP_FTP | CURLHELP_SFTP}, {" --ftp-method ", "Control CWD usage", CURLHELP_FTP}, @@ -242,13 +244,13 @@ const struct helptxt helptext[] = { CURLHELP_FTP | CURLHELP_TLS}, {"-G, --get", "Put the post data in the URL and use GET", - CURLHELP_HTTP | CURLHELP_UPLOAD}, + CURLHELP_HTTP}, {"-g, --globoff", "Disable URL globbing with {} and []", CURLHELP_CURL}, {" --happy-eyeballs-timeout-ms ", "Time for IPv6 before IPv4", - CURLHELP_CONNECTION}, + CURLHELP_CONNECTION | CURLHELP_TIMEOUT}, {" --haproxy-clientip ", "Set address in HAProxy PROXY", CURLHELP_HTTP | CURLHELP_PROXY}, @@ -311,7 +313,7 @@ const struct helptxt helptext[] = { CURLHELP_CONNECTION}, {" --ipfs-gateway ", "Gateway for IPFS", - CURLHELP_IPFS}, + CURLHELP_CURL}, {"-4, --ipv4", "Resolve names to IPv4 addresses", CURLHELP_CONNECTION | CURLHELP_DNS}, @@ -329,7 +331,7 @@ const struct helptxt helptext[] = { CURLHELP_CONNECTION}, {" --keepalive-time ", "Interval time for keepalive probes", - CURLHELP_CONNECTION}, + CURLHELP_CONNECTION | CURLHELP_TIMEOUT}, {" --key ", "Private key filename", CURLHELP_TLS | CURLHELP_SSH}, @@ -341,7 +343,7 @@ const struct helptxt helptext[] = { CURLHELP_FTP}, {" --libcurl ", "Generate libcurl code for this command line", - CURLHELP_CURL}, + CURLHELP_CURL | CURLHELP_GLOBAL}, {" --limit-rate ", "Limit transfer speed to RATE", CURLHELP_CONNECTION}, @@ -359,7 +361,8 @@ const struct helptxt helptext[] = { CURLHELP_HTTP | CURLHELP_AUTH}, {" --login-options ", "Server login options", - CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP | CURLHELP_AUTH}, + CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP | CURLHELP_AUTH | + CURLHELP_LDAP}, {" --mail-auth
", "Originator address of the original email", CURLHELP_SMTP}, @@ -383,10 +386,10 @@ const struct helptxt helptext[] = { CURLHELP_HTTP}, {"-m, --max-time ", "Maximum time allowed for transfer", - CURLHELP_CONNECTION}, + CURLHELP_CONNECTION | CURLHELP_TIMEOUT}, {" --metalink", "Process given URLs as metalink XML file", - CURLHELP_MISC}, + CURLHELP_DEPRECATED}, {" --mptcp", "Enable Multipath TCP", CURLHELP_CONNECTION}, @@ -395,13 +398,13 @@ const struct helptxt helptext[] = { CURLHELP_AUTH | CURLHELP_HTTP}, {"-n, --netrc", "Must read .netrc for username and password", - CURLHELP_CURL}, + CURLHELP_AUTH}, {" --netrc-file ", "Specify FILE for netrc", - CURLHELP_CURL}, + CURLHELP_AUTH}, {" --netrc-optional", "Use either .netrc or URL", - CURLHELP_CURL}, + CURLHELP_AUTH}, {"-:, --next", "Make next URL use separate options", CURLHELP_CURL}, @@ -410,10 +413,10 @@ const struct helptxt helptext[] = { CURLHELP_TLS | CURLHELP_HTTP}, {"-N, --no-buffer", "Disable buffering of the output stream", - CURLHELP_CURL}, + CURLHELP_OUTPUT}, {" --no-clobber", "Do not overwrite files that already exist", - CURLHELP_CURL | CURLHELP_OUTPUT}, + CURLHELP_OUTPUT}, {" --no-keepalive", "Disable TCP keepalive on the connection", CURLHELP_CONNECTION}, @@ -434,25 +437,26 @@ const struct helptxt helptext[] = { CURLHELP_AUTH | CURLHELP_HTTP}, {" --ntlm-wb", "HTTP NTLM authentication with winbind", - CURLHELP_AUTH | CURLHELP_HTTP}, + CURLHELP_DEPRECATED}, {" --oauth2-bearer ", "OAuth 2 Bearer Token", - CURLHELP_AUTH}, + CURLHELP_AUTH | CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP | + CURLHELP_LDAP}, {"-o, --output ", "Write to file instead of stdout", - CURLHELP_IMPORTANT | CURLHELP_CURL | CURLHELP_OUTPUT}, + CURLHELP_IMPORTANT | CURLHELP_OUTPUT}, {" --output-dir ", "Directory to save files in", - CURLHELP_CURL | CURLHELP_OUTPUT}, + CURLHELP_OUTPUT}, {"-Z, --parallel", "Perform transfers in parallel", - CURLHELP_CONNECTION | CURLHELP_CURL}, + CURLHELP_CONNECTION | CURLHELP_CURL | CURLHELP_GLOBAL}, {" --parallel-immediate", "Do not wait for multiplexing", - CURLHELP_CONNECTION | CURLHELP_CURL}, + CURLHELP_CONNECTION | CURLHELP_CURL | CURLHELP_GLOBAL}, {" --parallel-max ", "Maximum concurrency for parallel transfers", - CURLHELP_CONNECTION | CURLHELP_CURL}, + CURLHELP_CONNECTION | CURLHELP_CURL | CURLHELP_GLOBAL}, {" --pass ", "Passphrase for the private key", CURLHELP_SSH | CURLHELP_TLS | CURLHELP_AUTH}, @@ -476,7 +480,7 @@ const struct helptxt helptext[] = { CURLHELP_PROXY}, {"-#, --progress-bar", "Display transfer progress as a bar", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --proto ", "Enable/disable PROTOCOLS", CURLHELP_CONNECTION | CURLHELP_CURL}, @@ -587,13 +591,13 @@ const struct helptxt helptext[] = { CURLHELP_FTP | CURLHELP_SFTP}, {" --random-file ", "File for reading random data from", - CURLHELP_MISC}, + CURLHELP_DEPRECATED}, {"-r, --range ", "Retrieve only the bytes within RANGE", CURLHELP_HTTP | CURLHELP_FTP | CURLHELP_SFTP | CURLHELP_FILE}, {" --rate ", "Request rate for serial transfers", - CURLHELP_CONNECTION}, + CURLHELP_CONNECTION | CURLHELP_GLOBAL}, {" --raw", "Do HTTP raw; no transfer decoding", CURLHELP_HTTP}, @@ -614,10 +618,11 @@ const struct helptxt helptext[] = { CURLHELP_OUTPUT}, {" --remove-on-error", "Remove output file on errors", - CURLHELP_CURL | CURLHELP_OUTPUT}, + CURLHELP_OUTPUT}, {"-X, --request ", "Specify request method to use", - CURLHELP_CONNECTION}, + CURLHELP_CONNECTION | CURLHELP_POP3 | CURLHELP_FTP | CURLHELP_IMAP | + CURLHELP_SMTP}, {" --request-target ", "Specify the target for this request", CURLHELP_HTTP}, @@ -635,10 +640,10 @@ const struct helptxt helptext[] = { CURLHELP_CURL}, {" --retry-delay ", "Wait time between retries", - CURLHELP_CURL}, + CURLHELP_CURL | CURLHELP_TIMEOUT}, {" --retry-max-time ", "Retry only within this period", - CURLHELP_CURL}, + CURLHELP_CURL | CURLHELP_TIMEOUT}, {" --sasl-authzid ", "Identity for SASL PLAIN authentication", CURLHELP_AUTH}, @@ -647,10 +652,10 @@ const struct helptxt helptext[] = { CURLHELP_AUTH}, {" --service-name ", "SPNEGO service name", - CURLHELP_MISC}, + CURLHELP_AUTH}, {"-S, --show-error", "Show error even when -s is used", - CURLHELP_CURL}, + CURLHELP_CURL | CURLHELP_GLOBAL}, {"-s, --silent", "Silent mode", CURLHELP_IMPORTANT | CURLHELP_VERBOSE}, @@ -683,10 +688,11 @@ const struct helptxt helptext[] = { CURLHELP_CONNECTION}, {"-y, --speed-time ", "Trigger 'speed-limit' abort after this time", - CURLHELP_CONNECTION}, + CURLHELP_CONNECTION | CURLHELP_TIMEOUT}, {" --ssl", "Try enabling TLS", - CURLHELP_TLS}, + CURLHELP_TLS | CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP | + CURLHELP_LDAP}, {" --ssl-allow-beast", "Allow security flaw to improve interop", CURLHELP_TLS}, @@ -698,7 +704,8 @@ const struct helptxt helptext[] = { CURLHELP_TLS}, {" --ssl-reqd", "Require SSL/TLS", - CURLHELP_TLS}, + CURLHELP_TLS | CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP | + CURLHELP_LDAP}, {" --ssl-revoke-best-effort", "Ignore missing cert CRL dist points", CURLHELP_TLS}, @@ -710,10 +717,10 @@ const struct helptxt helptext[] = { CURLHELP_TLS}, {" --stderr ", "Where to redirect stderr", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --styled-output", "Enable styled output for HTTP headers", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --suppress-connect-headers", "Suppress proxy CONNECT response headers", CURLHELP_PROXY}, @@ -770,19 +777,19 @@ const struct helptxt helptext[] = { CURLHELP_HTTP}, {" --trace ", "Write a debug trace to FILE", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --trace-ascii ", "Like --trace, but without hex output", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --trace-config ", "Details to log in trace/verbose output", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --trace-ids", "Transfer + connection ids in verbose output", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --trace-time", "Add time stamps to trace/verbose output", - CURLHELP_VERBOSE}, + CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {" --unix-socket ", "Connect through this Unix domain socket", CURLHELP_CONNECTION}, @@ -797,7 +804,7 @@ const struct helptxt helptext[] = { CURLHELP_HTTP | CURLHELP_POST | CURLHELP_UPLOAD}, {"-B, --use-ascii", "Use ASCII/text transfer", - CURLHELP_MISC}, + CURLHELP_FTP | CURLHELP_OUTPUT | CURLHELP_LDAP}, {"-u, --user ", "Server user and password", CURLHELP_IMPORTANT | CURLHELP_AUTH}, @@ -809,7 +816,7 @@ const struct helptxt helptext[] = { CURLHELP_CURL}, {"-v, --verbose", "Make the operation more talkative", - CURLHELP_IMPORTANT | CURLHELP_VERBOSE}, + CURLHELP_IMPORTANT | CURLHELP_VERBOSE | CURLHELP_GLOBAL}, {"-V, --version", "Show version number and quit", CURLHELP_IMPORTANT | CURLHELP_CURL}, @@ -821,6 +828,6 @@ const struct helptxt helptext[] = { CURLHELP_VERBOSE}, {" --xattr", "Store metadata in extended file attributes", - CURLHELP_MISC}, - { NULL, NULL, CURLHELP_HIDDEN } + CURLHELP_OUTPUT}, + { NULL, NULL, 0 } }; diff --git a/tests/data/test1462 b/tests/data/test1462 index 32b63c0615..572b1dd4b8 100644 --- a/tests/data/test1462 +++ b/tests/data/test1462 @@ -32,31 +32,33 @@ curl invalid category --help Usage: curl [options...] -Invalid category provided, here is a list of all categories: +Unknown category provided, here is a list of all categories: - auth Different types of authentication methods - connection Low level networking operations + auth Authentication methods + connection Manage connections curl The command line tool itself - dns General DNS options - file FILE protocol options - ftp FTP protocol options - http HTTP and HTTPS protocol options - imap IMAP protocol options - misc Options that do not fit into any other category + deprecated Legacy + dns Names and resolving + file FILE protocol + ftp FTP protocol + global Global options + http HTTP and HTTPS protocol + imap IMAP protocol + ldap LDAP protocol output Filesystem output - pop3 POP3 protocol options - post HTTP Post specific options - proxy All options related to proxies - scp SCP protocol options - sftp SFTP protocol options - smtp SMTP protocol options - ssh SSH protocol options - telnet TELNET protocol options - tftp TFTP protocol options - tls All TLS/SSL related options - ech All Encrypted Client Hello (ECH) options - upload All options for uploads - verbose Options related to any kind of command line output of curl + pop3 POP3 protocol + post HTTP POST specific + proxy Options for proxies + scp SCP protocol + sftp SFTP protocol + smtp SMTP protocol + ssh SSH protocol + telnet TELNET protocol + tftp TFTP protocol + timeout Timeouts and delays + tls TLS/SSL related + upload Upload, sending data + verbose Tracing, logging etc diff --git a/tests/data/test1463 b/tests/data/test1463 index 68b3e4fb0d..a916cb4dfa 100644 --- a/tests/data/test1463 +++ b/tests/data/test1463 @@ -36,7 +36,7 @@ curl file category --help Usage: curl [options...] -file: FILE protocol options +file: FILE protocol --create-file-mode File mode for created files -I, --head Show document info only -l, --list-only List only mode diff --git a/tests/data/test1464 b/tests/data/test1464 index 186c6ee024..ccdb56d1a3 100644 --- a/tests/data/test1464 +++ b/tests/data/test1464 @@ -36,7 +36,7 @@ curl file category --help with lower/upper mix Usage: curl [options...] -file: FILE protocol options +file: FILE protocol --create-file-mode File mode for created files -I, --head Show document info only -l, --list-only List only mode diff --git a/tests/data/test1705 b/tests/data/test1705 index 2e73627a22..df2b23d86f 100644 --- a/tests/data/test1705 +++ b/tests/data/test1705 @@ -45,7 +45,7 @@ Short: v Long: fakeitreal Mutexed: trace trace-ascii Help: Make the operation more talkative -Category: important verbose +Category: important verbose global Added: 4.0 Multi: boolean Scope: global diff --git a/tests/data/test1706 b/tests/data/test1706 index f673832e62..7752ecf313 100644 --- a/tests/data/test1706 +++ b/tests/data/test1706 @@ -45,7 +45,7 @@ Short: v Long: fakeitreal Mutexed: trace trace-ascii Help: Make the operation more talkative -Category: important verbose +Category: important verbose global Added: 4.0 Multi: boolean Scope: global -- 2.47.3