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 /ssh.1 | |
parent | 8b60ce8d8111e604c711c4cdd9579ffe0edced74 (diff) |
upstream commit
remove now obsolete protocol1 options from the -o
lists;
Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh.1,v 1.377 2017/04/30 23:18:22 djm Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.378 2017/05/02 13:44:51 jmc Exp $ |
37 | .Dd $Mdocdate: April 30 2017 $ | 37 | .Dd $Mdocdate: May 2 2017 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -466,11 +466,9 @@ For full details of the options listed below, and their possible values, see | |||
466 | .It CertificateFile | 466 | .It CertificateFile |
467 | .It ChallengeResponseAuthentication | 467 | .It ChallengeResponseAuthentication |
468 | .It CheckHostIP | 468 | .It CheckHostIP |
469 | .It Cipher | ||
470 | .It Ciphers | 469 | .It Ciphers |
471 | .It ClearAllForwardings | 470 | .It ClearAllForwardings |
472 | .It Compression | 471 | .It Compression |
473 | .It ConnectionAttempts | ||
474 | .It ConnectTimeout | 472 | .It ConnectTimeout |
475 | .It ControlMaster | 473 | .It ControlMaster |
476 | .It ControlPath | 474 | .It ControlPath |