tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

remove now obsolete protocol1 options from the -o
lists;

Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
This commit is contained in:
jmc@openbsd.org 2017-05-02 13:44:51 +00:00 committed by Damien Miller
parent 8b60ce8d81
commit d852603214
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scp.1
View File

@ -8,9 +8,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" 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 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -128,11 +128,8 @@ For full details of the options listed below, and their possible values, see
.It CertificateFile .It CertificateFile
.It ChallengeResponseAuthentication .It ChallengeResponseAuthentication
.It CheckHostIP .It CheckHostIP
.It Cipher
.It Ciphers .It Ciphers
.It Compression .It Compression
.It CompressionLevel
.It ConnectionAttempts
.It ConnectTimeout .It ConnectTimeout
.It ControlMaster .It ControlMaster
.It ControlPath .It ControlPath
@ -162,14 +159,11 @@ For full details of the options listed below, and their possible values, see
.It PKCS11Provider .It PKCS11Provider
.It Port .It Port
.It PreferredAuthentications .It PreferredAuthentications
.It Protocol
.It ProxyCommand .It ProxyCommand
.It ProxyJump .It ProxyJump
.It PubkeyAcceptedKeyTypes .It PubkeyAcceptedKeyTypes
.It PubkeyAuthentication .It PubkeyAuthentication
.It RekeyLimit .It RekeyLimit
.It RhostsRSAAuthentication
.It RSAAuthentication
.It SendEnv .It SendEnv
.It ServerAliveInterval .It ServerAliveInterval
.It ServerAliveCountMax .It ServerAliveCountMax

8
sftp.1
View File

@ -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. .\" 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 CertificateFile
.It ChallengeResponseAuthentication .It ChallengeResponseAuthentication
.It CheckHostIP .It CheckHostIP
.It Cipher
.It Ciphers .It Ciphers
.It Compression .It Compression
.It CompressionLevel
.It ConnectionAttempts
.It ConnectTimeout .It ConnectTimeout
.It ControlMaster .It ControlMaster
.It ControlPath .It ControlPath
@ -231,13 +228,10 @@ For full details of the options listed below, and their possible values, see
.It PKCS11Provider .It PKCS11Provider
.It Port .It Port
.It PreferredAuthentications .It PreferredAuthentications
.It Protocol
.It ProxyCommand .It ProxyCommand
.It ProxyJump .It ProxyJump
.It PubkeyAuthentication .It PubkeyAuthentication
.It RekeyLimit .It RekeyLimit
.It RhostsRSAAuthentication
.It RSAAuthentication
.It SendEnv .It SendEnv
.It ServerAliveInterval .It ServerAliveInterval
.It ServerAliveCountMax .It ServerAliveCountMax

6
ssh.1
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh.1,v 1.378 2017/05/02 13:44:51 jmc Exp $
.Dd $Mdocdate: April 30 2017 $ .Dd $Mdocdate: May 2 2017 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -466,11 +466,9 @@ For full details of the options listed below, and their possible values, see
.It CertificateFile .It CertificateFile
.It ChallengeResponseAuthentication .It ChallengeResponseAuthentication
.It CheckHostIP .It CheckHostIP
.It Cipher
.It Ciphers .It Ciphers
.It ClearAllForwardings .It ClearAllForwardings
.It Compression .It Compression
.It ConnectionAttempts
.It ConnectTimeout .It ConnectTimeout
.It ControlMaster .It ControlMaster
.It ControlPath .It ControlPath