summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-01-07 20:21:57 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-01-07 20:22:20 +0100
commite8404adc85ddbb8bf0424fef3ad889905019050c (patch)
tree32d4d5161001a23574f575b0389e324de69cb1c1
parentba19feba945d6d4aec2688dd43895eb57625c635 (diff)
downloadcurl-e8404adc85ddbb8bf0424fef3ad889905019050c.tar.gz
docs/page-header: mention how to disable the progress meter
curl.1 is regenerated Fixes #1190
-rw-r--r--docs/cmdline-opts/page-header7
-rw-r--r--docs/curl.19
2 files changed, 9 insertions, 7 deletions
diff --git a/docs/cmdline-opts/page-header b/docs/cmdline-opts/page-header
index 770af8da8..ee5af1477 100644
--- a/docs/cmdline-opts/page-header
+++ b/docs/cmdline-opts/page-header
@@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____|
.\" *
-.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2017, 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
@@ -111,14 +111,15 @@ do an operation and it is about to write data to the terminal, it
mixing progress meter and response data.
If you want a progress meter for HTTP POST or PUT requests, you need to
-redirect the response output to a file, using shell redirect (>), -o [file] or
+redirect the response output to a file, using shell redirect (>), --output or
similar.
It is not the same case for FTP upload as that operation does not spit out
any response data to the terminal.
If you prefer a progress "bar" instead of the regular meter, --progress-bar is
-your friend.
+your friend. You can also disable the progress meter completely with the
+--silent option.
.SH OPTIONS
Options start with one or two dashes. Many of the options require an
additional value next to them.
diff --git a/docs/curl.1 b/docs/curl.1
index baed65f68..f3b05ffe5 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____|
.\" *
-.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2017, 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
@@ -111,14 +111,15 @@ do an operation and it is about to write data to the terminal, it
mixing progress meter and response data.
If you want a progress meter for HTTP POST or PUT requests, you need to
-redirect the response output to a file, using shell redirect (>), -o [file] or
+redirect the response output to a file, using shell redirect (>), \fI-o, --output\fP or
similar.
It is not the same case for FTP upload as that operation does not spit out
any response data to the terminal.
If you prefer a progress "bar" instead of the regular meter, \fI-#, --progress-bar\fP is
-your friend.
+your friend. You can also disable the progress meter completely with the
+\fI-s, --silent\fP option.
.SH OPTIONS
Options start with one or two dashes. Many of the options require an
additional value next to them.
@@ -2560,7 +2561,7 @@ HTTP post error. Internal post-request generation error.
.IP 35
SSL connect error. The SSL handshaking failed.
.IP 36
-FTP bad download resume. Couldn't continue an earlier aborted download.
+Bad download resume. Couldn't continue an earlier aborted download.
.IP 37
FILE couldn't read file. Failed to open the file. Permissions?
.IP 38