Import openssh_7.7p1.orig.tar.gz

1 files changed, 11 insertions, 8 deletions

diff --git a/scp.0 b/scp.0
index 0cb7726c7..0089ed80f 100644
--- a/scp.0
+++ b/scp.0
@@ -5,8 +5,7 @@ NAME
 
 SYNOPSIS
      scp [-346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]
-         [-l limit] [-o ssh_option] [-P port] [-S program]
-         [[user@]host1:]file1 ... [[user@]host2:]file2
+         [-l limit] [-o ssh_option] [-P port] [-S program] source ... target
 
 DESCRIPTION
      scp copies files between hosts on a network.  It uses ssh(1) for data
@@ -14,11 +13,14 @@ DESCRIPTION
      as ssh(1).  scp will ask for passwords or passphrases if they are needed
      for authentication.
 
-     File names may contain a user and host specification to indicate that the
-     file is to be copied to/from that host.  Local file names can be made
-     explicit using absolute or relative pathnames to avoid scp treating file
-     names containing M-bM-^@M-^X:M-bM-^@M-^Y as host specifiers.  Copies between two remote hosts
-     are also permitted.
+     The source and target may be specified as a local pathname, a remote host
+     with optional path in the form [user@]host:[path], or a URI in the form
+     scp://[user@]host[:port][/path].  Local file names can be made explicit
+     using absolute or relative pathnames to avoid scp treating file names
+     containing M-bM-^@M-^X:M-bM-^@M-^Y as host specifiers.
+
+     When copying between two remote hosts, if the URI format is used, a port
+     may only be specified on the target if the -3 option is used.
 
      The options are as follows:
 
@@ -63,6 +65,7 @@ DESCRIPTION
                    AddressFamily
                    BatchMode
                    BindAddress
+                   BindInterface
                    CanonicalDomains
                    CanonicalizeFallbackLocal
                    CanonicalizeHostname
@@ -156,4 +159,4 @@ AUTHORS
      Timo Rinne <tri@iki.fi>
      Tatu Ylonen <ylo@cs.hut.fi>
 
-OpenBSD 6.2                       May 3, 2017                      OpenBSD 6.2
+OpenBSD 6.2                    February 23, 2018                   OpenBSD 6.2