From 8639920a9b2322b6f54c5511be74b1295591c4c5 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 30 Jun 2008 00:04:31 +1000
Subject: [PATCH]    - jmc@cvs.openbsd.org 2008/06/26 21:11:46      [ssh.1]    
  add VisualHostKey to the list of options listed in -o;

---
 ChangeLog | 5 ++++-
 ssh.1     | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5df3f91d6..bf381c84c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
      on every newly seen host even when the option was not enabled.
      prodded by deraadt@, discussions,
      help and ok markus@ djm@ dtucker@
+   - jmc@cvs.openbsd.org 2008/06/26 21:11:46
+     [ssh.1]
+     add VisualHostKey to the list of options listed in -o;
 
 20080628
  - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
@@ -4448,4 +4451,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5029 2008/06/29 14:04:03 djm Exp $
+$Id: ChangeLog,v 1.5030 2008/06/29 14:04:31 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 6165e2f73..a58f5a02a 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,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.275 2008/06/26 11:46:31 grunk Exp $
+.\" $OpenBSD: ssh.1,v 1.276 2008/06/26 21:11:46 jmc Exp $
 .Dd $Mdocdate: June 26 2008 $
 .Dt SSH 1
 .Os
@@ -498,6 +498,7 @@ For full details of the options listed below, and their possible values, see
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
+.It VisualHostKey
 .It XAuthLocation
 .El
 .It Fl p Ar port