From d852603214defd93e054de2877b20cc79c19d0c6 Mon Sep 17 00:00:00 2001
From: "jmc@openbsd.org" <jmc@openbsd.org>
Date: Tue, 2 May 2017 13:44:51 +0000
Subject: upstream commit

remove now obsolete protocol1 options from the -o
lists;

Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
---
 ssh.1 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ssh.1')

diff --git a/ssh.1 b/ssh.1
index 325742f98..7ef599028 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
-- 
cgit v1.2.3