summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2021-09-09 06:17:39 +0000
committerDarren Tucker <dtucker@dtucker.net>2021-09-10 20:34:09 +1000
commit9136d6239ad7a4a293e0418a49b69e70c76d58b8 (patch)
tree0e2e844c3a08fefc9fa6020bddc33b1bc43f6df9
parent2d678c5e3bdc2f5c99f7af5122e9d054925d560d (diff)
upstream: - move CAVEATS to its correct order - use the term
"legacy" protocol rather than "original", as the latter made the text misleading - uppercase SCP ok djm OpenBSD-Commit-ID: 8479255746d5fa76a358ee59e7340fecf4245ff0
-rw-r--r--scp.120
1 files changed, 10 insertions, 10 deletions
diff --git a/scp.1 b/scp.1
index a96e95ad..90b1d1dc 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.101 2021/09/08 23:31:39 djm Exp $
+.\" $OpenBSD: scp.1,v 1.102 2021/09/09 06:17:39 jmc Exp $
.\"
-.Dd $Mdocdate: September 8 2021 $
+.Dd $Mdocdate: September 9 2021 $
.Dt SCP 1
.Os
.Sh NAME
@@ -289,14 +289,6 @@ debugging connection, authentication, and configuration problems.
.Xr ssh_config 5 ,
.Xr sftp-server 8 ,
.Xr sshd 8
-.Sh CAVEATS
-The original scp protocol (selected by the
-.Fl O
-flag) requires execution of the remote user's shell to perform
-.Xr glob 3
-pattern matching.
-This requires careful quoting of any characters that have special meaning to
-the remote shell, such as quote characters.
.Sh HISTORY
.Nm
is based on the rcp program in
@@ -309,3 +301,11 @@ has use the SFTP protocol for transfers by default.
.Sh AUTHORS
.An Timo Rinne Aq Mt tri@iki.fi
.An Tatu Ylonen Aq Mt ylo@cs.hut.fi
+.Sh CAVEATS
+The legacy SCP protocol (selected by the
+.Fl O
+flag) requires execution of the remote user's shell to perform
+.Xr glob 3
+pattern matching.
+This requires careful quoting of any characters that have special meaning to
+the remote shell, such as quote characters.