2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 347fd1803..b3d777ac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,9 @@
      [servconf.c sshd_config.5]
      support setting PermitEmptyPasswords in a Match block
      requested in PR3891; ok dtucker@
+   - jmc@cvs.openbsd.org 2008/10/09 06:54:22
+     [ssh.c]
+     add -y to usage();
 
 20080906
  - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4790,4 +4793,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.5111 2008/11/03 08:23:10 djm Exp $
+$Id: ChangeLog,v 1.5112 2008/11/03 08:23:28 djm Exp $
diff --git a/ssh.c b/ssh.c
index ff47a6c28..82d3ab26b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.320 2008/10/08 23:34:03 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.321 2008/10/09 06:54:22 jmc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -179,7 +179,7 @@ static void
 usage(void)
 {
         fprintf(stderr,
-"usage: ssh [-1246AaCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
 "           [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
 "           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
 "           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"