First pass at attempted debrucification:

- sort the -E switch into the right place.
- add previously missing -p pid in usage (from the last few commits).
- add -E to usage.
- consistently use trfile in the man page.

I knew I shouldn't have touched the man page.  If I commit to a man page,
it just makes people suspicious. :-)

usr.bin/kdump/kdump.1

@@ -40,8 +40,8 @@
 .Nd display kernel trace data
 .Sh SYNOPSIS
 .Nm
-.Op Fl dnlERT
-.Op Fl f Ar file
+.Op Fl dEnlRT
+.Op Fl f Ar trfile
 .Op Fl m Ar maxdata
 .Op Fl p Ar pid
 .Op Fl t Op cnisuw
@@ -59,7 +59,9 @@ The options are as follows:
 .Bl -tag -width Fl
 .It Fl d
 Display all numbers in decimal.
-.It Fl f Ar file
+.It Fl E
+Display elapsed timestamps (time since beginning of trace).
+.It Fl f Ar trfile
 Display the specified file instead of
 .Pa ktrace.out .
 .It Fl l
@@ -89,8 +91,6 @@ Display only trace events that correspond to the process
 .Ar pid .
 This may be useful when there are multiple processes recorded in the
 same trace file.
-.It Fl E
-Display elapsed timestamps (time since beginning of trace).
 .It Fl R
 Display relative timestamps (time since previous entry).
 .It Fl T

usr.bin/kdump/kdump.c

@@ -97,7 +97,7 @@ main(int argc, char *argv[])
 
 	(void) setlocale(LC_CTYPE, "");
 
-	while ((ch = getopt(argc,argv,"f:dlm:np:ERTt:")) != -1)
+	while ((ch = getopt(argc,argv,"f:dElm:np:RTt:")) != -1)
 		switch((char)ch) {
 		case 'f':
 			tracefile = optarg;
@@ -574,6 +574,6 @@ void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: kdump [-dnlRT] [-f trfile] [-m maxdata] [-t [cnisuw]]\n");
+    "usage: kdump [-dEnlRT] [-f trfile] [-m maxdata] [-p pid] [-t [cnisuw]]\n");
 	exit(1);
 }