summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-01-19 19:25:51 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-01-19 19:25:51 +0000
commit69328357820a9ff177de529ba3128ebe478544cd (patch)
tree6dd436f68f34a136ebff21c3a2844da560abae7a
parent324a2c65cfe31b87e97780c8beb0f5339a1c8c0d (diff)
scp -q implies ssh -q for the underlying connection, it doesn't just
hush the progress meter
-rw-r--r--usr.bin/ssh/scp.18
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 9b221762be0..46b72eda333 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -9,9 +9,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.42 2007/08/06 19:16:06 sobrado Exp $
+.\" $OpenBSD: scp.1,v 1.43 2008/01/19 19:25:50 djm Exp $
.\"
-.Dd $Mdocdate: August 6 2007 $
+.Dd $Mdocdate: January 19 2008 $
.Dt SCP 1
.Os
.Sh NAME
@@ -178,7 +178,9 @@ is already reserved for preserving the times and modes of the file in
Preserves modification times, access times, and modes from the
original file.
.It Fl q
-Disables the progress meter.
+Quiet mode: disables the progress meter as well as warning and diagnostic
+messages from
+.Xr ssh 1 .
.It Fl r
Recursively copy entire directories.
.It Fl S Ar program