From b1ba15f3885947c245c2dbfaad0a04ba050abea0 Mon Sep 17 00:00:00 2001
From: "jmc@openbsd.org" <jmc@openbsd.org>
Date: Thu, 9 Oct 2014 06:21:31 +0000
Subject: [PATCH] upstream commit

tweak previous;
---
 ssh.1        | 6 +++---
 ssh.c        | 4 ++--
 ssh_config.5 | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ssh.1 b/ssh.1
index 34fe635e4..51201861b 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.350 2014/10/08 22:20:25 djm Exp $
-.Dd $Mdocdate: October 8 2014 $
+.\" $OpenBSD: ssh.1,v 1.351 2014/10/09 06:21:31 jmc Exp $
+.Dd $Mdocdate: October 9 2014 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Sh SYNOPSIS
 .Nm ssh
 .Bk -words
-.Op Fl 1246AaCfgGKkMNnqsTtVvXxYy
+.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy
 .Op Fl b Ar bind_address
 .Op Fl c Ar cipher_spec
 .Op Fl D Oo Ar bind_address : Oc Ns Ar port
diff --git a/ssh.c b/ssh.c
index 97f6e821d..fcda578f3 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.408 2014/10/08 22:20:25 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.409 2014/10/09 06:21:31 jmc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -199,7 +199,7 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
+"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
 "           [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
 "           [-F configfile] [-I pkcs11] [-i identity_file]\n"
 "           [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n"
diff --git a/ssh_config.5 b/ssh_config.5
index b702e323f..9677ef079 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.193 2014/10/08 22:20:25 djm Exp $
-.Dd $Mdocdate: October 8 2014 $
+.\" $OpenBSD: ssh_config.5,v 1.194 2014/10/09 06:21:31 jmc Exp $
+.Dd $Mdocdate: October 9 2014 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -154,7 +154,7 @@ and
 The
 .Cm all
 criteria must appear alone or immediately after
-.Cm canonical.
+.Cm canonical .
 Other criteria may be combined arbitrarily.
 All criteria but
 .Cm all