diff --git a/ChangeLog b/ChangeLog index 7426258f6..7c723c9e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,9 @@ - markus@cvs.openbsd.org 2001/04/22 13:32:27 [sftp-server.8 sftp.1 ssh.1 sshd.8] xref draft-ietf-secsh-* + - markus@cvs.openbsd.org 2001/04/22 13:41:02 + [ssh-keygen.1 ssh-keygen.c] + style, noted by stevesk; sort flags in usage 20010421 - OpenBSD CVS Sync @@ -5222,4 +5225,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1158 2001/04/22 17:17:46 mouring Exp $ +$Id: ChangeLog,v 1.1159 2001/04/22 17:19:46 mouring Exp $ diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 55e31de9e..e2e4bc45b 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.37 2001/04/22 13:25:37 markus Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.38 2001/04/22 13:41:02 markus Exp $ .\" .\" -*- nroff -*- .\" @@ -157,7 +157,7 @@ This option will read an unencrypted private (or public) key file in SSH2-compatible format and print an OpenSSH compatible private (or public) key to stdout. .Nm -does also read the +also reads the .Sq SECSH Public Key File Format . This option allows importing keys from several commercial SSH implementations. diff --git a/ssh-keygen.c b/ssh-keygen.c index cb48b2f9d..5549376fd 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.57 2001/04/22 13:25:37 markus Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.58 2001/04/22 13:41:02 markus Exp $"); #include #include @@ -628,7 +628,7 @@ do_change_comment(struct passwd *pw) void usage(void) { - printf("Usage: %s [-lBpqxiec] [-t type] [-b bits] [-f file] [-C comment] " + printf("Usage: %s [-ceilpqyB] [-t type] [-b bits] [-f file] [-C comment] " "[-N new-pass] [-P pass]\n", __progname); exit(1); }