summaryrefslogtreecommitdiff
path: root/scp.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-06-07 10:19:24 +0100
committerColin Watson <cjwatson@debian.org>2020-06-07 11:03:12 +0100
commit30337f8b66c66af6b368d1e3c789e75f1247176c (patch)
tree17e0b8652fea31c04faa19ffc4cd088552ee473a /scp.1
parentaef2be11c5ea90bc66e774923e6570213e54c195 (diff)
parent39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff)
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'scp.1')
-rw-r--r--scp.19
1 files changed, 6 insertions, 3 deletions
diff --git a/scp.1 b/scp.1
index 9c3a85366..d5f65af4e 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
8.\" 8.\"
9.\" Created: Sun May 7 00:14:37 1995 ylo 9.\" Created: Sun May 7 00:14:37 1995 ylo
10.\" 10.\"
11.\" $OpenBSD: scp.1,v 1.87 2019/11/30 07:07:59 jmc Exp $ 11.\" $OpenBSD: scp.1,v 1.89 2020/04/30 18:28:37 jmc Exp $
12.\" 12.\"
13.Dd $Mdocdate: November 30 2019 $ 13.Dd $Mdocdate: April 30 2020 $
14.Dt SCP 1 14.Dt SCP 1
15.Os 15.Os
16.Sh NAME 16.Sh NAME
@@ -74,7 +74,10 @@ The options are as follows:
74Copies between two remote hosts are transferred through the local host. 74Copies between two remote hosts are transferred through the local host.
75Without this option the data is copied directly between the two remote 75Without this option the data is copied directly between the two remote
76hosts. 76hosts.
77Note that this option disables the progress meter. 77Note that this option disables the progress meter and selects batch mode
78for the second host, since
79.Nm
80cannot ask for passwords or passphrases for both hosts.
78.It Fl 4 81.It Fl 4
79Forces 82Forces
80.Nm 83.Nm