diff options
| author | naddy@openbsd.org <naddy@openbsd.org> | 2021-08-11 16:07:54 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-08-12 15:03:13 +0200 |
| commit | e1371e4f58404d6411d9f95eb774b444cea06a26 (patch) | |
| tree | 8378b34d5141b1036db6fdc5950a9f3fe73bdad0 /scp.1 | |
| parent | upstream: scp: do not spawn ssh with two -s flags for (diff) | |
| download | openssh-e1371e4f58404d6411d9f95eb774b444cea06a26.tar.xz openssh-e1371e4f58404d6411d9f95eb774b444cea06a26.zip | |
upstream: scp: tweak man page and error message for -3 by default
Now that the -3 option is enabled by default, flip the documentation
and error message logic from "requires -3" to "blocked by -R".
ok djm@
OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020
Diffstat (limited to 'scp.1')
| -rw-r--r-- | scp.1 | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -8,9 +8,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.99 2021/08/10 03:33:34 djm Exp $ +.\" $OpenBSD: scp.1,v 1.100 2021/08/11 14:07:54 naddy Exp $ .\" -.Dd $Mdocdate: August 10 2021 $ +.Dd $Mdocdate: August 11 2021 $ .Dt SCP 1 .Os .Sh NAME @@ -67,10 +67,10 @@ as host specifiers. .Pp When copying between two remote hosts, if the URI format is used, a .Ar port -may only be specified on the +cannot be specified on the .Ar target if the -.Fl 3 +.Fl R option is used. .Pp The options are as follows: @@ -260,7 +260,7 @@ The program must understand options. .It Fl s Use the SFTP protocol for file transfers instead of the legacy SCP protocol. -Using SFTP provides avoids invoking a shell on the remote side and provides +Using SFTP avoids invoking a shell on the remote side and provides more predictable filename handling, as the SCP protocol relied on the remote shell for expanding .Xr glob 3 |