Some section re-ordering.

20 files changed, 126 insertions, 123 deletions

diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 3dca8f690da..7a04e515612 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: last.1,v 1.11 1999/09/23 04:12:09 alex Exp $
+.\"	$OpenBSD: last.1,v 1.12 2000/03/06 03:17:38 aaron Exp $
 .\"	$NetBSD: last.1,v 1.3 1994/12/21 22:41:23 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -187,6 +187,7 @@ login data base
 .Xr utmp 5 ,
 .Xr ac 8
 .Sh HISTORY
+The
 .Nm last
-appeared in
+command appeared in
 .Bx 3.0 .
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 437e8fe01a2..7c81d5c2ab7 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: look.1,v 1.6 1999/10/17 20:24:34 aaron Exp $
+.\"	$OpenBSD: look.1,v 1.7 2000/03/06 03:17:39 aaron Exp $
 .\"	$NetBSD: look.1,v 1.3 1994/12/23 01:10:59 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -103,6 +103,7 @@ option was specified.
 This was incorrect and the current man page matches the historic
 implementation.
 .Sh HISTORY
+The
 .Nm
-appeared in
+command appeared in
 .At v7 .
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index aad1ced3383..b32a9d24e5b 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quota.1,v 1.8 1999/10/17 20:24:35 aaron Exp $
+.\"	$OpenBSD: quota.1,v 1.9 2000/03/06 03:17:39 aaron Exp $
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -124,11 +124,6 @@ located at the filesystem root with group quotas
 .It Pa /etc/fstab
 to find filesystem names and locations
 .El
-.Sh HISTORY
-The
-.Nm quota
-command appeared in
-.Bx 4.2 .
 .Sh SEE ALSO
 .Xr quotactl 2 ,
 .Xr fstab 5 ,
@@ -137,3 +132,8 @@ command appeared in
 .Xr quotaon 8 ,
 .Xr repquota 8 ,
 .Xr rpc.rquotad 8
+.Sh HISTORY
+The
+.Nm quota
+command appeared in
+.Bx 4.2 .
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 80e9f564f91..8de3a8c6dc2 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ruptime.1,v 1.6 1999/10/17 20:24:35 aaron Exp $
+.\"	$OpenBSD: ruptime.1,v 1.7 2000/03/06 03:17:39 aaron Exp $
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -79,6 +79,7 @@ data files
 .Xr uptime 1 ,
 .Xr rwhod 8
 .Sh HISTORY
+The
 .Nm ruptime
-appeared in
+command appeared in
 .Bx 4.2 .
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 815ca59aa50..8152ca5ea42 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.10 2000/03/05 00:28:55 aaron Exp $
+.\"	$OpenBSD: sed.1,v 1.11 2000/03/06 03:17:39 aaron Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -495,14 +495,14 @@ utility exits 0 on success or >0 if an error occurred.
 .Xr grep 1 ,
 .Xr regex 3 ,
 .Xr re_format 7
-.Sh HISTORY
-A
-.Nm
-command appeared in
-.At v7 .
 .Sh STANDARDS
 The
 .Nm
 function is expected to be a superset of the
 .St -p1003.2
 specification.
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v7 .
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 1aea8fff4dc..4595128e1f2 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shar.1,v 1.4 1999/06/05 01:21:40 aaron Exp $
+.\"	$OpenBSD: shar.1,v 1.5 2000/03/06 03:17:39 aaron Exp $
 .\"	$NetBSD: shar.1,v 1.4 1995/08/18 14:55:40 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -58,28 +58,6 @@ is normally used for distributing files by
 .Xr ftp  1
 or
 .Xr mail  1  .
-.Sh SEE ALSO
-.Xr compress 1 ,
-.Xr mail 1 ,
-.Xr tar 1 ,
-.Xr uuencode 1
-.Sh BUGS
-.Nm shar
-makes no provisions for special types of files or files containing
-magic characters.
-.Pp
-It is easy to insert trojan horses into
-.Nm shar
-files.
-It is strongly recommended that all shell archive files be examined
-before running them through
-.Xr sh  1  .
-Archives produced using this implementation of
-.Nm shar
-may be easily examined with the command:
-.Bd -literal -offset indent
-egrep -v '^[X#]' shar.file
-.Ed
 .Sh EXAMPLES
 To create a shell archive of the program
 .Xr ls  1
@@ -98,8 +76,30 @@ cd ls
 \&...
 sh archive
 .Ed
+.Sh SEE ALSO
+.Xr compress 1 ,
+.Xr mail 1 ,
+.Xr tar 1 ,
+.Xr uuencode 1
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.4 .
+.Sh BUGS
+.Nm shar
+makes no provisions for special types of files or files containing
+magic characters.
+.Pp
+It is easy to insert trojan horses into
+.Nm shar
+files.
+It is strongly recommended that all shell archive files be examined
+before running them through
+.Xr sh  1  .
+Archives produced using this implementation of
+.Nm shar
+may be easily examined with the command:
+.Bd -literal -offset indent
+egrep -v '^[X#]' shar.file
+.Ed
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 1137fc2bf28..3a42d73d60f 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: showmount.8,v 1.6 1999/05/23 14:11:30 aaron Exp $
+.\"	$OpenBSD: showmount.8,v 1.7 2000/03/06 03:17:39 aaron Exp $
 .\"	$NetBSD: showmount.8,v 1.5 1995/08/31 22:26:07 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -82,6 +82,11 @@ Use mount protocol Version 3, compatible with NFS Version 3.
 .Sh SEE ALSO
 .Xr mount 8 ,
 .Xr mountd 8
+.Sh HISTORY
+The
+.Nm showmount
+utility first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The mount daemon running on the server only has an idea of the actual mounts,
 since the
@@ -90,8 +95,3 @@ server is stateless.
 .Nm showmount
 will only display the information
 as accurately as the mount daemon reports it.
-.Sh HISTORY
-The
-.Nm showmount
-utility first appeared in
-.Bx 4.4 .
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index e90bffab02c..ca879f67eed 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systat.1,v 1.14 1999/09/23 04:12:09 alex Exp $
+.\"	$OpenBSD: systat.1,v 1.15 2000/03/06 03:17:39 aaron Exp $
 .\"	$NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -458,6 +458,11 @@ for network names
 .It Pa /etc/services
 for port names
 .El
+.Sh SEE ALSO
+.Xr kill 1 ,
+.Xr ps 1 ,
+.Xr top 1 ,
+.Xr renice 8
 .Sh HISTORY
 The
 .Nm
@@ -470,8 +475,3 @@ The
 .Ic vmstat
 display looks out of place because it is (it was added in as
 a separate display rather than created as a new program).
-.Sh SEE ALSO
-.Xr kill 1 ,
-.Xr ps 1 ,
-.Xr top 1 ,
-.Xr renice 8
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 182d583145a..4cdb3e2f8ab 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: talk.1,v 1.8 2000/03/04 20:02:23 aaron Exp $
+.\"	$OpenBSD: talk.1,v 1.9 2000/03/06 03:17:40 aaron Exp $
 .\"	$NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -118,6 +118,11 @@ to find the recipient's tty
 .Xr mesg 1 ,
 .Xr who 1 ,
 .Xr write 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.2 .
 .Sh BUGS
 The version of
 .Xr talk 1
@@ -126,8 +131,3 @@ released with
 uses a protocol that
 is incompatible with the protocol used in the version released with
 .Bx 4.2 .
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.2 .
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 41685c8bd51..09c47e7399e 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tftp.1,v 1.4 1999/06/05 01:21:43 aaron Exp $
+.\"	$OpenBSD: tftp.1,v 1.5 2000/03/06 03:17:40 aaron Exp $
 .\"	$NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -162,6 +162,13 @@ Toggle packet tracing.
 .It Ic verbose
 Toggle verbose mode.
 .El
+.Sh SEE ALSO
+.Xr ftp 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.3 .
 .Sh BUGS
 Because there is no user login or validation within
 the
@@ -170,8 +177,3 @@ protocol, the remote site will probably have some
 sort of file access restrictions in place.  The
 exact methods are specific to each site and therefore
 difficult to document here.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.3 .
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 0b0697da50e..4fa22bc2b78 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tput.1,v 1.8 1999/08/18 13:02:31 aaron Exp $
+.\"	$OpenBSD: tput.1,v 1.9 2000/03/06 03:17:40 aaron Exp $
 .\"	$NetBSD: tput.1,v 1.4 1994/12/07 08:49:10 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -151,11 +151,11 @@ goto line 6 column 11 and delete 6 characters
 .Sh SEE ALSO
 .Xr terminfo 3 ,
 .Xr terminfo 5
-.Sh BUGS
-.Nm
-can't really distinguish between different types of attributes.
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Bx 4.4 .
+.Sh BUGS
+.Nm
+can't really distinguish between different types of attributes.
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 275ac6a5e49..142ee6577b0 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unifdef.1,v 1.6 1999/10/17 20:35:46 aaron Exp $
+.\"	$OpenBSD: unifdef.1,v 1.7 2000/03/06 03:17:40 aaron Exp $
 .\"	$NetBSD: unifdef.1,v 1.4 1994/12/07 00:33:48 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -158,12 +158,12 @@ Premature
 with line numbers of the unterminated #ifdefs.
 .Pp
 Exit status is 0 if output is exact copy of input, 1 if not, 2 if trouble.
-.Sh BUGS
-Should try to deal with ``#if'' lines.
-.Pp
-Doesn't work correctly if input contains null characters.
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.3 .
+.Sh BUGS
+Should try to deal with ``#if'' lines.
+.Pp
+Doesn't work correctly if input contains null characters.
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 8a8bca2930a..9c78d7ce3a0 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgrind.1,v 1.5 1999/10/17 20:24:36 aaron Exp $
+.\"	$OpenBSD: vgrind.1,v 1.6 2000/03/06 03:17:40 aaron Exp $
 .\"	$NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -183,6 +183,11 @@ language descriptions
 .Xr troff 1 ,
 .Xr getcap 3 ,
 .Xr vgrindefs 5
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
 .Sh BUGS
 vfontedpr assumes that a certain programming style is followed:
 .Pp
@@ -224,8 +229,3 @@ or
 .Fl ms
 macros.
 (So what use is it anyway?)
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 3.0 .
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 7da425e1678..fb634256234 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wc.1,v 1.7 2000/03/05 00:28:56 aaron Exp $
+.\"	$OpenBSD: wc.1,v 1.8 2000/03/06 03:17:40 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -114,6 +114,16 @@ The
 utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr isspace 3
+.Sh STANDARDS
+The
+.Nm wc
+utility conforms to
+.St -p1003.2-92 .
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.At v1 .
 .Sh COMPATIBILITY
 Historically, the
 .Nm wc
@@ -128,13 +138,3 @@ This implementation defines a ``word'' in terms of the
 .Xr isspace 3
 function, as required by
 .St -p1003.2-92 .
-.Sh STANDARDS
-The
-.Nm wc
-utility conforms to
-.St -p1003.2-92 .
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.At v1 .
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index ab835eeb21c..8d43d6ddd53 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: what.1,v 1.4 1999/06/05 01:21:50 aaron Exp $
+.\"	$OpenBSD: what.1,v 1.5 2000/03/06 03:17:41 aaron Exp $
 .\"	$NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -54,6 +54,11 @@ of the string following this marker, up to a null character, newline, double
 quote, or
 .Dq \&>
 character.
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.0 .
 .Sh BUGS
 As
 .Bx
@@ -65,8 +70,3 @@ command which is part of
 .Tn SCCS ,
 and may not behave exactly the same as that
 command does.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.0 .
diff --git a/usr.bin/which/whereis.1 b/usr.bin/which/whereis.1
index 926ff8ef526..caae8d73ff9 100644
--- a/usr.bin/which/whereis.1
+++ b/usr.bin/which/whereis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whereis.1,v 1.5 1999/10/07 19:15:25 aaron Exp $
+.\"	$OpenBSD: whereis.1,v 1.6 2000/03/06 03:17:41 aaron Exp $
 .\"	$NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $
 .\"
 .\" Copyright (c) 1993
@@ -76,12 +76,12 @@ A system error occurred.
 .Xr locate 1 ,
 .Xr which 1 ,
 .Xr sysctl 8
-.Sh COMPATIBILITY
-The historic flags and arguments for the
-.Nm whereis
-utility are no longer available in this version.
 .Sh HISTORY
 The
 .Nm whereis
 command appeared in
 .Bx 3.0 .
+.Sh COMPATIBILITY
+The historic flags and arguments for the
+.Nm whereis
+utility are no longer available in this version.
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index bd7d23438e8..2e7dd308cda 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: who.1,v 1.8 1999/10/17 20:24:34 aaron Exp $
+.\"	$OpenBSD: who.1,v 1.9 2000/03/06 03:17:41 aaron Exp $
 .\"	$NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -125,13 +125,13 @@ special characters, see
 .Xr users 1 ,
 .Xr getuid 2 ,
 .Xr utmp 5
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.At v6 .
 .Sh STANDARDS
 The
 .Nm
 utility is expected to conform to
 .St -p1003.2-92 .
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.At v6 .
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 43ab0010e1b..63877e783ee 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: window.1,v 1.7 1999/06/05 01:21:51 aaron Exp $
+.\"	$OpenBSD: window.1,v 1.8 2000/03/06 03:17:41 aaron Exp $
 .\"	$NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -982,5 +982,3 @@ The
 .Nm
 command appeared in
 .Bx 4.3 .
-.Sh DIAGNOSTICS
-Should be self explanatory.
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index c748db80143..f04d03cb05c 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: write.1,v 1.5 1999/06/05 01:21:51 aaron Exp $
+.\"	$OpenBSD: write.1,v 1.6 2000/03/06 03:17:41 aaron Exp $
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -102,6 +102,11 @@ over.
 .Xr mesg 1 ,
 .Xr talk 1 ,
 .Xr who 1
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v6 .
 .Sh BUGS
 The
 .Ql EOF
@@ -112,8 +117,3 @@ terminates is indistinguishable from that party simply typing
 to make you believe that any future messages did not come from them.
 Especially messages such as:
 .Dl "[1]    Done                   rm -rf *"
-.Sh HISTORY
-A
-.Nm
-command appeared in
-.At v6 .
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index e2a1ef3013c..de3a948fe31 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xstr.1,v 1.6 1999/10/17 20:24:33 aaron Exp $
+.\"	$OpenBSD: xstr.1,v 1.7 2000/03/06 03:17:41 aaron Exp $
 .\"	$NetBSD: xstr.1,v 1.4 1994/11/26 09:25:22 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
@@ -154,14 +154,14 @@ temporary file when `xstr name' doesn't touch
 .El
 .Sh SEE ALSO
 .Xr mkstr 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
 .Sh BUGS
 If a string is a suffix of another string in the data base,
 but the shorter string is seen first by
 .Nm
 both strings will be placed in the data base, when just
 placing the longer one there will do.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 3.0 .