Sort sections.

66 files changed, 511 insertions, 511 deletions

diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index ce944df70f66..3babbffae869 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -105,6 +105,11 @@ The following environment variable affects the execution of
 Pathname of shell to use.
 If this variable is not defined, the Bourne shell is used.
 .El
+.Sh FILES
+.Bl -tag -width /bin/sh -compact
+.It Pa /bin/sh
+default shell
+.El
 .Sh EXAMPLES
 .Bl -tag -width apply -compact
 .It Li "apply echo a*"
@@ -120,11 +125,11 @@ runs
 links all files in the current directory to the directory
 .Pa /usr/joe .
 .El
-.Sh FILES
-.Bl -tag -width /bin/sh -compact
-.It Pa /bin/sh
-default shell
-.El
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.2 .
 .Sh AUTHORS
 .An Rob Pike
 .Sh BUGS
@@ -137,8 +142,3 @@ commands in single quotes
 The
 .Nm
 utility does not recognize multibyte characters.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.2 .
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 8a0b4ba5cf7b..bca1051793f5 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -329,6 +329,13 @@ job-creation lock file
 .Xr atrun 8 ,
 .Xr cron 8 ,
 .Xr sendmail 8
+.Sh AUTHORS
+At was mostly written by
+.An Thomas Koenig Aq ig25@rz.uni-karlsruhe.de .
+The time parsing routines are by
+.An David Parsons Aq orc@pell.chi.il.us ,
+with minor enhancements by
+.An Joe Halpin Aq joe.halpin@attbi.com .
 .Sh BUGS
 If the file
 .Pa /var/run/utmp
@@ -352,10 +359,3 @@ If this is the case, another batch system such as
 may be more suitable.
 .Pp
 Specifying a date past 2038 may not work on some systems.
-.Sh AUTHORS
-At was mostly written by
-.An Thomas Koenig Aq ig25@rz.uni-karlsruhe.de .
-The time parsing routines are by
-.An David Parsons Aq orc@pell.chi.il.us ,
-with minor enhancements by
-.An Joe Halpin Aq joe.halpin@attbi.com .
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index 0c2f22823ed5..8e001ba3c354 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -64,6 +64,8 @@ Change the output from a width of 132 to
 .Ar width ,
 suitable for a narrow terminal.
 .El
+.Sh AUTHORS
+.An Mark Horton
 .Sh BUGS
 Several
 .Tn ASCII
@@ -76,5 +78,3 @@ The
 option is implemented by skipping some rows and columns.
 The smaller it gets, the grainier the output.
 Sometimes it runs letters together.
-.Sh AUTHORS
-.An Mark Horton
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 015ed3d8b0a5..b4fa8997190e 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -92,6 +92,8 @@ character to the end of
 .Ar string
 (after first stripping trailing slashes),
 and writes the result to the standard output.
+.Sh EXIT STATUS
+.Ex -std basename dirname
 .Sh EXAMPLES
 The following line sets the shell variable
 .Ev FOO
@@ -99,8 +101,6 @@ to
 .Pa /usr/bin .
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
-.Sh EXIT STATUS
-.Ex -std basename dirname
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr sh 1
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.1 b/usr.bin/bluetooth/btsockstat/btsockstat.1
index e82684d50818..ad5063da32c7 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.1
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.1
@@ -72,12 +72,12 @@ and
 .It Fl r
 Display a list of active routing entries (if any) for specified protocol.
 .El
-.Sh BUGS
-Most likely.
-Please report if found.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr ng_btsocket 4
 .Sh AUTHORS
 .An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.Sh BUGS
+Most likely.
+Please report if found.
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
index 06c133c76fe8..21c921c31369 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
@@ -95,6 +95,15 @@ This option is required if
 .Fl b
 option was specified.
 .El
+.Sh FILES
+.Bl -tag -width ".Pa /dev/tty[p-sP-S][0-9a-v]" -compact
+.It Pa /dev/pty[p-sP-S][0-9a-v]
+master pseudo terminals
+.It Pa /dev/tty[p-sP-S][0-9a-v]
+slave pseudo terminals
+.El
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 .Dl "rfcomm_sppd -a 00:01:02:03:04:05 -c 1 -t /dev/ttyp1"
 .Pp
@@ -107,17 +116,6 @@ and channel
 Once the connection has been established,
 .Pa /dev/ttyp1
 can be used to talk to the remote serial port on the server.
-.Sh FILES
-.Bl -tag -width ".Pa /dev/tty[p-sP-S][0-9a-v]" -compact
-.It Pa /dev/pty[p-sP-S][0-9a-v]
-master pseudo terminals
-.It Pa /dev/tty[p-sP-S][0-9a-v]
-slave pseudo terminals
-.El
-.Sh EXIT STATUS
-.Ex -std
-.Sh BUGS
-Please report if found.
 .Sh SEE ALSO
 .Xr bluetooth 3 ,
 .Xr ng_btsocket 4 ,
@@ -125,3 +123,5 @@ Please report if found.
 .Xr rfcomm_pppd 8
 .Sh AUTHORS
 .An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.Sh BUGS
+Please report if found.
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 4dfc90673163..2fc14516d8f7 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -74,6 +74,12 @@ to be of type
 otherwise it will simply display the branding of
 .Ar file .
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command
+fails if a file does not exist, is too short, fails to brand properly,
+or the brand requested is not one of the known types and the
+.Fl f
+option is not set.
 .Sh EXAMPLES
 The following is an example of a typical usage
 of the
@@ -82,12 +88,6 @@ command:
 .Pp
 .Dl % brandelf file
 .Dl % brandelf -t Linux file
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command
-fails if a file does not exist, is too short, fails to brand properly,
-or the brand requested is not one of the known types and the
-.Fl f
-option is not set.
 .Sh SEE ALSO
 .Rs
 .%A The Santa Cruz Operation, Inc.
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 9faa3865830c..6b9fb2aa47ad 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -242,11 +242,6 @@ so that roving holidays are set correctly for the current year.
 .It Pa calendar.world
 Includes all calendar files except for national files.
 .El
-.Sh SEE ALSO
-.Xr at 1 ,
-.Xr cpp 1 ,
-.Xr mail 1 ,
-.Xr cron 8
 .Sh COMPATIBILITY
 The
 .Nm
@@ -254,6 +249,11 @@ program previously selected lines which had the correct date anywhere
 in the line.
 This is no longer true, the date is only recognized when it occurs
 at the beginning of a line.
+.Sh SEE ALSO
+.Xr at 1 ,
+.Xr cpp 1 ,
+.Xr mail 1 ,
+.Xr cron 8
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index addbceeaaefd..84048f232b14 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -138,26 +138,26 @@ utility knows about the
 and
 .Xr me 7
 macro packages.
-.Sh SEE ALSO
-.Xr nroff 1 ,
-.Xr troff 1 ,
-.Xr me 7 ,
-.Xr ms 7
-.\" .Xr checkeq 1 ,
 .Sh DIAGNOSTICS
 .Bd -ragged -compact
 Complaints about unmatched delimiters.
 Complaints about unrecognized commands.
 Various complaints about the syntax of commands.
 .Ed
+.Sh SEE ALSO
+.Xr nroff 1 ,
+.Xr troff 1 ,
+.Xr me 7 ,
+.Xr ms 7
+.\" .Xr checkeq 1 ,
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.0 .
 .Sh BUGS
 There is no way to define a 1 character macro name using
 .Fl a .
 .Pp
 Does not correctly recognize certain reasonable constructs,
 such as conditionals.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.0 .
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 62d80e4a707b..3073368f7a97 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -482,10 +482,10 @@ and
 .%A Ken Thompson
 .%T "UNIX Password security"
 .Re
-.Sh BUGS
-User information should (and eventually will) be stored elsewhere.
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Bx 4.3 Reno .
+.Sh BUGS
+User information should (and eventually will) be stored elsewhere.
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 7c0292c8185f..d599710e1f4d 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -79,6 +79,8 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 A typical use of
 .Nm
@@ -86,14 +88,17 @@ would be
 .Bd -literal
 tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more
 .Ed
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr col 1 ,
 .Xr more 1 ,
 .Xr nroff 1 ,
 .Xr troff 1 ,
 .Xr ul 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
 .Sh BUGS
 Should fold underlines onto blanks even with the
 .Sq Fl
@@ -117,8 +122,3 @@ in documents which are already double-spaced.
 .Pp
 Characters that take up more than one column position may not be
 underlined correctly.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 3.0 .
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 38bb090e33f3..fafa74db460d 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -250,6 +250,13 @@ The backslash character
 is used for continuation.
 In this case, no characters are permitted
 after the backslash character.
+.Sh FILES
+.Bl -tag -width indent
+.It Pa /usr/share/locale/ Ns Ao Ar language Ac Ns Pa /LC_COLLATE
+The standard shared location for collation orders
+under the locale
+.Aq Ar language .
+.El
 .Sh EXIT STATUS
 The
 .Nm
@@ -260,13 +267,6 @@ No errors were found and the output was successfully created.
 .It Li !=0
 Errors were found.
 .El
-.Sh FILES
-.Bl -tag -width indent
-.It Pa /usr/share/locale/ Ns Ao Ar language Ac Ns Pa /LC_COLLATE
-The standard shared location for collation orders
-under the locale
-.Aq Ar language .
-.El
 .Sh SEE ALSO
 .Xr mklocale 1 ,
 .Xr setlocale 3 ,
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index b9a649ee3d39..5c5a100fe3b1 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -74,8 +74,6 @@ Useful for pretty-printing displays.
 .It Fl x
 Fill columns before filling rows.
 .El
-.Sh EXIT STATUS
-.Ex -std
 .Sh ENVIRONMENT
 The
 .Ev COLUMNS , LANG , LC_ALL
@@ -85,6 +83,8 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 .Dl (printf \&"PERM LINKS OWNER GROUP SIZE MONTH DAY \&"\ \&;\ \&\e
 .Dl printf \&"HH:MM/YEAR NAME\en\&"\ \&;\ \&\e
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index 0ce19a8c6c8c..50998692cd57 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -124,6 +124,8 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 Split the
 .Xr mdoc 7
@@ -136,18 +138,16 @@ into one file for each section (up to 20):
 Split standard input after the first 99 lines and every 100 lines thereafter:
 .Pp
 .Dl "csplit -k - 100 '{19}'"
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr sed 1 ,
 .Xr split 1 ,
 .Xr re_format 7
-.Sh HISTORY
-A
-.Nm
-command appeared in PWB UNIX.
 .Sh STANDARDS
 The
 .Nm
 utility conforms to
 .St -p1003.1-2001 .
+.Sh HISTORY
+A
+.Nm
+command appeared in PWB UNIX.
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index a4368e924728..13056a2dc3d9 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -134,6 +134,8 @@ environment variables affect the execution of the
 utility.
 Their effect is described in
 .Xr environ 7 .
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 Extract users' login names and shells from the system
 .Xr passwd 5
@@ -146,8 +148,6 @@ pairs:
 Show the names and login times of the currently logged in users:
 .Pp
 .Dl "who | cut -c 1-16,26-38"
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr colrm 1 ,
 .Xr paste 1
diff --git a/usr.bin/elfdump/elfdump.1 b/usr.bin/elfdump/elfdump.1
index 1708bd79bca9..1902e41820c8 100644
--- a/usr.bin/elfdump/elfdump.1
+++ b/usr.bin/elfdump/elfdump.1
@@ -74,6 +74,8 @@ Write output to a
 .Ar file
 instead of the standard output.
 .El
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 The following is an example of a typical usage
 of the
@@ -81,8 +83,6 @@ of the
 command:
 .Pp
 .Dl "elfdump -a -w output /bin/ls"
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr objdump 1 ,
 .Xr readelf 1
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index c25284bae2d3..0acd1564302a 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -209,14 +209,6 @@ argument for
 the current transfer rate statistics will be written to the
 standard error output, in the same format as the standard completion
 message.
-.Sh EXIT STATUS
-The
-.Nm
-command returns zero on success, or one on failure.
-If multiple URLs are listed on the command line,
-.Nm
-will attempt to retrieve them each of them in turn, and return zero
-only if they were all successfully retrieved.
 .Sh ENVIRONMENT
 .Bl -tag -width HTTP_TIMEOUT
 .It Ev FTP_TIMEOUT
@@ -233,6 +225,14 @@ A number of these are quite important to the proper operation of
 you are strongly encouraged to read
 .Xr fetch 3
 as well.
+.Sh EXIT STATUS
+The
+.Nm
+command returns zero on success, or one on failure.
+If multiple URLs are listed on the command line,
+.Nm
+will attempt to retrieve them each of them in turn, and return zero
+only if they were all successfully retrieved.
 .Sh SEE ALSO
 .Xr fetch 3
 .Sh HISTORY
diff --git a/usr.bin/finger/finger.conf.5 b/usr.bin/finger/finger.conf.5
index 58146d594353..aef1bf039999 100644
--- a/usr.bin/finger/finger.conf.5
+++ b/usr.bin/finger/finger.conf.5
@@ -49,6 +49,12 @@ reference to another alias or the path of a world readable file.
 .Pp
 Where an alias points to a file, the contents of that file will be displayed
 when the alias is fingered.
+.Sh FILES
+.Bl -tag -width /etc/finger.conf -compact
+.It Pa /etc/finger.conf
+.Xr finger 1
+alias definition data base
+.El
 .Sh EXAMPLES
 .Bd -literal
 # /etc/finger.conf alias definition file
@@ -76,12 +82,6 @@ abuse:admin
 #
 admin:sod
 .Ed
-.Sh FILES
-.Bl -tag -width /etc/finger.conf -compact
-.It Pa /etc/finger.conf
-.Xr finger 1
-alias definition data base
-.El
 .Sh SEE ALSO
 .Xr finger 1
 .Sh HISTORY
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 01143ab7c6d9..98fb166d97eb 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -212,11 +212,6 @@ connected unix domain stream socket.
 A unidirectional unix domain socket indicates the direction of flow with
 an arrow (``<-'' or ``->''), and a full duplex socket shows a double arrow
 (``<->'').
-.Sh BUGS
-Since
-.Nm
-takes a snapshot of the system, it is only correct for a very short period
-of time.
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr nfsstat 1 ,
@@ -233,3 +228,8 @@ The
 .Nm
 command appeared in
 .Bx 4.3 tahoe .
+.Sh BUGS
+Since
+.Nm
+takes a snapshot of the system, it is only correct for a very short period
+of time.
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index 62758c15235b..c3baed94b1fa 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -147,21 +147,6 @@ variables provide information on the necessary compiler and linker flags
 to use the standard programming environments described above.
 .Sh EXIT STATUS
 .Ex -std
-.Sh DIAGNOSTICS
-Use of a
-.Ar system_var
-or
-.Ar path_var
-which is completely unrecognized is considered an error,
-causing a diagnostic message to be written to standard error.
-One
-which is known but merely undefined does not result in an error
-indication.
-The
-.Nm
-utility recognizes all of the variables defined for
-.St -p1003.1-2001 ,
-including those which are not currently implemented.
 .Sh EXAMPLES
 The command:
 .Pp
@@ -189,6 +174,21 @@ in the
 .Li POSIX_V6_LPBIG_OFFBIG
 programming environment,
 if the system supports that environment.
+.Sh DIAGNOSTICS
+Use of a
+.Ar system_var
+or
+.Ar path_var
+which is completely unrecognized is considered an error,
+causing a diagnostic message to be written to standard error.
+One
+which is known but merely undefined does not result in an error
+indication.
+The
+.Nm
+utility recognizes all of the variables defined for
+.St -p1003.1-2001 ,
+including those which are not currently implemented.
 .Sh SEE ALSO
 .Xr pathconf 2 ,
 .Xr confstr 3 ,
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 7d34e4e6f3ad..ef4c39521e2b 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -35,6 +35,12 @@ preceded by a
 .Ql \-
 and in its own shell argument;
 each option argument is also in its own shell argument.
+.Sh EXIT STATUS
+The
+.Nm
+utility prints an error message on the standard error output and exits with
+status > 0 when it encounters an option letter not included in
+.Ar optstring .
 .Sh EXAMPLES
 The following code fragment shows how one might process the arguments
 for a command that can take the options
@@ -88,12 +94,6 @@ cmd \-a \-oarg \-\- file file
 .Xr getopts 1 ,
 .Xr sh 1 ,
 .Xr getopt 3
-.Sh EXIT STATUS
-The
-.Nm
-utility prints an error message on the standard error output and exits with
-status > 0 when it encounters an option letter not included in
-.Ar optstring .
 .Sh HISTORY
 Written by
 .An Henry Spencer ,
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 5d32d2c2e721..7d231342d68b 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -159,10 +159,6 @@ System data structures may change while
 is running; the output of
 .Nm
 is not guaranteed to be consistent.
-.Sh BUGS
-This manual page is woefully incomplete, because it does not
-at all attempt to explain the information printed by
-.Nm .
 .Sh FILES
 .Bl -tag -width /boot/kernel/kernel -compact
 .It Pa /dev/kmem
@@ -174,3 +170,7 @@ default system name list
 .Xr ipcrm 1
 .Sh AUTHORS
 .An Thorsten Lockert Aq tholo@sigmasoft.com
+.Sh BUGS
+This manual page is woefully incomplete, because it does not
+at all attempt to explain the information printed by
+.Nm .
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index c5323bf800af..85baaeab4514 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -206,14 +206,14 @@ This has obvious difficulties in the presence of files named
 .Pp
 These options are available only so historic shellscripts don't require
 modification and should not be used.
-.Sh STANDARDS
-The
-.Nm
-command conforms to
-.St -p1003.1-2001 .
 .Sh SEE ALSO
 .Xr awk 1 ,
 .Xr comm 1 ,
 .Xr paste 1 ,
 .Xr sort 1 ,
 .Xr uniq 1
+.Sh STANDARDS
+The
+.Nm
+command conforms to
+.St -p1003.1-2001 .
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 7642f478b982..e3c3fcf47957 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -145,6 +145,8 @@ The name
 derives in part from
 .Nm iota ,
 a function in APL.
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 The command
 .Dl jot 21 -1 1.00
@@ -186,8 +188,6 @@ from column 10 and ending in column 132, use
 .Pp
 and to print all lines 80 characters or longer,
 .Dl grep `jot -s \&"\&" -b \&. 80`
-.Sh EXIT STATUS
-.Ex -std
 .Sh DIAGNOSTICS
 The following diagnostic messages deserve special explanation:
 .Bl -diag
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 728929649216..fd2d3902df02 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -164,12 +164,12 @@ on process 67
 .Dl $ ktrace -C
 .Sh SEE ALSO
 .Xr kdump 1
-.Sh BUGS
-Only works if
-.Ar trfile
-is a regular file.
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.4 .
+.Sh BUGS
+Only works if
+.Ar trfile
+is a regular file.
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index e0cff3e4959c..2c8ef9c07f30 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -204,6 +204,11 @@ login data base
 .Xr lastcomm 1 ,
 .Xr utmp 5 ,
 .Xr ac 8
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.Bx 3.0 .
 .Sh BUGS
 If a login shell should terminate abnormally for some reason, it is likely
 that a logout record won't be written to the
@@ -212,8 +217,3 @@ file.
 In this case,
 .Nm
 will indicate the logout time as "shutdown".
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.Bx 3.0 .
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 8a2e22b2b1ec..4205a4cd665e 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -178,6 +178,13 @@ Use the
 library instead of
 .Xr mmap 2 .
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width LOCATE_PATH -compact
+.It Pa LOCATE_PATH
+path to the locate database if set and not empty, ignored if the
+.Fl d
+option was specified.
+.El
 .Sh FILES
 .Bl -tag -width /etc/periodic/weekly/310.locate -compact
 .It Pa /var/db/locate.database
@@ -187,13 +194,6 @@ Script to update the locate database
 .It Pa /etc/periodic/weekly/310.locate
 Script that starts the database rebuild
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width LOCATE_PATH -compact
-.It Pa LOCATE_PATH
-path to the locate database if set and not empty, ignored if the
-.Fl d
-option was specified.
-.El
 .Sh SEE ALSO
 .Xr find 1 ,
 .Xr whereis 1 ,
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index fa48bc8f174e..2e2248f535f1 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -50,6 +50,11 @@ script.
 The contents of the newly built database can be controlled by the
 .Pa /etc/locate.rc
 file.
+.Sh ENVIRONMENT
+.Bl -tag -width /var/db/locate.database -compact
+.It Pa LOCATE_CONFIG
+path to the configuration file
+.El
 .Sh FILES
 .Bl -tag -width /var/db/locate.database -compact
 .It Pa /var/db/locate.database
@@ -57,11 +62,6 @@ the default database
 .It Pa /etc/locate.rc
 the configuration file
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width /var/db/locate.database -compact
-.It Pa LOCATE_CONFIG
-path to the configuration file
-.El
 .Sh SEE ALSO
 .Xr locate 1 ,
 .Xr periodic 8
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index d616fcd91b94..a846121ab1b5 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1345,23 +1345,6 @@ Each source specifies a suffix to
 .Nm .
 If no sources are specified, any previous specified suffices are deleted.
 .El
-.Sh COMPATIBILITY
-Older versions of
-.Nm
-used
-.Ev MAKE
-instead of
-.Ev MAKEFLAGS .
-This was removed for POSIX compatibility.
-The internal variable
-.Va MAKE
-is set to the same value as
-.Va .MAKE ;
-support for this may be removed in the future.
-.Pp
-Most of the more esoteric features of
-.Nm
-should probably be avoided for greater compatibility.
 .Sh ENVIRONMENT
 The
 .Nm
@@ -1400,6 +1383,35 @@ directory.
 List all included makefiles in order visited:
 .Pp
 .Dl "make -V .MAKEFILE_LIST | tr \e\  \e\en"
+.Sh COMPATIBILITY
+Older versions of
+.Nm
+used
+.Ev MAKE
+instead of
+.Ev MAKEFLAGS .
+This was removed for POSIX compatibility.
+The internal variable
+.Va MAKE
+is set to the same value as
+.Va .MAKE ;
+support for this may be removed in the future.
+.Pp
+Most of the more esoteric features of
+.Nm
+should probably be avoided for greater compatibility.
+.Sh SEE ALSO
+.Xr mkdep 1 ,
+.Xr make.conf 5
+.Rs
+.%T "PMake - A Tutorial"
+.Re
+in
+.Pa /usr/share/doc/psd/12.make
+.Sh HISTORY
+A
+.Nm
+command appeared in PWB UNIX.
 .Sh BUGS
 The determination of
 .Va .OBJDIR
@@ -1455,15 +1467,3 @@ all:
      ...
 \&.endfor
 .Ed
-.Sh SEE ALSO
-.Xr mkdep 1 ,
-.Xr make.conf 5
-.Rs
-.%T "PMake - A Tutorial"
-.Re
-in
-.Pa /usr/share/doc/psd/12.make
-.Sh HISTORY
-A
-.Nm
-command appeared in PWB UNIX.
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 87e800739c41..b596f75cf7d2 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -66,16 +66,6 @@ Permit messages to be displayed.
 If no arguments are given,
 .Nm
 displays the present message status to the standard output.
-.Sh EXAMPLES
-Disallow messages from other users to the current terminal:
-.Pp
-.Dl "mesg n"
-.Pp
-Allow messages from other users to
-.Pa ttyp1
-(assuming you are also logged in on that terminal):
-.Pp
-.Dl "mesg y </dev/ttyp1"
 .Sh EXIT STATUS
 The
 .Nm
@@ -89,6 +79,16 @@ Messages are not allowed.
 .It Li ">1"
 An error has occurred.
 .El
+.Sh EXAMPLES
+Disallow messages from other users to the current terminal:
+.Pp
+.Dl "mesg n"
+.Pp
+Allow messages from other users to
+.Pa ttyp1
+(assuming you are also logged in on that terminal):
+.Pp
+.Dl "mesg y </dev/ttyp1"
 .Sh COMPATIBILITY
 Previous versions of the
 .Nm
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index 446f5493ae5e..5d86209a03af 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -113,15 +113,15 @@ Specifies the non-CFLAGS options for the preprocessor.
 The default is
 "-M".
 .El
-.Sh SEE ALSO
-.Xr cc 1 ,
-.Xr cpp 1 ,
-.Xr make 1
 .Sh FILES
 .Bl -tag -width .depend -compact
 .It Pa .depend
 File containing list of dependencies.
 .El
+.Sh SEE ALSO
+.Xr cc 1 ,
+.Xr cpp 1 ,
+.Xr make 1
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index a39251a39e67..3fd31765c478 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -81,18 +81,18 @@ The
 utility requires write permission in the parent directory.
 .Sh EXIT STATUS
 .Ex -std
-.Sh STANDARDS
-The
-.Nm
-utility is expected to be
-.St -p1003.2
-compliant.
 .Sh SEE ALSO
 .Xr mkdir 1 ,
 .Xr rm 1 ,
 .Xr mkfifo 2 ,
 .Xr mknod 2 ,
 .Xr mknod 8
+.Sh STANDARDS
+The
+.Nm
+utility is expected to be
+.St -p1003.2
+compliant.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 7f56fb3a6edf..b1b91ff80376 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -295,12 +295,12 @@ for printable runes by default.
 .Xr gbk 5 ,
 .Xr mskanji 5 ,
 .Xr utf8 5
-.Sh BUGS
-The
-.Nm
-utility is overly simplistic.
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Bx 4.4 .
+.Sh BUGS
+The
+.Nm
+utility is overly simplistic.
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index adce3d5d56b0..35bd2e808da7 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -89,6 +89,8 @@ disk device using
 utility, and automatically mount it using
 .Xr mount_cd9660 8
 utility to the mount point provided as a first argument.
+.Sh EXIT STATUS
+.Ex -std
 .Sh SEE ALSO
 .Xr gzip 1 ,
 .Xr zlib 3 ,
@@ -97,7 +99,5 @@ utility to the mount point provided as a first argument.
 .Xr md 4 ,
 .Xr mdconfig 8 ,
 .Xr mount_cd9660 8
-.Sh EXIT STATUS
-.Ex -std
 .Sh AUTHORS
 .An Maxim Sobolev Aq sobomax@FreeBSD.org
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index ff4eed21efd2..eb804bd7d3c7 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -72,20 +72,6 @@ environment variable is used to locate the requested
 if the name contains no
 .Ql /
 characters.
-.Sh EXAMPLES
-Execute utility
-.Sq date
-at priority 5 assuming the priority of the
-shell is 0:
-.Pp
-.Dl "nice -n 5 date"
-.Pp
-Execute utility
-.Sq date
-at priority -19 assuming the priority of the
-shell is 0 and you are the super-user:
-.Pp
-.Dl "nice -n 16 nice -n -35 date"
 .Sh EXIT STATUS
 If
 .Ar utility
@@ -100,6 +86,24 @@ was found, but could not be executed.
 An exit status of 127 indicates
 .Ar utility
 could not be found.
+.Sh EXAMPLES
+Execute utility
+.Sq date
+at priority 5 assuming the priority of the
+shell is 0:
+.Pp
+.Dl "nice -n 5 date"
+.Pp
+Execute utility
+.Sq date
+at priority -19 assuming the priority of the
+shell is 0 and you are the super-user:
+.Pp
+.Dl "nice -n 16 nice -n -35 date"
+.Sh COMPATIBILITY
+The traditional
+.Fl Ns Ar increment
+option has been deprecated but is still supported.
 .Sh SEE ALSO
 .Xr builtin 1 ,
 .Xr csh 1 ,
@@ -108,10 +112,6 @@ could not be found.
 .Xr getpriority 2 ,
 .Xr setpriority 2 ,
 .Xr renice 8
-.Sh COMPATIBILITY
-The traditional
-.Fl Ns Ar increment
-option has been deprecated but is still supported.
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index f906fa435add..6b8ed0de12bd 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -110,6 +110,8 @@ is specified for one or more of the input files, the standard
 input is used; standard input is read one line at a time, circularly,
 for each instance of
 .Sq Fl .
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 List the files in the current directory in three columns:
 .Pp
@@ -132,8 +134,6 @@ for use in the
 environment variable:
 .Pp
 .Dl "find / -name bin -type d | paste -s -d : -"
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr cut 1 ,
 .Xr lam 1
diff --git a/usr.bin/pathchk/pathchk.1 b/usr.bin/pathchk/pathchk.1
index 70c3eb1957ab..e8639559cf47 100644
--- a/usr.bin/pathchk/pathchk.1
+++ b/usr.bin/pathchk/pathchk.1
@@ -96,6 +96,8 @@ No component may start with the hyphen
 character.
 .El
 .El
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 Check whether the names of files in the current directory are portable to
 other
@@ -103,8 +105,6 @@ other
 systems:
 .Pp
 .Dl "find . -print | xargs pathchk -p"
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr getconf 1 ,
 .Xr pathconf 2 ,
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index eb74a1c137d4..035958e26bf5 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -360,17 +360,17 @@ and
 .Fl n
 require that both arguments, if present, not be separated from the option
 letter.
-.Sh ERRORS
-If
-.Nm
-receives an interrupt while printing to a terminal, it
-flushes all accumulated error messages to the screen before
-terminating.
 .Sh EXIT STATUS
 The
 .Nm
 utility exits 0 on success, and 1 if an error occurs.
 .Sh DIAGNOSTICS
+If
+.Nm
+receives an interrupt while printing to a terminal, it
+flushes all accumulated error messages to the screen before
+terminating.
+.Pp
 Error messages are written to standard error during the printing
 process (if output is redirected) or after all successful
 file printing is complete (when printing to a terminal).
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 3c8565011358..cf16941eb0ce 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -142,11 +142,6 @@ located at the file system root with group quotas
 .It Pa /etc/fstab
 to find file system names and locations
 .El
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.2 .
 .Sh SEE ALSO
 .Xr quotactl 2 ,
 .Xr fstab 5 ,
@@ -155,3 +150,8 @@ command appeared in
 .Xr quotaon 8 ,
 .Xr repquota 8 ,
 .Xr rpc.rquotad 8
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.2 .
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 7c8bd2903c90..c4d4db4d8b26 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -161,6 +161,14 @@ The following environment variable is utilized by
 .It Ev TERM
 Determines the user's terminal type.
 .El
+.Sh FILES
+.Bl -tag -width /etc/hosts -compact
+.It Pa /etc/hosts
+.It Pa /etc/hosts.equiv
+.It Pa /etc/auth.conf
+.It Ev $HOME Ns Pa /.rhosts
+.It Ev $HOME Ns Pa /.klogin
+.El
 .Sh SEE ALSO
 .Xr login 1 ,
 .Xr rsh 1 ,
@@ -176,14 +184,6 @@ Determines the user's terminal type.
 .Xr hosts.equiv 5 ,
 .Xr rlogind 8 ,
 .Xr rshd 8
-.Sh FILES
-.Bl -tag -width /etc/hosts -compact
-.It Pa /etc/hosts
-.It Pa /etc/hosts.equiv
-.It Pa /etc/auth.conf
-.It Ev $HOME Ns Pa /.rhosts
-.It Ev $HOME Ns Pa /.klogin
-.El
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 09adc5e4c69f..1143f9cd3b7b 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -59,11 +59,34 @@ command is normally used for distributing files by
 .Xr ftp 1
 or
 .Xr mail 1 .
+.Sh EXAMPLES
+To create a shell archive of the program
+.Xr ls 1
+and mail it to Rick:
+.Bd -literal -offset indent
+cd ls
+shar `find . -print` \&| mail -s "ls source" rick
+.Ed
+.Pp
+To recreate the program directory:
+.Bd -literal -offset indent
+mkdir ls
+cd ls
+\&...
+<delete header lines and examine mailed archive>
+\&...
+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
 The
 .Nm
@@ -86,26 +109,3 @@ 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
-and mail it to Rick:
-.Bd -literal -offset indent
-cd ls
-shar `find . -print` \&| mail -s "ls source" rick
-.Ed
-.Pp
-To recreate the program directory:
-.Bd -literal -offset indent
-mkdir ls
-cd ls
-\&...
-<delete header lines and examine mailed archive>
-\&...
-sh archive
-.Ed
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.4 .
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index ac99bdeaff67..fe53d88dc822 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -88,6 +88,11 @@ Version 3.
 .Xr mount 8 ,
 .Xr mountd 8 ,
 .Xr mount_nfs 8
+.Sh HISTORY
+The
+.Nm
+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
@@ -97,8 +102,3 @@ The
 .Nm
 utility will only display the information
 as accurately as the mount daemon reports it.
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Bx 4.4 .
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 53b04929d3f1..e44d639b1e00 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -158,20 +158,6 @@ By default (unless the prompt is reset by a startup file) the super-user
 prompt is set to
 .Dq Sy \&#
 to remind one of its awesome power.
-.Sh FILES
-.Bl -tag -width ".Pa /etc/pam.d/su" -compact
-.It Pa /etc/pam.d/su
-PAM configuration for
-.Nm .
-.El
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr sh 1 ,
-.Xr group 5 ,
-.Xr login.conf 5 ,
-.Xr passwd 5 ,
-.Xr environ 7 ,
-.Xr pam 8
 .Sh ENVIRONMENT
 Environment variables used by
 .Nm :
@@ -189,6 +175,12 @@ The user ID is always the effective ID (the target user ID) after an
 .Nm
 unless the user ID is 0 (root).
 .El
+.Sh FILES
+.Bl -tag -width ".Pa /etc/pam.d/su" -compact
+.It Pa /etc/pam.d/su
+PAM configuration for
+.Nm .
+.El
 .Sh EXAMPLES
 .Bl -tag -width 5n -compact
 .It Li "su man -c catman"
@@ -221,6 +213,14 @@ Same as above.
 .It Li "su -"
 Simulate a login for root.
 .El
+.Sh SEE ALSO
+.Xr csh 1 ,
+.Xr sh 1 ,
+.Xr group 5 ,
+.Xr login.conf 5 ,
+.Xr passwd 5 ,
+.Xr environ 7 ,
+.Xr pam 8
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 23add08a66d2..b3fe7c47fd39 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -567,17 +567,6 @@ This will display all SCSI Direct Access devices and all IDE CDROM devices.
 This will display all Direct Access devices, all Sequential Access devices,
 and all passthrough devices that provide access to CDROM drives.
 .El
-.Sh SEE ALSO
-.Xr netstat 1 ,
-.Xr kvm 3 ,
-.Xr icmp 4 ,
-.Xr icmp6 4 ,
-.Xr ip 4 ,
-.Xr ip6 4 ,
-.Xr tcp 4 ,
-.Xr udp 4 ,
-.Xr iostat 8 ,
-.Xr vmstat 8
 .Sh FILES
 .Bl -tag -width /boot/kernel/kernel -compact
 .It Pa /boot/kernel/kernel
@@ -591,6 +580,17 @@ For network names.
 .It Pa /etc/services
 For port names.
 .El
+.Sh SEE ALSO
+.Xr netstat 1 ,
+.Xr kvm 3 ,
+.Xr icmp 4 ,
+.Xr icmp6 4 ,
+.Xr ip 4 ,
+.Xr ip6 4 ,
+.Xr tcp 4 ,
+.Xr udp 4 ,
+.Xr iostat 8 ,
+.Xr vmstat 8
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 9f428c62be2c..716c2978acc4 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -129,16 +129,6 @@ to find the recipient's tty
 .Xr who 1 ,
 .Xr write 1 ,
 .Xr talkd 8
-.Sh BUGS
-The version of
-.Nm
-released with
-.Bx 4.3
-uses a protocol that
-is incompatible with the protocol used in the version released with
-.Bx 4.2 .
-.Pp
-Multibyte characters are not recognized.
 .Sh HISTORY
 The
 .Nm
@@ -161,3 +151,13 @@ making
 unsuitable for use in configurations where
 .Xr talkd 8
 was bound to the loopback interface (normally for security reasons).
+.Sh BUGS
+The version of
+.Nm
+released with
+.Bx 4.3
+uses a protocol that
+is incompatible with the protocol used in the version released with
+.Bx 4.2 .
+.Pp
+Multibyte characters are not recognized.
diff --git a/usr.bin/tar/bsdtar.1 b/usr.bin/tar/bsdtar.1
index 2c96114fb6d0..a0acea4cbc8c 100644
--- a/usr.bin/tar/bsdtar.1
+++ b/usr.bin/tar/bsdtar.1
@@ -350,6 +350,42 @@ Note that, unlike other
 implementations, this implementation recognizes gzip compression
 automatically when reading archives.
 .El
+.Sh ENVIRONMENT
+The following environment variables affect the execution of
+.Nm :
+.Bl -tag -width ".Ev BLOCKSIZE"
+.It Ev LANG
+The locale to use.
+See
+.Xr environ 7
+for more information.
+.It Ev POSIXLY_CORRECT
+If this environment variable is defined, the
+.Fl l
+option will be interpreted in accordance with
+.St -p1003.1-96 .
+.It Ev TAPE
+The default tape device.
+The
+.Fl f
+option overrides this.
+.It Ev TZ
+The timezone to use when displaying dates.
+See
+.Xr environ 7
+for more information.
+.El
+.Sh FILES
+.Bl -tag -width ".Ev BLOCKSIZE"
+.It Pa /dev/sa0
+The default tape device, if not overridden by the
+.Ev TAPE
+environment variable or the
+.Fl f
+option.
+.El
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 The following creates a new archive
 called
@@ -389,42 +425,6 @@ Finally, it will switch to the
 directory and add
 .Pa foo2
 to the output archive.
-.Sh EXIT STATUS
-.Ex -std
-.Sh ENVIRONMENT
-The following environment variables affect the execution of
-.Nm :
-.Bl -tag -width ".Ev BLOCKSIZE"
-.It Ev LANG
-The locale to use.
-See
-.Xr environ 7
-for more information.
-.It Ev POSIXLY_CORRECT
-If this environment variable is defined, the
-.Fl l
-option will be interpreted in accordance with
-.St -p1003.1-96 .
-.It Ev TAPE
-The default tape device.
-The
-.Fl f
-option overrides this.
-.It Ev TZ
-The timezone to use when displaying dates.
-See
-.Xr environ 7
-for more information.
-.El
-.Sh FILES
-.Bl -tag -width ".Ev BLOCKSIZE"
-.It Pa /dev/sa0
-The default tape device, if not overridden by the
-.Ev TAPE
-environment variable or the
-.Fl f
-option.
-.El
 .Sh COMPATIBILITY
 The bundled-arguments format is supported for compatibility
 with historic implementations.
@@ -577,6 +577,22 @@ for tar and the current POSIX specification for pax.
 The ustar and pax interchange file formats are defined by
 .St -p1003.1-2001
 for the pax command.
+.Sh HISTORY
+A
+.Nm tar
+command appeared in Seventh Edition Unix.
+There have been numerous other implementations,
+many of which extended the file format.
+John Gilmore's
+.Nm pdtar
+public-domain implementation (circa November, 1987)
+was quite influential, and formed the basis of GNU tar.
+GNU tar was included as the standard system tar
+in FreeBSD beginning with FreeBSD 1.0.
+.Pp
+This is a complete re-implementation based on the
+.Xr libarchive 3
+library.
 .Sh BUGS
 POSIX and GNU violently disagree about the meaning of the
 .Fl l
@@ -664,19 +680,3 @@ formats store hardlink information.)
 .Pp
 There are alternative long options for many of the short options that
 are deliberately not documented.
-.Sh HISTORY
-A
-.Nm tar
-command appeared in Seventh Edition Unix.
-There have been numerous other implementations,
-many of which extended the file format.
-John Gilmore's
-.Nm pdtar
-public-domain implementation (circa November, 1987)
-was quite influential, and formed the basis of GNU tar.
-GNU tar was included as the standard system tar
-in FreeBSD beginning with FreeBSD 1.0.
-.Pp
-This is a complete re-implementation based on the
-.Xr libarchive 3
-library.
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 49af5979eca1..04daa87aacef 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -173,6 +173,11 @@ Toggle packet tracing.
 .It Cm verbose
 Toggle verbose mode.
 .El
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.3 .
 .Sh BUGS
 Because there is no user-login or validation within
 the
@@ -185,8 +190,3 @@ difficult to document here.
 .Pp
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
 without client and server supporting blocksize negotiation (RFC1783).
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.3 .
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index 7bc74b8e4584..f405ffb9477a 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -133,8 +133,6 @@ letter pair is not specified, the value defaults to 0.
 .El
 .Sh EXIT STATUS
 .Ex -std
-.Sh SEE ALSO
-.Xr utimes 2
 .Sh COMPATIBILITY
 The obsolescent form of
 .Nm ,
@@ -161,14 +159,16 @@ If the
 .Dq YY
 letter pair is in the range 39 to 99, the year is set to 1939 to 1999,
 otherwise, the year is set in the 21st century.
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.At v7 .
+.Sh SEE ALSO
+.Xr utimes 2
 .Sh STANDARDS
 The
 .Nm
 utility is expected to be a superset of the
 .St -p1003.2
 specification.
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.At v7 .
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index d56255edb04f..1829aa60aa34 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -279,6 +279,8 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 The following examples are shown as given to the shell:
 .Pp
@@ -305,8 +307,6 @@ Remove diacritical marks from all accented variants of the letter
 .Ql e :
 .Pp
 .Dl "tr \*q[=e=]\*q \*qe\*q"
-.Sh EXIT STATUS
-.Ex -std
 .Sh COMPATIBILITY
 Previous
 .Fx
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index e1c727e09fe5..30d6e36ac31c 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -334,19 +334,6 @@ system port name to terminal type mapping database
 .It Pa /usr/share/misc/termcap
 terminal capability database
 .El
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr sh 1 ,
-.Xr stty 1 ,
-.Xr tty 4 ,
-.Xr termcap 5 ,
-.Xr ttys 5 ,
-.Xr environ 7
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 3.0 .
 .Sh COMPATIBILITY
 The
 .Fl A ,
@@ -406,3 +393,16 @@ system of a
 .St -p1003.1-88
 compliant terminal interface) and will no longer compile on systems with
 older terminal interfaces.
+.Sh SEE ALSO
+.Xr csh 1 ,
+.Xr sh 1 ,
+.Xr stty 1 ,
+.Xr tty 4 ,
+.Xr termcap 5 ,
+.Xr ttys 5 ,
+.Xr environ 7
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 5d41d253e43a..823bd1204c11 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -90,6 +90,11 @@ as described in
 .Xr colcrt 1 ,
 .Xr man 1 ,
 .Xr nroff 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
 .Sh BUGS
 The
 .Xr nroff 1
@@ -97,8 +102,3 @@ command usually outputs a series of backspaces and underlines intermixed
 with the text to indicate underlining.
 No attempt is made to optimize
 the backward motion.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 3.0 .
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 23ce8d0ada1a..2a28464efa23 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -79,8 +79,6 @@ If the
 .Fl a
 flag is specified, or multiple flags are specified, all
 output is written on a single line, separated by spaces.
-.Sh EXIT STATUS
-.Ex -std
 .Sh ENVIRONMENT
 An environment variable composed of the string
 .Ev UNAME_
@@ -90,17 +88,19 @@ utility (except for
 .Fl a )
 will allow the corresponding data to be set to the contents
 of the environment variable.
+.Sh EXIT STATUS
+.Ex -std
 .Sh SEE ALSO
 .Xr sysctl 3 ,
 .Xr uname 3 ,
 .Xr sysctl 8
-.Sh HISTORY
-The
-.Nm
-command appeared in PWB UNIX.
 .Sh STANDARDS
 The
 .Nm
 command is expected to conform to the
 .St -p1003.2
 specification.
+.Sh HISTORY
+The
+.Nm
+command appeared in PWB UNIX.
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index e129c5486c38..7925b15af185 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -270,9 +270,11 @@ utility works nicely with the
 .Fl D Ns Ar sym
 option of
 .Xr diff 1 .
-.Sh SEE ALSO
-.Xr cpp 1 ,
-.Xr diff 1
+.Sh EXIT STATUS
+The
+.Nm
+utility exits 0 if the output is an exact copy of the input,
+1 if not, and 2 if in trouble.
 .Sh DIAGNOSTICS
 .Bl -item
 .It
@@ -294,11 +296,17 @@ Premature
 .Tn EOF
 in comment.
 .El
-.Sh EXIT STATUS
+.Sh SEE ALSO
+.Xr cpp 1 ,
+.Xr diff 1
+.Sh HISTORY
 The
 .Nm
-utility exits 0 if the output is an exact copy of the input,
-1 if not, and 2 if in trouble.
+command appeared in
+.Bx 4.3 .
+.Tn ANSI\~C
+support was added in
+.Fx 4.7 .
 .Sh BUGS
 Expression evaluation is very limited.
 .Pp
@@ -314,11 +322,3 @@ different points in the source file.
 The text-mode and ignore functionality does not correspond to modern
 .Xr cpp 1
 behaviour.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.3 .
-.Tn ANSI\~C
-support was added in
-.Fx 4.7 .
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 13ed413b155a..0c08e95ae74e 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -155,6 +155,13 @@ units.
 .It "ft	12 inches
 .It "mile	5280 ft
 .El
+.Sh FILES
+.Bl -tag -width /usr/share/misc/units.lib -compact
+.It Pa /usr/share/misc/units.lib
+the standard units library
+.El
+.Sh AUTHORS
+.An Adrian Mariano Aq adrian@cam.cornell.edu
 .Sh BUGS
 The effect of including a '/' in a prefix is surprising.
 .Pp
@@ -172,10 +179,3 @@ of the units converted and on the length of the data file.
 The program should use a hash table to store units so that
 it doesn't take so long to load the units list and check
 for duplication.
-.Sh FILES
-.Bl -tag -width /usr/share/misc/units.lib -compact
-.It Pa /usr/share/misc/units.lib
-the standard units library
-.El
-.Sh AUTHORS
-.An Adrian Mariano Aq adrian@cam.cornell.edu
diff --git a/usr.bin/usbhidctl/usbhidctl.1 b/usr.bin/usbhidctl/usbhidctl.1
index 69a836ff2b41..beb6fa3c0b3b 100644
--- a/usr.bin/usbhidctl/usbhidctl.1
+++ b/usr.bin/usbhidctl/usbhidctl.1
@@ -79,10 +79,6 @@ Be verbose.
 .Sh FILES
 .Pa /usr/share/misc/usb_hid_usages
 The default HID usage table.
-.Sh BUGS
-The
-.Nm
-utility cannot show nor set output and feature items.
 .Sh SEE ALSO
 .Xr usbhid 3 ,
 .Xr uhid 4 ,
@@ -92,3 +88,7 @@ The
 .Nm
 command appeared in
 .Nx 1.4 .
+.Sh BUGS
+The
+.Nm
+utility cannot show nor set output and feature items.
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index ea0778f1b6b8..30f3c48d2855 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -209,9 +209,6 @@ uudecode -o /dev/stdout < $MAIL | zcat | tar xfv -
 .Xr mail 1 ,
 .Xr uucp 1 ,
 .Xr uuencode 5
-.Sh BUGS
-Files encoded using the traditional algorithm are expanded by 35% (3
-bytes become 4 plus control information).
 .Sh HISTORY
 The
 .Nm uudecode
@@ -219,3 +216,6 @@ and
 .Nm
 utilities appeared in
 .Bx 4.0 .
+.Sh BUGS
+Files encoded using the traditional algorithm are expanded by 35% (3
+bytes become 4 plus control information).
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index d509517338ee..d738d6ef7703 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -195,6 +195,11 @@ language descriptions
 .Sh SEE ALSO
 .Xr getcap 3 ,
 .Xr vgrindefs 5
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
 .Sh BUGS
 The vfontedpr preprocessor assumes that a certain programming style is
 followed:
@@ -239,8 +244,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/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index b32883fbfb59..88189406764d 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -81,36 +81,6 @@ comments are normally starting with
 while the string
 .Ql $#
 is an operator on an array.
-.Sh EXAMPLES
-The following entry, which describes the C language, is
-typical of a language entry.
-.Bd -literal
-C|c:\
-:pb=^\ed?*?\ed?\ep\ed?\e(\ea?\e):bb={:be=}:cb=/*:ce=*/:sb=":se=\ee":\e
-:lb=':le=\ee':tl:\e
-:kw=asm auto break case char continue default do double else enum\e
-extern float for fortran goto if int long register return short\e
-sizeof static struct switch typedef union unsigned while #define\e
-#else #endif #if #ifdef #ifndef #include #undef # define else endif\e
-if ifdef ifndef include undef:
-.Ed
-.Pp
-Note that the first field is just the language name (and any variants
-of it).
-Thus the C language could be specified to
-.Xr vgrind 1
-as "c" or "C".
-.Pp
-Entries may continue onto multiple lines by giving a \e as the last
-character of a line.
-Capabilities in
-.Nm
-are of two types:
-Boolean capabilities which indicate that the language has
-some particular feature
-and string
-capabilities which give a regular expression or
-keyword list.
 .Sh REGULAR EXPRESSIONS
 .Nm Vgrindefs
 uses regular expression which are very similar to those of
@@ -165,6 +135,36 @@ specified in lower case.
 .It Pa /usr/share/misc/vgrindefs
 File containing terminal descriptions.
 .El
+.Sh EXAMPLES
+The following entry, which describes the C language, is
+typical of a language entry.
+.Bd -literal
+C|c:\
+:pb=^\ed?*?\ed?\ep\ed?\e(\ea?\e):bb={:be=}:cb=/*:ce=*/:sb=":se=\ee":\e
+:lb=':le=\ee':tl:\e
+:kw=asm auto break case char continue default do double else enum\e
+extern float for fortran goto if int long register return short\e
+sizeof static struct switch typedef union unsigned while #define\e
+#else #endif #if #ifdef #ifndef #include #undef # define else endif\e
+if ifdef ifndef include undef:
+.Ed
+.Pp
+Note that the first field is just the language name (and any variants
+of it).
+Thus the C language could be specified to
+.Xr vgrind 1
+as "c" or "C".
+.Pp
+Entries may continue onto multiple lines by giving a \e as the last
+character of a line.
+Capabilities in
+.Nm
+are of two types:
+Boolean capabilities which indicate that the language has
+some particular feature
+and string
+capabilities which give a regular expression or
+keyword list.
 .Sh SEE ALSO
 .Xr troff 1 ,
 .Xr vgrind 1
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 4fe175803423..4f1bbd7c0e6b 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -306,6 +306,13 @@ system time
 cpu idle
 .El
 .El
+.Sh FILES
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/kernel
+default kernel namelist
+.It Pa /dev/kmem
+default memory file
+.El
 .Sh EXAMPLES
 The command:
 .Dl vmstat -w 5
@@ -320,13 +327,6 @@ The command:
 will tell vmstat to select the first three direct access or CDROM devices
 and display statistics on those devices, as well as other systems
 statistics every second.
-.Sh FILES
-.Bl -tag -width /boot/kernel/kernel -compact
-.It Pa /boot/kernel/kernel
-default kernel namelist
-.It Pa /dev/kmem
-default memory file
-.El
 .Sh SEE ALSO
 .Xr fstat 1 ,
 .Xr netstat 1 ,
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 08b288415955..daad7c4c7389 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -91,11 +91,24 @@ names are specified, the output is restricted to those users.
 .It Pa /var/run/utmp
 list of users on the system
 .El
+.Sh COMPATIBILITY
+The
+.Fl f ,
+.Fl l ,
+.Fl s ,
+and
+.Fl w
+flags are no longer supported.
 .Sh SEE ALSO
 .Xr finger 1 ,
 .Xr ps 1 ,
 .Xr uptime 1 ,
 .Xr who 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
 .Sh BUGS
 The notion of the
 .Dq current process
@@ -130,16 +143,3 @@ The
 utility does not know about the new conventions for detection of background
 jobs.
 It will sometimes find a background job instead of the right one.
-.Sh COMPATIBILITY
-The
-.Fl f ,
-.Fl l ,
-.Fl s ,
-and
-.Fl w
-flags are no longer supported.
-.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 d8ef9353f9ad..48aeb6b70068 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -102,6 +102,8 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 Count the number of characters, words and lines in each of the files
 .Pa report1
@@ -110,10 +112,6 @@ and
 as well as the totals for both:
 .Pp
 .Dl "wc -mlw report1 report2"
-.Sh EXIT STATUS
-.Ex -std
-.Sh SEE ALSO
-.Xr iswspace 3
 .Sh COMPATIBILITY
 Historically, the
 .Nm
@@ -134,6 +132,8 @@ This implementation defines a ``word'' in terms of the
 .Xr iswspace 3
 function, as required by
 .St -p1003.2 .
+.Sh SEE ALSO
+.Xr iswspace 3
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 0b00b84f5569..9e0c5597025b 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -63,17 +63,17 @@ command which is similar or identical to this utility.
 Consult the
 .Xr builtin 1
 manual page.
-.Sh HISTORY
-The
-.Nm
-command first appeared in
-.Fx 2.1 .
 .Sh SEE ALSO
 .Xr builtin 1 ,
 .Xr csh 1 ,
 .Xr find 1 ,
 .Xr locate 1 ,
 .Xr whereis 1
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Fx 2.1 .
 .Sh AUTHORS
 .An -nosplit
 The
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 17035ad0dd18..7a779b460536 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1063,10 +1063,10 @@ startup command file.
 .It Pa /dev/[pt]ty[pq]?
 pseudo-terminal devices.
 .El
+.Sh DIAGNOSTICS
+Should be self explanatory.
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.3 .
-.Sh DIAGNOSTICS
-Should be self explanatory.
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 2a865791f270..d41556e2817c 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -180,8 +180,6 @@ utility attempts to prevent moving a file onto itself.
 Installing
 .Pa /dev/null
 creates an empty file.
-.Sh EXIT STATUS
-.Ex -std
 .Sh ENVIRONMENT
 The
 .Nm
@@ -210,6 +208,8 @@ is decided by
 .Xr mkstemp 3 ,
 are created in the target directory.
 .El
+.Sh EXIT STATUS
+.Ex -std
 .Sh COMPATIBILITY
 Historically
 .Nm
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index 85f4140ef520..0875568833b5 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -151,14 +151,14 @@ temp 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 .
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 87466b5ca9ff..56bacbbda7b3 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -158,12 +158,12 @@ conflicts,
 the number of conflicts is reported on standard error.
 .Sh SEE ALSO
 .Xr yyfix 1
-.Sh HISTORY
-A
-.Nm
-command appeared in PWB UNIX.
 .Sh STANDARDS
 The
 .Nm
 utility conforms to
 .St -p1003.2 .
+.Sh HISTORY
+A
+.Nm
+command appeared in PWB UNIX.