order options and usage(); from Igor Sobrado

2 files changed, 15 insertions, 13 deletions

diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index 129530682d3..dd404611474 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kgmon.8,v 1.7 2003/06/12 12:59:50 jmc Exp $
+.\" $OpenBSD: kgmon.8,v 1.8 2007/02/18 20:51:46 jmc Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)kgmon.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: kgmon.8,v 1.7 2003/06/12 12:59:50 jmc Exp $
+.\"	$Id: kgmon.8,v 1.8 2007/02/18 20:51:46 jmc Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
@@ -67,6 +67,16 @@ The options are as follows:
 Resume the collection of profile data.
 .It Fl h
 Stop the collection of profile data.
+.It Fl M Ar core
+Extract values associated with the name list from the specified
+.Ar core
+instead of the default
+.Pa /dev/kmem .
+.It Fl N Ar system
+Extract the name list from the specified
+.Ar system
+instead of the default
+.Pa /bsd .
 .It Fl p
 Dump the contents of the profile buffers into a
 .Pa gmon.out
@@ -78,14 +88,6 @@ If the
 flag is also specified, the
 .Pa gmon.out
 file is generated before the buffers are reset.
-.It Fl M
-Extract values associated with the name list from the specified core
-instead of the default
-.Pa /dev/kmem .
-.It Fl N
-Extract the name list from the specified system instead of the
-default
-.Pa /bsd .
 .El
 .Pp
 If neither
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 6e93cb96cd3..3e237758b45 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgmon.c,v 1.11 2004/08/01 18:32:19 deraadt Exp $	*/
+/*	$OpenBSD: kgmon.c,v 1.12 2007/02/18 20:51:46 jmc Exp $	*/
 
 /*
  * Copyright (c) 1983, 1992, 1993
@@ -37,7 +37,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)kgmon.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: kgmon.c,v 1.11 2004/08/01 18:32:19 deraadt Exp $";
+static char *rcsid = "$OpenBSD: kgmon.c,v 1.12 2007/02/18 20:51:46 jmc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -122,7 +122,7 @@ main(int argc, char **argv)
 
 		default:
 			fprintf(stderr,
-			    "usage: %s [-bhrp] [-M core] [-N system]\n",
+			    "usage: %s [-bhpr] [-M core] [-N system]\n",
 			    __progname);
 			exit(1);
 		}