tidy up synopsis and usage(); from Igor Sobrado

2 files changed, 16 insertions, 20 deletions

diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index e7c940e1fb6..05f1fa227ec 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trpt.8,v 1.14 2003/06/12 12:59:53 jmc Exp $
+.\"	$OpenBSD: trpt.8,v 1.15 2007/02/18 23:22:33 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -37,14 +37,10 @@
 .Nd transliterate protocol trace
 .Sh SYNOPSIS
 .Nm trpt
-.Op Fl a
-.Op Fl f
-.Op Fl j
-.Op Fl p Ar hex-address
-.Op Fl s
-.Op Fl t
-.Op Fl N Ar system
+.Op Fl afjst
 .Op Fl M Ar core
+.Op Fl N Ar system
+.Op Fl p Ar hex-address
 .Sh DESCRIPTION
 .Nm
 interrogates the buffer of
@@ -76,7 +72,15 @@ each time the end of the log is reached.
 .It Fl j
 Just give a list of the protocol control block
 addresses for which there are trace records.
-.It Fl p
+.It Fl M Ar core
+Extract values associated with the name list from
+.Pa core
+instead of the running kernel.
+.It Fl N Ar system
+Extract the name list from
+.Pa system
+instead of the running kernel.
+.It Fl p Ar hex-address
 Show only trace records associated with the protocol
 control block at the given address
 .Ar hex-address .
@@ -88,14 +92,6 @@ sequencing information.
 In addition to the normal output,
 print the values for all timers at each
 point in the trace.
-.It Fl M Ar core
-Extract values associated with the name list from
-.Pa core
-instead of the running kernel.
-.It Fl N Ar system
-Extract the name list from
-.Pa system
-instead of the running kernel.
 .El
 .Pp
 The recommended use of
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index b8df03eded8..2dbdd748e31 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.22 2006/03/13 16:30:18 deraadt Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.23 2007/02/18 23:22:33 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -447,7 +447,7 @@ void
 usage(void)
 {
 
-	(void) fprintf(stderr, "usage: %s [-afjst] [-p hex-address]"
-	    " [-N system] [-M core]\n", __progname);
+	(void) fprintf(stderr, "usage: %s [-afjst] [-M core]"
+	    " [-N system] [-p hex-address]\n", __progname);
 	exit(1);
 }