diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2017-05-02 13:44:51 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:04 +1000 |
commit | d852603214defd93e054de2877b20cc79c19d0c6 (patch) | |
tree | 865fd1d9b2d7623a24b9c90c982038afa2e71e18 /scp.1 | |
parent | 8b60ce8d8111e604c711c4cdd9579ffe0edced74 (diff) |
upstream commit
remove now obsolete protocol1 options from the -o
lists;
Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
Diffstat (limited to 'scp.1')
-rw-r--r-- | scp.1 | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -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.72 2017/04/30 23:28:12 djm Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.73 2017/05/02 13:44:51 jmc Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: April 30 2017 $ | 13 | .Dd $Mdocdate: May 2 2017 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -128,11 +128,8 @@ For full details of the options listed below, and their possible values, see | |||
128 | .It CertificateFile | 128 | .It CertificateFile |
129 | .It ChallengeResponseAuthentication | 129 | .It ChallengeResponseAuthentication |
130 | .It CheckHostIP | 130 | .It CheckHostIP |
131 | .It Cipher | ||
132 | .It Ciphers | 131 | .It Ciphers |
133 | .It Compression | 132 | .It Compression |
134 | .It CompressionLevel | ||
135 | .It ConnectionAttempts | ||
136 | .It ConnectTimeout | 133 | .It ConnectTimeout |
137 | .It ControlMaster | 134 | .It ControlMaster |
138 | .It ControlPath | 135 | .It ControlPath |
@@ -162,14 +159,11 @@ For full details of the options listed below, and their possible values, see | |||
162 | .It PKCS11Provider | 159 | .It PKCS11Provider |
163 | .It Port | 160 | .It Port |
164 | .It PreferredAuthentications | 161 | .It PreferredAuthentications |
165 | .It Protocol | ||
166 | .It ProxyCommand | 162 | .It ProxyCommand |
167 | .It ProxyJump | 163 | .It ProxyJump |
168 | .It PubkeyAcceptedKeyTypes | 164 | .It PubkeyAcceptedKeyTypes |
169 | .It PubkeyAuthentication | 165 | .It PubkeyAuthentication |
170 | .It RekeyLimit | 166 | .It RekeyLimit |
171 | .It RhostsRSAAuthentication | ||
172 | .It RSAAuthentication | ||
173 | .It SendEnv | 167 | .It SendEnv |
174 | .It ServerAliveInterval | 168 | .It ServerAliveInterval |
175 | .It ServerAliveCountMax | 169 | .It ServerAliveCountMax |