From: jmc@openbsd.org <jmc@openbsd.org>
Date: Mon, 14 Apr 2025 05:41:42 +0000 (+0000)
Subject: upstream: rework the text for -3 to make it clearer what default
X-Git-Tag: V_10_1_P1~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=609fe2cae2459d721ac11d23cd27b8a94397ef3c;p=thirdparty%2Fopenssh-portable.git

upstream: rework the text for -3 to make it clearer what default

behaviour is, and adjust the text for -R to make them more consistent;

issue raised by mikhail mp39590;
behaviour explained by naddy

ok djm

OpenBSD-Commit-ID: 15ff3bd1518d86c84fa8e91d7aa72cfdb41dccc8
---

diff --git a/scp.1 b/scp.1
index aa2e2d8b5..ff739e8b8 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.113 2024/12/06 15:12:56 djm Exp $
+.\" $OpenBSD: scp.1,v 1.114 2025/04/14 05:41:42 jmc Exp $
 .\"
-.Dd $Mdocdate: December 6 2024 $
+.Dd $Mdocdate: April 14 2025 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -76,15 +76,16 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl 3
 Copies between two remote hosts are transferred through the local host.
-Without this option the data is copied directly between the two remote
-hosts.
-Note that, when using the legacy SCP protocol (via the
+This mode is the default,
+but see also the
+.Fl R
+option for copying data directly between two remote hosts.
+Note that when using the legacy SCP protocol (via the
 .Fl O
 flag), this option
 selects batch mode for the second host as
 .Nm
 cannot ask for passwords or passphrases for both hosts.
-This mode is the default.
 .It Fl 4
 Forces
 .Nm
@@ -278,7 +279,9 @@ Quiet mode: disables the progress meter as well as warning and diagnostic
 messages from
 .Xr ssh 1 .
 .It Fl R
-Copies between two remote hosts are performed by connecting to the origin
+Copies between two remote hosts are transferred through the local host
+by default.
+This option instead copies between two remote hosts by connecting to the origin
 host and executing
 .Nm
 there.