sort options in manual page; display a better usage.

diff --git a/usr.bin/pctr/pctr.1 b/usr.bin/pctr/pctr.1
index 05e5b8f..3c5dea0 100644 (file)
--- a/usr.bin/pctr/pctr.1
+++ b/usr.bin/pctr/pctr.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: pctr.1,v 1.12 2008/02/11 07:58:28 jmc Exp $
+.\"    $OpenBSD: pctr.1,v 1.13 2008/07/08 21:39:52 sobrado Exp $
 .\"
 .\" Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
 .\"
@@ -38,7 +38,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 11 2008 $
+.Dd $Mdocdate: July 8 2008 $
 .Dt PCTR 1
 .Os
 .Sh NAME
@@ -103,6 +103,9 @@ processors only).
 Specifies a Unit Mask value for a function, specified by the
 .Fl f
 option.
+.It Fl S
+Enables counting shared cache coherency state (supported on Intel
+processors only).
 .It Fl s Ar ctr
 Program counter number
 .Ar ctr
@@ -113,9 +116,6 @@ A list of all possible functions supported on the current processor
 can be obtained by the
 .Fl l
 option output.
-.It Fl S
-Enables counting shared cache coherency state (supported on Intel
-processors only).
 .It Fl t Ar thold
 Specifies an increment threshold.
 The counter

diff --git a/usr.bin/pctr/pctr.c b/usr.bin/pctr/pctr.c
index 108e769..017dc5d 100644 (file)
--- a/usr.bin/pctr/pctr.c
+++ b/usr.bin/pctr/pctr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pctr.c,v 1.19 2007/11/16 16:34:33 deraadt Exp $       */
+/*     $OpenBSD: pctr.c,v 1.20 2008/07/08 21:39:52 sobrado Exp $       */
 
 /*
  * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
@@ -527,6 +527,6 @@ usage(void)
                break;
        }
 
-       fprintf(stderr, "%s: %s\n", __progname, usg);
+       fprintf(stderr, "usage: %s %s\n", __progname, usg);
        exit(1);
 }