context switches and interrupts are traps, not faults. align cpu field a

little better.  some man page pretty from jmc@ and ok millert@

2 files changed, 14 insertions, 12 deletions

diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 8078911fcad..4d8ae8b98cf 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vmstat.8,v 1.27 2003/06/03 02:56:22 millert Exp $
+.\"	$OpenBSD: vmstat.8,v 1.28 2003/07/25 21:25:29 tedu Exp $
 .\"	$NetBSD: vmstat.8,v 1.12 1996/05/10 23:19:30 thorpej Exp $
 .\"
 .\" Copyright (c) 1986, 1993
@@ -132,7 +132,9 @@ size of the free list
 Information about page faults and paging activity.
 These are averaged each five seconds, and given in units per second.
 .Pp
-.Bl -inset -width xxxxxx -compact
+.Bl -tag -width flt -compact
+.It Ar flt
+page faults
 .It Ar re
 page reclaims (simulating reference bits)
 .It Ar at
@@ -142,9 +144,9 @@ pages paged in
 .It Ar po
 pages paged out
 .It Ar fr
-pages freed per second
+pages freed
 .It Ar sr
-pages scanned by clock algorithm, per-second
+pages scanned by clock algorithm
 .El
 .Pp
 .It Ar disks
@@ -159,16 +161,16 @@ To force
 .Nm
 to display specific drives, their names may be supplied on the command line.
 .Pp
-.It Ar faults
+.It Ar traps
 Trap/interrupt rate averages per second over last 5 seconds.
 .Pp
 .Bl -inset -width xxxxxx -compact
-.It Ar in
+.It Ar int
 device interrupts per interval (including clock interrupts)
-.It Ar sy
+.It Ar sys
 system calls per interval
 .It Ar cs
-CPU context switch rate (switches/interval)
+\ \&CPU context switch rate (switches/interval)
 .El
 .Pp
 .It Ar cpu
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 03ccd416bc2..69cd6933ae4 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
-/*	$OpenBSD: vmstat.c,v 1.78 2003/06/25 21:18:08 deraadt Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.79 2003/07/25 21:25:29 tedu Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1991, 1993
@@ -444,11 +444,11 @@ printhdr(void)
 
 	(void)printf(" procs   memory        page%*s", 20, "");
 	if (ndrives > 0)
-		(void)printf("%s %*sfaults     cpu\n",
+		(void)printf("%s %*straps         cpu\n",
 		   ((ndrives > 1) ? "disks" : "disk"),
 		   ((ndrives > 1) ? ndrives * 4 - 4 : 0), "");
 	else
-		(void)printf("%*s  faults     cpu\n",
+		(void)printf("%*s  traps          cpu\n",
 		   ndrives * 3, "");
 
 	(void)printf(" r b w    avm    fre   flt  re  pi  po  fr  sr ");
@@ -457,7 +457,7 @@ printhdr(void)
 			(void)printf("%c%c%c ", dr_name[i][0],
 			    dr_name[i][1],
 			    dr_name[i][strlen(dr_name[i]) - 1]);
-	(void)printf("  in    sy   cs us sy id\n");
+	(void)printf(" int   sys   cs us sy id\n");
 	hdrcnt = winlines - 2;
 }