docs: document it as --no-progress-meter instead of the reverse

Follow-up to 93373a960c3bb4

Reported-by: infinnovation-dev on github
Fixes #4474
Closes #4475

diff --git a/docs/cmdline-opts/no-progress-meter.d b/docs/cmdline-opts/no-progress-meter.d
new file mode 100644 (file)
index 0000000..aff0717
--- /dev/null
+++ b/docs/cmdline-opts/no-progress-meter.d
@@ -0,0 +1,10 @@
+Long: no-progress-meter
+Help: Do not show the progress meter
+See-also: verbose silent
+Added: 7.67.0
+---
+Option to switch off the progress meter output without muting or otherwise
+affecting warning and informational messages like --silent does.
+
+Note that this is the negated option name documented. You can thus use
+--progress-meter to enable the progress meter again.

diff --git a/docs/cmdline-opts/progress-meter.d b/docs/cmdline-opts/progress-meter.d
deleted file mode 100644 (file)
index 3befb0c..0000000
--- a/docs/cmdline-opts/progress-meter.d
+++ /dev/null
@@ -1,8 +0,0 @@
-Long: progress-meter
-Help: Show the progress meter
-See-also: verbose silent
-Added: 7.67.0
----
-Option to only switch the progress meter output on or off (with
---no-progress-meter) without muting or otherwise affecting warning and
-informational messages like --silent does.

diff --git a/src/tool_help.c b/src/tool_help.c
index cc7acb017303cb4f65b1d0d4ad039b3d2511901f..022956676ce5a44e7b75664b0d6016fb34ce9abb 100644 (file)
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -263,6 +263,8 @@ static const struct helptxt helptext[] = {
    "Disable TCP keepalive on the connection"},
   {"    --no-npn",
    "Disable the NPN TLS extension"},
+  {"    --no-progress-meter",
+   "Do not show the progress meter"},
   {"    --no-sessionid",
    "Disable SSL session-ID reusing"},
   {"    --noproxy <no-proxy-list>",
@@ -295,8 +297,6 @@ static const struct helptxt helptext[] = {
    "Use this proxy first"},
   {"-#, --progress-bar",
    "Display transfer progress as a bar"},
-  {"    --progress-meter",
-   "Show the progress meter"},
   {"    --proto <protocols>",
    "Enable/disable PROTOCOLS"},
   {"    --proto-default <protocol>",

diff --git a/tests/manpage-scan.pl b/tests/manpage-scan.pl
index b6864c8572188a3819ccf7dafdfce592f3a71d88..ba6577c18f8104417ba480612a76c65e09691eb2 100755 (executable)
--- a/tests/manpage-scan.pl
+++ b/tests/manpage-scan.pl
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2016, 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 2016 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -138,6 +138,7 @@ my %opts = (
     '-N, --no-buffer' => 1,
     '--no-sessionid' => 1,
     '--no-keepalive' => 1,
+    '--no-progress-meter' => 1,
 
     # pretend these options without -no exist in curl.1 and tool_help.c
     '--alpn' => 6,
@@ -147,6 +148,7 @@ my %opts = (
     '--keepalive' => 6,
     '-N, --buffer' => 6,
     '--sessionid' => 6,
+    '--progress-meter' => 6,
 
     # deprecated options do not need to be in tool_help.c nor curl.1
     '--krb4' => 6,