From: jmc@openbsd.org <jmc@openbsd.org>
Date: Tue, 16 Feb 2016 07:47:54 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_2_P1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb3f7337a651aa01d5dec019025e6cdc124ed081;p=thirdparty%2Fopenssh-portable.git

upstream commit

no need to state that protocol 2 is the default twice;

Upstream-ID: b1e4c36b0c2e12e338e5b66e2978f2ac953b95eb
---

diff --git a/ssh.1 b/ssh.1
index 42f71afaf..afc3537b0 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,7 +33,7 @@
 .\" (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.367 2016/02/16 05:11:04 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.368 2016/02/16 07:47:54 jmc Exp $
 .Dd $Mdocdate: February 16 2016 $
 .Dt SSH 1
 .Os
@@ -795,7 +795,6 @@ or the
 and
 .Fl 2
 options (see above).
-Protocol 2 is the default.
 Protocol 1 should not be used - it suffers from a number of cryptographic
 weaknesses and is only offered to support legacy devices.
 .Pp