[openssh-commits] [openssh] 05/19: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit d852603214defd93e054de2877b20cc79c19d0c6
Author: jmc at openbsd.org <jmc at openbsd.org>
Date:   Tue May 2 13:44:51 2017 +0000

    upstream commit
    
    remove now obsolete protocol1 options from the -o
    lists;
    
    Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
---
 scp.1  | 10 ++--------
 sftp.1 |  8 +-------
 ssh.1  |  6 ++----
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/scp.1 b/scp.1
index 0431c780..9b5229ab 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.72 2017/04/30 23:28:12 djm Exp $
+.\" $OpenBSD: scp.1,v 1.73 2017/05/02 13:44:51 jmc Exp $
 .\"
-.Dd $Mdocdate: April 30 2017 $
+.Dd $Mdocdate: May 2 2017 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -128,11 +128,8 @@ For full details of the options listed below, and their possible values, see
 .It CertificateFile
 .It ChallengeResponseAuthentication
 .It CheckHostIP
-.It Cipher
 .It Ciphers
 .It Compression
-.It CompressionLevel
-.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath
@@ -162,14 +159,11 @@ For full details of the options listed below, and their possible values, see
 .It PKCS11Provider
 .It Port
 .It PreferredAuthentications
-.It Protocol
 .It ProxyCommand
 .It ProxyJump
 .It PubkeyAcceptedKeyTypes
 .It PubkeyAuthentication
 .It RekeyLimit
-.It RhostsRSAAuthentication
-.It RSAAuthentication
 .It SendEnv
 .It ServerAliveInterval
 .It ServerAliveCountMax
diff --git a/sftp.1 b/sftp.1
index 05e008c5..ec9d6ff6 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.106 2017/05/02 08:54:19 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.107 2017/05/02 13:44:51 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -197,11 +197,8 @@ For full details of the options listed below, and their possible values, see
 .It CertificateFile
 .It ChallengeResponseAuthentication
 .It CheckHostIP
-.It Cipher
 .It Ciphers
 .It Compression
-.It CompressionLevel
-.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath
@@ -231,13 +228,10 @@ For full details of the options listed below, and their possible values, see
 .It PKCS11Provider
 .It Port
 .It PreferredAuthentications
-.It Protocol
 .It ProxyCommand
 .It ProxyJump
 .It PubkeyAuthentication
 .It RekeyLimit
-.It RhostsRSAAuthentication
-.It RSAAuthentication
 .It SendEnv
 .It ServerAliveInterval
 .It ServerAliveCountMax
diff --git a/ssh.1 b/ssh.1
index 325742f9..7ef59902 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.377 2017/04/30 23:18:22 djm Exp $
-.Dd $Mdocdate: April 30 2017 $
+.\" $OpenBSD: ssh.1,v 1.378 2017/05/02 13:44:51 jmc Exp $
+.Dd $Mdocdate: May 2 2017 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -466,11 +466,9 @@ For full details of the options listed below, and their possible values, see
 .It CertificateFile
 .It ChallengeResponseAuthentication
 .It CheckHostIP
-.It Cipher
 .It Ciphers
 .It ClearAllForwardings
 .It Compression
-.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.