Import openssh_7.6p1.orig.tar.gz

1 files changed, 2 insertions, 11 deletions

diff --git a/scp.0 b/scp.0
index 46a084698..0cb7726c7 100644
--- a/scp.0
+++ b/scp.0
@@ -4,7 +4,7 @@ NAME
      scp M-bM-^@M-^S secure copy (remote file copy program)
 
 SYNOPSIS
-     scp [-12346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]
+     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
 
@@ -22,10 +22,6 @@ DESCRIPTION
 
      The options are as follows:
 
-     -1      Forces scp to use protocol 1.
-
-     -2      Forces scp to use protocol 2.
-
      -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 this option disables the
@@ -75,10 +71,8 @@ DESCRIPTION
                    CertificateFile
                    ChallengeResponseAuthentication
                    CheckHostIP
-                   Cipher
                    Ciphers
                    Compression
-                   CompressionLevel
                    ConnectionAttempts
                    ConnectTimeout
                    ControlMaster
@@ -109,14 +103,11 @@ DESCRIPTION
                    PKCS11Provider
                    Port
                    PreferredAuthentications
-                   Protocol
                    ProxyCommand
                    ProxyJump
                    PubkeyAcceptedKeyTypes
                    PubkeyAuthentication
                    RekeyLimit
-                   RhostsRSAAuthentication
-                   RSAAuthentication
                    SendEnv
                    ServerAliveInterval
                    ServerAliveCountMax
@@ -165,4 +156,4 @@ AUTHORS
      Timo Rinne <tri@iki.fi>
      Tatu Ylonen <ylo@cs.hut.fi>
 
-OpenBSD 6.0                      July 16, 2016                     OpenBSD 6.0
+OpenBSD 6.2                       May 3, 2017                      OpenBSD 6.2