1 files changed, 25 insertions, 20 deletions
diff --git a/scp.1 b/scp.1
index 76ce33361..8d251e34a 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.74 2017/05/03 21:49:18 naddy Exp $
+.\" $OpenBSD: scp.1,v 1.77 2018/02/23 07:38:09 jmc Exp $
 .\"
-.Dd $Mdocdate: May 3 2017 $
+.Dd $Mdocdate: February 23 2018 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -18,7 +18,6 @@
 .Nd secure copy (remote file copy program)
 .Sh SYNOPSIS
 .Nm scp
-.Bk -words
 .Op Fl 346BCpqrv
 .Op Fl c Ar cipher
 .Op Fl F Ar ssh_config
@@ -27,20 +26,7 @@
 .Op Fl o Ar ssh_option
 .Op Fl P Ar port
 .Op Fl S Ar program
-.Sm off
+.Ar source ... target
-.Oo
-.Op Ar user No @
-.Ar host1 :
-.Oc Ar file1
-.Sm on
-.Ar ...
-.Sm off
-.Oo
-.Op Ar user No @
-.Ar host2 :
-.Oc Ar file2
-.Sm on
-.Ek
 .Sh DESCRIPTION
 .Nm
 copies files between hosts on a network.
@@ -53,15 +39,33 @@ same security as
 will ask for passwords or passphrases if they are needed for
 authentication.
 .Pp
-File names may contain a user and host specification to indicate
+The
-that the file is to be copied to/from that host.
+.Ar source
+and
+.Ar target
+may be specified as a local pathname, a remote host with optional path
+in the form
+.Sm off
+.Oo user @ Oc host : Op path ,
+.Sm on
+or a URI in the form
+.Sm off
+.No scp:// Oo user @ Oc host Oo : port Oc Op / path .
+.Sm on
 Local file names can be made explicit using absolute or relative pathnames
 to avoid
 .Nm
 treating file names containing
 .Sq :\&
 as host specifiers.
-Copies between two remote hosts are also permitted.
+.Pp
+When copying between two remote hosts, if the URI format is used, a
+.Ar port
+may only be specified on the
+.Ar target
+if the
+.Fl 3
+option is used.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -120,6 +124,7 @@ For full details of the options listed below, and their possible values, see
 .It AddressFamily
 .It BatchMode
 .It BindAddress
+.It BindInterface
 .It CanonicalDomains
 .It CanonicalizeFallbackLocal
 .It CanonicalizeHostname

diff --git a/scp.1 b/scp.1 index 76ce33361..8d251e34a 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.74 2017/05/03 21:49:18 naddy Exp $	11	.\" $OpenBSD: scp.1,v 1.77 2018/02/23 07:38:09 jmc Exp $
12	.\"	12	.\"
13	.Dd $Mdocdate: May 3 2017 $	13	.Dd $Mdocdate: February 23 2018 $
14	.Dt SCP 1	14	.Dt SCP 1
15	.Os	15	.Os
16	.Sh NAME	16	.Sh NAME
@@ -18,7 +18,6 @@
18	.Nd secure copy (remote file copy program)	18	.Nd secure copy (remote file copy program)
19	.Sh SYNOPSIS	19	.Sh SYNOPSIS
20	.Nm scp	20	.Nm scp
21	.Bk -words
22	.Op Fl 346BCpqrv	21	.Op Fl 346BCpqrv
23	.Op Fl c Ar cipher	22	.Op Fl c Ar cipher
24	.Op Fl F Ar ssh_config	23	.Op Fl F Ar ssh_config
@@ -27,20 +26,7 @@
27	.Op Fl o Ar ssh_option	26	.Op Fl o Ar ssh_option
28	.Op Fl P Ar port	27	.Op Fl P Ar port
29	.Op Fl S Ar program	28	.Op Fl S Ar program
30	.Sm off	29	.Ar source ... target
31	.Oo
32	.Op Ar user No @
33	.Ar host1 :
34	.Oc Ar file1
35	.Sm on
36	.Ar ...
37	.Sm off
38	.Oo
39	.Op Ar user No @
40	.Ar host2 :
41	.Oc Ar file2
42	.Sm on
43	.Ek
44	.Sh DESCRIPTION	30	.Sh DESCRIPTION
45	.Nm	31	.Nm
46	copies files between hosts on a network.	32	copies files between hosts on a network.
@@ -53,15 +39,33 @@ same security as
53	will ask for passwords or passphrases if they are needed for	39	will ask for passwords or passphrases if they are needed for
54	authentication.	40	authentication.
55	.Pp	41	.Pp
56	File names may contain a user and host specification to indicate	42	The
57	that the file is to be copied to/from that host.	43	.Ar source
		44	and
		45	.Ar target
		46	may be specified as a local pathname, a remote host with optional path
		47	in the form
		48	.Sm off
		49	.Oo user @ Oc host : Op path ,
		50	.Sm on
		51	or a URI in the form
		52	.Sm off
		53	.No scp:// Oo user @ Oc host Oo : port Oc Op / path .
		54	.Sm on
58	Local file names can be made explicit using absolute or relative pathnames	55	Local file names can be made explicit using absolute or relative pathnames
59	to avoid	56	to avoid
60	.Nm	57	.Nm
61	treating file names containing	58	treating file names containing
62	.Sq :\&	59	.Sq :\&
63	as host specifiers.	60	as host specifiers.
64	Copies between two remote hosts are also permitted.	61	.Pp
		62	When copying between two remote hosts, if the URI format is used, a
		63	.Ar port
		64	may only be specified on the
		65	.Ar target
		66	if the
		67	.Fl 3
		68	option is used.
65	.Pp	69	.Pp
66	The options are as follows:	70	The options are as follows:
67	.Bl -tag -width Ds	71	.Bl -tag -width Ds
@@ -120,6 +124,7 @@ For full details of the options listed below, and their possible values, see
120	.It AddressFamily	124	.It AddressFamily
121	.It BatchMode	125	.It BatchMode
122	.It BindAddress	126	.It BindAddress
		127	.It BindInterface
123	.It CanonicalDomains	128	.It CanonicalDomains
124	.It CanonicalizeFallbackLocal	129	.It CanonicalizeFallbackLocal
125	.It CanonicalizeHostname	130	.It CanonicalizeHostname