106 files changed, 121 insertions, 119 deletions

diff --git a/games/wargames/wargames.6 b/games/wargames/wargames.6
index 2070f559a7bf..ce05dd52b283 100644
--- a/games/wargames/wargames.6
+++ b/games/wargames/wargames.6
@@ -47,5 +47,5 @@ resulting is much smaller....
 .Sh SEE ALSO
 Wargames,
 the movie (an MGM production, PGP 13, directed by John Badham, 1983).
-.Sh AUTHOR
+.Sh AUTHORS
 This manual page was written by Joey Hess <joeyh@kitenet.net>.
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index de665e49c57e..4296d0355e14 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -296,7 +296,7 @@ or
 .Xr signal 3 ,
 .Xr sigsetops 3 ,
 .Xr tty 4
-.Sh EXAMPLE
+.Sh EXAMPLES
 On the
 .Tn VAX\-11
 The handler routine can be declared:
diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
index 7ed2b1fbd7c4..c6192d9f2da7 100644
--- a/lib/libc/gen/basename.3
+++ b/lib/libc/gen/basename.3
@@ -95,5 +95,5 @@ The
 .Fn basename
 function first appeared in
 .Ox 2.2 .
-.Sh AUTHOR
+.Sh AUTHORS
 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
index f209019ee63f..df74907a155a 100644
--- a/lib/libc/gen/dirname.3
+++ b/lib/libc/gen/dirname.3
@@ -102,5 +102,5 @@ The
 .Fn dirname
 function first appeared in
 .Ox 2.2 .
-.Sh AUTHOR
+.Sh AUTHORS
 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index 035bf1485dab..c05978e88b84 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -123,7 +123,7 @@ function waits for the associated process to terminate
 and returns the exit status of the command
 as returned by
 .Fn wait4 .
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 The
 .Fn popen
 function returns
diff --git a/lib/libc/gen/shm_open.3 b/lib/libc/gen/shm_open.3
index 1c717725f214..cbd4dc736a64 100644
--- a/lib/libc/gen/shm_open.3
+++ b/lib/libc/gen/shm_open.3
@@ -100,7 +100,7 @@ The
 function makes no effort to ensure that
 .Fa path
 refers to a shared memory object.
-.Sh PORTABILITY
+.Sh COMPATIBILITY
 The
 .Fa path
 argument does not necessarily represent a pathname (although it does in this
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index 5aec1bf56a19..d6743c4e3a34 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -98,7 +98,7 @@ or
 The caller attempted to use a descriptor that would
 circumvent protection or cause a failure.
 .El
-.Sh REFERENCES
+.Sh SEE ALSO
 i386 Microprocessor Programmer's Reference Manual, Intel
 .Sh WARNING
 You can really hose your process using this.
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
index 272fe7e0d319..68cf8930935b 100644
--- a/lib/libc/nls/catopen.3
+++ b/lib/libc/nls/catopen.3
@@ -123,7 +123,7 @@ remains valid in a process until that process closes it, or
 until a successful call to one of the
 .Xr exec 3
 function.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 Upon successful completion, 
 .Fn catopen
 returns a message catalog descriptor.
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index ec504fec91ba..161492437189 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -172,7 +172,7 @@ function multiple times.
 This is an extension to the
 .St -p1003.2
 specification.
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -literal -compact
 int bflag, ch, fd;
 
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index 550cfb377d8d..1efd64ef1a48 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -95,7 +95,7 @@ The argument
 will be set to point to the ``value'' portion of the token, or
 .Dv NULL
 if no ``value'' portion was present.
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -literal -compact
 char *tokens[] = {
 	#define	ONE	0
diff --git a/lib/libc/string/memset.3 b/lib/libc/string/memset.3
index 6e786700c84f..2a1253ed6f76 100644
--- a/lib/libc/string/memset.3
+++ b/lib/libc/string/memset.3
@@ -58,7 +58,7 @@ bytes of value
 .Fa c
 (converted to an unsigned char) to the string
 .Fa b .
-.Sh RETURNS
+.Sh RETURN VALUES
 The
 .Fn memset
 function returns its first argument.
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index ae0c21c20ad1..9f0345981912 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -111,7 +111,7 @@ after replacing the token itself with a
 .Dv NUL
 character.
 When no more tokens remain, a null pointer is returned.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The following uses
 .Fn strtok_r 
 to parse two strings using separate contexts:
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index e8421592e71f..8b5e2443c6ba 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -93,7 +93,7 @@ The resolution (granularity) of a clock is returned by the
 .Fn clock_getres
 call.  This value is placed in a (non-NULL)
 .Fa *tp .
-.Sh RETURN
+.Sh RETURN VALUES
 A 0 return value indicates that the call succeeded.
 A -1 return value indicates an error occurred, and in this
 case an error code is stored into the global variable
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index 36dfe60251bf..d42772488fba 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -107,7 +107,7 @@ from setting arbitrary time stamps on files.
 The system time can still be adjusted backwards using the
 .Xr adjtime 2
 system call even when the system is secure.
-.Sh RETURN
+.Sh RETURN VALUES
 A 0 return value indicates that the call succeeded.
 A -1 return value indicates an error occurred, and in this
 case an error code is stored into the global variable
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libc/sys/sched_get_priority_max.2
index e98fa38d42b2..c141da42dd7d 100644
--- a/lib/libc/sys/sched_get_priority_max.2
+++ b/lib/libc/sys/sched_get_priority_max.2
@@ -75,13 +75,13 @@ The standard time sharing scheduler;
 .It Bq Er SCHED_RR
 Round-robin scheduling across same priority processes.
 .El
-.Sh RETURN
+.Sh RETURN VALUES
 If successful, the
 .Fn sched_get_priority_max
 and
 .Fn sched_get_priority_min
 functions shall return the appropriate maximum or minimum values,
-respectively.  If unsuccessful, the shall return a value of -1 and set
+respectively.  If unsuccessful, they shall return a value of -1 and set
 .Fa errno
 to indicate the error.
 .Pp
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libc/sys/sched_setparam.2
index 879a2505ba61..ed2405871879 100644
--- a/lib/libc/sys/sched_setparam.2
+++ b/lib/libc/sys/sched_setparam.2
@@ -133,7 +133,7 @@ returned.  In this implementation, the
 function will fail if
 .Fa pid
 is negative.
-.Sh RETURN
+.Sh RETURN VALUES
 The function will return zero if it completes successfully, or it
 will return a value of -1 and set
 .Va errno
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libc/sys/sched_setscheduler.2
index b8be52325929..6679699f7f46 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -128,7 +128,7 @@ returned.  In this implementation, the
 function will fail if
 .Fa pid
 is negative.
-.Sh RETURN
+.Sh RETURN VALUES
 The function will return zero if it completes successfully, or it
 will return a value of -1 and set
 .Va errno
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libc/sys/sched_yield.2
index 4f3fc4e07f74..473648846377 100644
--- a/lib/libc/sys/sched_yield.2
+++ b/lib/libc/sys/sched_yield.2
@@ -40,7 +40,7 @@ The
 .Fn sched_yield
 function forces the running process to relinquish the processor until it
 again becomes the head of its process list.  It takes no arguments.
-.Sh RETURN
+.Sh RETURN VALUES
 The 
 .Fn sched_yield
 function will return zero if it completes successfully, or it
diff --git a/lib/libc/sys/shm_open.2 b/lib/libc/sys/shm_open.2
index 1c717725f214..cbd4dc736a64 100644
--- a/lib/libc/sys/shm_open.2
+++ b/lib/libc/sys/shm_open.2
@@ -100,7 +100,7 @@ The
 function makes no effort to ensure that
 .Fa path
 refers to a shared memory object.
-.Sh PORTABILITY
+.Sh COMPATIBILITY
 The
 .Fa path
 argument does not necessarily represent a pathname (although it does in this
diff --git a/lib/libusb/usb.3 b/lib/libusb/usb.3
index c16738b02d01..68d658e3b933 100644
--- a/lib/libusb/usb.3
+++ b/lib/libusb/usb.3
@@ -190,7 +190,7 @@ function extracts the value of the item.
 Conversely
 .Fn hid_set_data
 can be used to put data into a report (which must be zeroed first).
-.Sh EXAMPLE
+.Sh EXAMPLES
 Not yet.
 .Sh FILES
 .Pa /usr/share/misc/usb_hid_usages
diff --git a/lib/libusbhid/usb.3 b/lib/libusbhid/usb.3
index c16738b02d01..68d658e3b933 100644
--- a/lib/libusbhid/usb.3
+++ b/lib/libusbhid/usb.3
@@ -190,7 +190,7 @@ function extracts the value of the item.
 Conversely
 .Fn hid_set_data
 can be used to put data into a report (which must be zeroed first).
-.Sh EXAMPLE
+.Sh EXAMPLES
 Not yet.
 .Sh FILES
 .Pa /usr/share/misc/usb_hid_usages
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index c16738b02d01..68d658e3b933 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -190,7 +190,7 @@ function extracts the value of the item.
 Conversely
 .Fn hid_set_data
 can be used to put data into a report (which must be zeroed first).
-.Sh EXAMPLE
+.Sh EXAMPLES
 Not yet.
 .Sh FILES
 .Pa /usr/share/misc/usb_hid_usages
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index f3aaa4eee9ce..d5e92436b006 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -144,7 +144,7 @@ The component devices need to name partitions of type
 .Dq 4.2BSD
 as shown by
 .Xr disklabel 8 ).
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Pp
 A number of ccdconfig examples are shown below.  The arguments passed
 to ccdconfig are exactly the same as you might place in the
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index 3537dd1533cb..40f184861c8c 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -94,7 +94,7 @@ The
 .Nm
 first appered in
 .Fx 3.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 HPFS kernel implementation,
 .Nm
 and manual were written by Semen Ustimenko <semenu@FreeBSD.org>.
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index a10bc8ed4e0d..c74cc5dbf597 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -2665,7 +2665,7 @@ The name of the editor to use for editing configuration files, by default
 .Xr newfs 8 ,
 .Pa http://www.lemis.com/vinum.html ,
 .Pa http://www.lemis.com/vinum-debugging.html .
-.Sh AUTHOR
+.Sh AUTHORS
 .An Greg Lehey Aq grog@lemis.com .
 .Sh HISTORY
 The
diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index e05a1935adc5..04f7025bf545 100644
--- a/share/man/man3/bitstring.3
+++ b/share/man/man3/bitstring.3
@@ -155,7 +155,7 @@ is set to \-1.
 .Pp
 The arguments to these macros are evaluated only once and may safely
 have side effects.
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -literal -offset indent
 #include <limits.h>
 #include <bitstring.h>
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 65d72b1f6dbd..d06790da2e80 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -121,7 +121,7 @@ The
 .Nm
 device driver first appeared in
 .Fx 4.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver was written by
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 645e6bfd7c90..4eaa3eb55c4c 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -125,7 +125,7 @@ This option sets the defauilt, built-in keymap of the
 .Nm
 driver to the named keymap.
 See
-.Sx EXAMPLE
+.Sx EXAMPLES
 below.
 .It Em KBD_DISABLE_KEYMAP_LOAD
 The keymap can be modified by the
@@ -162,7 +162,7 @@ Certain keyboards, such as those on some ThinkPad models, behave
 like the old XT keyboard and require this option.
 .El
 .\".Sh FILES
-.Sh EXAMPLE
+.Sh EXAMPLES
 The 
 .Nm
 driver requires the keyboard controller
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 5afefa48a4b4..5982a28b86a7 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -142,7 +142,7 @@ The
 .Nm
 device driver first appeared in
 .Nx 1.5 .
-.Sh AUTHOR
+.Sh AUTHORS
 The initial version of the
 .Nm
 driver was written by
diff --git a/share/man/man4/csa.4 b/share/man/man4/csa.4
index dfb60f57a387..e7291f32e7cb 100644
--- a/share/man/man4/csa.4
+++ b/share/man/man4/csa.4
@@ -59,5 +59,5 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh SEE ALSO
 .Xr pcm 4
-.Sh AUTHOR
+.Sh AUTHORS
 .An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index aae2b35970d0..3c07330aacf7 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -174,7 +174,7 @@ this will kick the f/w into getting unstuck.
 .Xr scsi 4 ,
 .Xr da 4 ,
 .Xr sa 4
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver was written by Matthew Jacob for NASA/Ames Research Center.
diff --git a/share/man/man4/ispfw.4 b/share/man/man4/ispfw.4
index 6380e96b2df2..f21bcaa5994c 100644
--- a/share/man/man4/ispfw.4
+++ b/share/man/man4/ispfw.4
@@ -42,5 +42,5 @@ Qlogic cards (to replace the usually out of date firmware on the cards).
 this will kick the f/w into getting unstuck.
 .Sh SEE ALSO
 .Xr isp 4
-.Sh AUTHOR
+.Sh AUTHORS
 This driver was written by Matthew Jacob.
diff --git a/share/man/man4/kame.4 b/share/man/man4/kame.4
index e8a960b09ed8..dca3d9d29a4b 100644
--- a/share/man/man4/kame.4
+++ b/share/man/man4/kame.4
@@ -177,7 +177,7 @@ Also check latest status of project at web page:
 .Ss Added/modified/renamed features and tools
 Please consult the manpages referred above.
 .\"
-.Sh REFERENCES
+.Sh SEE ALSO
 To understand
 .Nm
 protocol stack conformance, please refer to
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index 335f5568c585..4c290880ed78 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -7,7 +7,7 @@
 .Sh NAME
 .Nm cx
 .Nd asynchronous/synchronous Cronyx-Sigma adapter driver
-.Sh SYNOPSYS
+.Sh SYNOPSIS
 .Cd "device cx0 at isa? port 0x240 irq 15 drq 7"
 .Cd "device cx1 at isa? port 0x260 irq 12 drq 6"
 .Cd pseudo-device sppp
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index e1de9887c9c8..1c36340b5479 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -338,7 +338,7 @@ movement counts as described in
 `non-blocking' device node under
 .Em devfs .
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Dl "device mse0 at isa? port 0x23c irq 5"
 .Pp
 Add the 
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 9dfdba906d0c..411895cd991a 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -173,7 +173,7 @@ and the source address override flag is reenabled,
 but the node is not removed.
 If the interface itself is detached (e.g., because of PCCARD removal), the
 node disappears as well.
-.Sh EXAMPLE
+.Sh EXAMPLES
 This command dumps all unrecognized packets received by the
 .Dv fxp0
 interface to standard output decoded in hex and ASCII:
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index d06498d003ae..0a499cd41af6 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -30,7 +30,7 @@
 .Sh NAME
 .Nm pci
 .Nd Generic PCI driver
-.Sh SYNOPSYIS
+.Sh SYNOPSIS
 .Cd device pci
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 3890a54077b3..b660cb7e8d0e 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -621,7 +621,7 @@ movement counts as described in
 `blocking' device node under
 .Em devfs .
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Dl "device psm0 at atkbdc? irq 12 flags 0x2000"
 .Pp
 Add the
diff --git a/share/man/man4/sbc.4 b/share/man/man4/sbc.4
index 1e3f2159f95e..03de5232002c 100644
--- a/share/man/man4/sbc.4
+++ b/share/man/man4/sbc.4
@@ -73,5 +73,5 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh SEE ALSO
 .Xr pcm 4
-.Sh AUTHOR
+.Sh AUTHORS
 .An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_csa.4 b/share/man/man4/snd_csa.4
index dfb60f57a387..e7291f32e7cb 100644
--- a/share/man/man4/snd_csa.4
+++ b/share/man/man4/snd_csa.4
@@ -59,5 +59,5 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh SEE ALSO
 .Xr pcm 4
-.Sh AUTHOR
+.Sh AUTHORS
 .An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 1e3f2159f95e..03de5232002c 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -73,5 +73,5 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh SEE ALSO
 .Xr pcm 4
-.Sh AUTHOR
+.Sh AUTHORS
 .An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index c7bf941e45a3..2ca4c4cec76d 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -171,7 +171,7 @@ screen saver modules
 .It /boot/kernel/vesa.ko
 the VESA support module
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 In order to load the splash screen or the screen saver, you must 
 have the following line in the kernel configuration file.
 .Pp
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 354e6d810ae4..5100c1f538a4 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -314,7 +314,7 @@ These options will set the default colors.
 Available colors are defined in
 .Pa /usr/include/machine/pc/display.h .
 See
-.Sx EXAMPLE
+.Sx EXAMPLES
 below.
 .It Dv SC_DFLT_FONT
 This option will specify the default font.
@@ -325,7 +325,7 @@ Without this option, the
 driver will use whatever font already loaded in the video card,
 unless you explicitly load software font at startup.
 See
-.Sx EXAMPLE
+.Sx EXAMPLES
 below.
 .El
 .Pp
@@ -419,7 +419,7 @@ key map files
 .It Pa /usr/share/syscons/scrmaps/*
 screen map files
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 As the 
 .Nm
 driver requires the keyboard driver and the video card driver,
diff --git a/share/man/man4/udbp.4 b/share/man/man4/udbp.4
index 815583b8d72e..ae91d5fdc6c5 100644
--- a/share/man/man4/udbp.4
+++ b/share/man/man4/udbp.4
@@ -63,7 +63,7 @@ as a module, either from
 or from the command line, before the
 .Nm
 module.
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Dl options NETGRAPH
 .Dl device udbp
 .Pp
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index d8680c207543..f1bc65f077b2 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -136,7 +136,7 @@ also has effect on the AT keyboard driver `atkbd'.
 .Bl -tag -width /dev/kbd0 -compact
 .It Pa /dev/kbd*
 blocking device nodes
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -literal -offset indent
 device ukbd
 .Ed
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index a94f7f683cfc..72b1d3bbea3b 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -62,7 +62,7 @@ must be configured in the kernel as well.
 Last but not least, support for
 SCSI drives,
 .Nm da
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Dl device umass
 .Dl device scbus
 .Dl device da
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index fc45bd6fec2b..2b8fe96963ff 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -63,7 +63,7 @@ for an explanation of these mouse types.
 .Bl -tag -width /dev/ums0 -compact
 .It Pa /dev/ums0
 blocking device node
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Dl device ums
 .Pp
 Add the
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index 094422637629..2511973afbed 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -128,7 +128,7 @@ option.  See
 This option prevents the driver from changing video modes.
 .El
 .\".Sh FILES
-.Sh EXAMPLE
+.Sh EXAMPLES
 Your kernel configuration should normally have:
 .Pp
 .Dl "device vga0 at isa? port ? conflicts"
@@ -157,7 +157,7 @@ module as desired:
 .Xr config 8 ,
 .Xr kldload 8 ,
 .Xr kldunload 8
-.Sh STANDARD
+.Sh STANDARDS
 .Rs
 .%T "VESA BIOS Extension (VBE)"
 .%A Video Electronics Standards Association
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index d23a230162e2..54eca9b1a05d 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -1000,7 +1000,7 @@ at the beginning.
 .It
 If you have a panic, a stack trace as described above.
 .El
-.Sh AUTHOR
+.Sh AUTHORS
 .An Greg Lehey Aq grog@lemis.com .
 .Sh HISTORY
 .Nm vinum
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index e81a974164c0..070d332c7efe 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -90,7 +90,7 @@ The
 .Nm
 manual page first appeared in
 .Fx 3.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 This
 manual page was written by
 .An Nicolas Souchu .
diff --git a/share/man/man4/wx.4 b/share/man/man4/wx.4
index cec07db4d943..6cce632625c4 100644
--- a/share/man/man4/wx.4
+++ b/share/man/man4/wx.4
@@ -41,7 +41,7 @@ original WISEMAN and the newer LIVENGOOD chipsets.
 .Pp
 For more information on configuring this device, see
 .Xr ifconfig 8 .
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver was written by
diff --git a/sys/boot/i386/pxeldr/pxeboot.8 b/sys/boot/i386/pxeldr/pxeboot.8
index aedb82d76f8c..d22cadcace41 100644
--- a/sys/boot/i386/pxeldr/pxeboot.8
+++ b/sys/boot/i386/pxeldr/pxeboot.8
@@ -107,7 +107,7 @@ Management (WfM) systems, see
 .Nm
 first appeared in
 .Fx 4.1 .
-.Sh AUTHOR
+.Sh AUTHORS
 .Nm
 was written by
 .An John Baldwin Aq jhb@freebsd.org
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 4473c7b12451..5073f3588e6f 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -239,13 +239,15 @@ The backslash character
 is used for continuation.
 In this case, no characters are permitted
 after the backslash character.
-.Sh EXIT STATUS
+.Sh DIAGNOSTICS
 .Nm Colldef
 exits with the following values:
-.Ar 0
-No  errors  were   found   and   the   output   was successfully created.
-.Ar !=0
+.Bl -tag -width indent
+.It Li 0
+No errors were found and the output was successfully created.
+.It Li !=0
 Errors were found.
+.El
 .Sh FILES
 .Ar /usr/share/locale/<language>/LC_COLLATE
 standard shared location  for  collation  orders
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index eb909badf3d1..dbcc4eabafd1 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -31,7 +31,7 @@ is present, it is printed after the data.
 .Pp
 This program is used to embed binary or other files into C source files,
 for instance as a char[].
-.Sh EXAMPLE
+.Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
 date | file2c 'const char date[] = {' ',0};'
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index 3aac9edeeee4..7ce8984f0b4f 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -157,5 +157,5 @@ We ignore that aspect of the specification and use the
 correct
 .Li \&"%ld"
 format.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Garrett A. Wollman Aq wollman@lcs.mit.edu
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 72ae418925fd..6563216dcb3f 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -34,7 +34,7 @@ preceded by a
 .Ql \-
 and in its own shell argument;
 each option argument is also in its own shell argument.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The following code fragment shows how one might process the arguments
 for a command that can take the options
 .Fl a
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index 9546929eaac2..2b3545c6403b 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -19,7 +19,7 @@ passwords to print
 along with a (maximum) sequence number and key as command line args, 
 it prompts for the user's secret password, and produces both word 
 and hex format responses.
-.Sh EXAMPLE
+.Sh EXAMPLES
 Usage example:
 .Bd -literal -offset indent -compact
 >key -n 5 99 th91334
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 5314aa809dfe..7d0b9a5d7335 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -60,7 +60,7 @@ work.
 .Nm Rup
 uses an RPC protocol defined in
 .Pa /usr/include/rpcsvc/rstat.x .
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -unfilled -offset indent -compact
 example% rup otherhost
 otherhost   7:36am  up 6 days, 16:45,  load average: 0.20, 0.23, 0.18
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index f1c2de8602e7..a2532a92d69d 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -5,12 +5,12 @@
 .Sh NAME
 .Nm units
 .Nd conversion program
-.Sh SYNTAX
+.Sh SYNOPSIS
 .Nm
 .Op Fl f Ar filename
 .Op Fl qv
 .Op Ar to-unit from-unit
-.Sh SUMMARY
+.Sh OPTIONS
 The following options are available:
 .Bl -tag -width indent
 .It Fl f Ar filename
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index 8e6404b4c92d..46817fdab624 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -112,7 +112,7 @@ Search for
 entries.  A file is said to be unusual if it does not have one entry
 of each requested type.
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 The following finds all utilities under
 .Pa /usr/bin
 that do not have documentation:
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index 077daf690a03..30c40a78ff82 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -313,7 +313,7 @@ If they are not valid for a particular program, that
 program is skipped in the
 .Ic objs
 target.
-.Sh EXAMPLE
+.Sh EXAMPLES
 Here is an example
 .Nm
 input conf file, named
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index bb104b5e74c7..834fcc09aa9b 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -74,7 +74,7 @@ are used for formatting.
 If custom formatting is needed, please use
 .Xr fdformat 1
 instead.
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Nm Fdwrite
 was planned as a tool to make life easier when writing a set of floppies,
 one such use could be to write a tar-archive:
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1 b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
index 6aa183287a42..eef204a18ded 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
@@ -60,7 +60,7 @@ will print a "1" to stdout.
 .Sh STANDARDS
 ITU Recommendations G.711
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility was written by 
diff --git a/usr.sbin/i4b/g711conv/g711conv.1 b/usr.sbin/i4b/g711conv/g711conv.1
index 43abcfe07e51..effd29a89d33 100644
--- a/usr.sbin/i4b/g711conv/g711conv.1
+++ b/usr.sbin/i4b/g711conv/g711conv.1
@@ -86,7 +86,7 @@ converts the u-law coded voice of Max Headroom to A-law, reverses the
 bits of the result and moves that to an active isdn4bsd telephone connection.
 .Pp
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility and this manpage were written by 
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 34746c10c7d8..273704e0a069 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -419,7 +419,7 @@ Exit status is 0 on success, 1 on error.
 .Sh BUGS
 Still one or more left.
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 daemon and this manual page were written by 
diff --git a/usr.sbin/i4b/isdnd/isdnd.acct.5 b/usr.sbin/i4b/isdnd/isdnd.acct.5
index 3ee378b3cea8..437b1333f680 100644
--- a/usr.sbin/i4b/isdnd/isdnd.acct.5
+++ b/usr.sbin/i4b/isdnd/isdnd.acct.5
@@ -104,7 +104,7 @@ This is a typical accounting line:
 .Xr isdnd 8 ,
 .Xr isdnd.rc 5
 
-.Sh AUTHOR
+.Sh AUTHORS
 The 
 .Xr isdnd 8
 daemon and this manual page were written by 
diff --git a/usr.sbin/i4b/isdnd/isdnd.rates.5 b/usr.sbin/i4b/isdnd/isdnd.rates.5
index d57d7037b60e..1b014998a34e 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rates.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rates.5
@@ -105,7 +105,7 @@ defines the unit lengths for a Sunday.
 .Xr isdnd 8 ,
 .Xr isdnd.rc 5
 
-.Sh AUTHOR
+.Sh AUTHORS
 The rates subsystem for the
 .Xr isdnd 8
 daemon to which
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index 4e5bd9f63962..de3f619a7211 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -998,7 +998,7 @@ ISDN daemon.
 .Xr regex 3
 .Xr re_format 7
 
-.Sh AUTHOR
+.Sh AUTHORS
 The 
 .Xr isdnd 8
 daemon and this manual page were written by 
diff --git a/usr.sbin/i4b/isdndebug/isdndebug.8 b/usr.sbin/i4b/isdndebug/isdndebug.8
index a708050713c7..75f18b041ca3 100644
--- a/usr.sbin/i4b/isdndebug/isdndebug.8
+++ b/usr.sbin/i4b/isdndebug/isdndebug.8
@@ -104,7 +104,7 @@ isdndebug -g
 .Pp
 displays the current debugging level for all ISDN layers
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility and this manpage were written by 
diff --git a/usr.sbin/i4b/isdndecode/isdndecode.8 b/usr.sbin/i4b/isdndecode/isdndecode.8
index 6cfce93024f9..5236e99d61f3 100644
--- a/usr.sbin/i4b/isdndecode/isdndecode.8
+++ b/usr.sbin/i4b/isdndecode/isdndecode.8
@@ -166,7 +166,7 @@ ETSI Recommendation ETS 300 179 (10/92), ETS 300 180 (10/92)
 ETSI Recommendation ETS 300 181 (04/93), ETS 300 182 (04/93)
 .Pp
 ITU Recommendation X.208, X.209
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility and this manual page were written by 
diff --git a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
index e29a6ae0cc90..9b15a650a232 100644
--- a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
+++ b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
@@ -169,7 +169,7 @@ Exit status is 0 on success, 1 on error.
 .Sh BUGS
 Still one (or) more left.
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility was written by 
diff --git a/usr.sbin/i4b/isdnphone/isdnphone.8 b/usr.sbin/i4b/isdnphone/isdnphone.8
index 62ff227eb8b6..c0060840d81f 100644
--- a/usr.sbin/i4b/isdnphone/isdnphone.8
+++ b/usr.sbin/i4b/isdnphone/isdnphone.8
@@ -67,7 +67,7 @@ isdnphone -n 1234
 .Ed
 .Pp
 dials calls the number 1234 to establish a call on /dev/i4btel0
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility and this manpage were written by 
diff --git a/usr.sbin/i4b/isdntel/isdntel.8 b/usr.sbin/i4b/isdntel/isdntel.8
index 5dca41448916..882592b95442 100644
--- a/usr.sbin/i4b/isdntel/isdntel.8
+++ b/usr.sbin/i4b/isdntel/isdntel.8
@@ -91,7 +91,7 @@ The screen output should be obvious. If in doubt, consult the source.
 .Sh BUGS
 Still two or more left.
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility and this manual page were written by 
diff --git a/usr.sbin/i4b/isdntelctl/isdntelctl.8 b/usr.sbin/i4b/isdntelctl/isdntelctl.8
index 617a2a1864b0..ecdf0e5bd4fe 100644
--- a/usr.sbin/i4b/isdntelctl/isdntelctl.8
+++ b/usr.sbin/i4b/isdntelctl/isdntelctl.8
@@ -90,7 +90,7 @@ displays the currently used sound format for device /dev/i4btel0.
 .Xr g711conv 1
 .Xr isdnd 8   
 .Xr isdnd.rc 5
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility and this manpage were written by 
diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8
index 0f5939305a7b..87fe0e84994b 100644
--- a/usr.sbin/i4b/isdntest/isdntest.8
+++ b/usr.sbin/i4b/isdntest/isdntest.8
@@ -105,7 +105,7 @@ has to be finished by the user by entering Control-C.
 .Sh FILES
 /dev/i4b
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility and this manpage were written by 
diff --git a/usr.sbin/i4b/isdntrace/isdntrace.8 b/usr.sbin/i4b/isdntrace/isdntrace.8
index 923c09de7548..fee2df48d399 100644
--- a/usr.sbin/i4b/isdntrace/isdntrace.8
+++ b/usr.sbin/i4b/isdntrace/isdntrace.8
@@ -215,7 +215,7 @@ ETSI Recommendation ETS 300 181 (04/93), ETS 300 182 (04/93)
 .Pp
 ITU Recommendation X.208, X.209
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility was written by 
diff --git a/usr.sbin/i4b/ispppcontrol/ispppcontrol.8 b/usr.sbin/i4b/ispppcontrol/ispppcontrol.8
index 65095578d0f2..097844469b0b 100644
--- a/usr.sbin/i4b/ispppcontrol/ispppcontrol.8
+++ b/usr.sbin/i4b/ispppcontrol/ispppcontrol.8
@@ -238,7 +238,7 @@ utility is based on the
 .Xr spppcontrol 8
 utility which appeared in
 .Fx 3.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 The program was written by
 .ie t J\(:org Wunsch,
 .el Joerg Wunsch,
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index eab852eabcc6..4f4011064fc0 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -104,7 +104,7 @@ Charging information from the kernel.
 .Pp
 .Sh SEE ALSO
 .Xr isdnd 8
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4bctl.4 b/usr.sbin/i4b/man/i4bctl.4
index c059ff20f14b..bfc5a08c03aa 100644
--- a/usr.sbin/i4b/man/i4bctl.4
+++ b/usr.sbin/i4b/man/i4bctl.4
@@ -46,7 +46,7 @@ utility to get and set the current debugging level and other information
 of the isdn4bsd package kernel ISDN handling layers.
 .Sh SEE ALSO
 .Xr isdndebug 8
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4bing.4 b/usr.sbin/i4b/man/i4bing.4
index 2a8e3ce72e07..e29fd455d49d 100644
--- a/usr.sbin/i4b/man/i4bing.4
+++ b/usr.sbin/i4b/man/i4bing.4
@@ -61,7 +61,7 @@ daemon to establish a connection.
 .Xr isdnd 8
 .Xr isdnd.rc 5
 .Xr netgraph 4
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index 847676dd805c..8b921dfa5471 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -94,7 +94,7 @@ for
 .Xr isdnd.rc 5
 .Xr bpf 4
 .Xr tcpdump 1
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index 584737c7c16c..53e074b77dc5 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -119,7 +119,7 @@ for a more detailed discussion of the flags,
 .Xr sppp 4
 .Xr bpf 4
 .Xr tcpdump 1
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver was written by 
diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4
index 8d56732fa734..96805a9547db 100644
--- a/usr.sbin/i4b/man/i4bq921.4
+++ b/usr.sbin/i4b/man/i4bq921.4
@@ -45,7 +45,7 @@ is the ISDN D channel layer 2 handler.
 ITU Recommendation Q.920 and Q.921
 .Sh SEE ALSO
 .Xr i4bq931 4
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4
index a70a942eb64b..11f8c2da9536 100644
--- a/usr.sbin/i4b/man/i4bq931.4
+++ b/usr.sbin/i4b/man/i4bq931.4
@@ -45,7 +45,7 @@ is the ISDN D channel layer 2 handler.
 ITU Recommendation Q.930 and Q.931
 .Sh SEE ALSO
 .Xr i4bq921 4
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4
index ac0ca714f381..724eecea2ba5 100644
--- a/usr.sbin/i4b/man/i4brbch.4
+++ b/usr.sbin/i4b/man/i4brbch.4
@@ -46,7 +46,7 @@ part of the isdn4bsd package.
 .Sh SEE ALSO
 .Xr isdnd 8
 .Xr isdnd.rc 5
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index 34ae07b9616b..dd689ad285ba 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -129,7 +129,7 @@ A-Law and u-Law are specified in ITU Recommendation G.711.
 .Xr isdnphone 1
 .Xr isdnd 8
 .Xr isdnd.rc 5
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index 020ac6c86ebe..15ab4a865ef6 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -48,7 +48,7 @@ utility.
 .Sh SEE ALSO
 .Xr isdnd 8
 .Xr isdntrace 8
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/ifpi.4 b/usr.sbin/i4b/man/ifpi.4
index 6e3f6b8e0e13..9a2a51b3fcc9 100644
--- a/usr.sbin/i4b/man/ifpi.4
+++ b/usr.sbin/i4b/man/ifpi.4
@@ -59,7 +59,7 @@ CCITT Recommendation I.430
 .Xr i4bq921 4
 .Xr i4bq931 4
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver was written by
diff --git a/usr.sbin/i4b/man/ifpnp.4 b/usr.sbin/i4b/man/ifpnp.4
index dfdee52a0f42..7369968b0c9c 100644
--- a/usr.sbin/i4b/man/ifpnp.4
+++ b/usr.sbin/i4b/man/ifpnp.4
@@ -59,7 +59,7 @@ CCITT Recommendation I.430
 .Sh SEE ALSO
 .Xr i4bq921 4
 .Xr i4bq931 4
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver was written by
diff --git a/usr.sbin/i4b/man/ihfc.4 b/usr.sbin/i4b/man/ihfc.4
index 601296dac199..75ca1213137b 100644
--- a/usr.sbin/i4b/man/ihfc.4
+++ b/usr.sbin/i4b/man/ihfc.4
@@ -66,7 +66,7 @@ CCITT Recommendation I.430
 .Sh SEE ALSO
 .Xr i4bq921 4
 .Xr i4bq931 4
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver was written by
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index 040097677bdf..f4499a62bed4 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -363,7 +363,7 @@ CCITT Recommendation I.430
 .Xr i4bq921 4
 .Xr i4bq931 4
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver and this manpage were written by 
diff --git a/usr.sbin/i4b/man/iwic.4 b/usr.sbin/i4b/man/iwic.4
index b02f8d2b6269..4b08ef5e80dc 100644
--- a/usr.sbin/i4b/man/iwic.4
+++ b/usr.sbin/i4b/man/iwic.4
@@ -67,7 +67,7 @@ CCITT Recommendation I.430
 .Xr i4bq921 4
 .Xr i4bq931 4
 
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 driver was written by
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 4b493ccb5ad0..6c5fabc0ee90 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -173,7 +173,7 @@ for details.
 .Bl -tag -width /usr/share/syscons/keymaps/foo_bar -compact
 .It Pa /usr/share/syscons/keymaps/*
 keyboard map files
-.Sh EXAMPLE
+.Sh EXAMPLES
 The following command will load the keyboard map file
 .Pa /usr/share/syscons/keymaps/ru.koi8-r.kbd .
 .Pp
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 0f47cda479b6..748fbb035dd5 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -342,7 +342,7 @@ on 13 March 1998. The idea for creating the
 temporary root environment comes from Nik Clayton's
 make world tutorial which is referenced above.
 .Pp
-.Sh AUTHOR
+.Sh AUTHORS
 This manual page and the script itself were written by
 .An Douglas Barton Aq DougB@FreeBSD.org .
 .Sh BUGS
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 45d8485a93be..43e6f0fd9ed5 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -432,7 +432,7 @@ command with the
 option and see what it says.  If the command can identify
 the protocol type, no further investigation is necessary on your part.  
 You may start the daemon without explicitly specifying a protocol type
-.Pq see Sx EXAMPLE .
+.Pq see Sx EXAMPLES .
 .Pp
 The command may print 
 .Ar sysmouse
@@ -558,7 +558,7 @@ daemon
 .It Pa /var/run/MouseRemote
 UNIX-domain stream socket for X10 MouseRemote events
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Pp
 .Dl moused -p /dev/cuaa0 -i type
 .Pp
@@ -640,7 +640,7 @@ option to assign the physical right button to the logical middle button:
 .Xr screen 4 ,
 .Xr sysmouse 4 ,
 .Xr ums 4
-.Sh STANDARD
+.Sh STANDARDS
 The
 .Nm
 command partially supports
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index bf8b5c4b9de8..db2c9f79c03f 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -451,7 +451,7 @@ For convenience in sending signals,
 writes its pid to
 .Pa /var/run/mrouted.pid
 upon startup.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The routing tables look like this:
 .Pp
 .Bd -literal
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index f47e1618e648..34481ae89059 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -121,7 +121,7 @@ The
 .Dq help
 command displays the available
 commands, their usage and aliases, and a brief description.
-.Sh EXIT VALUE
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/usr.sbin/pccard/pccardd/pccard.conf.5 b/usr.sbin/pccard/pccardd/pccard.conf.5
index cee40c9ccc96..6fecac347a09 100644
--- a/usr.sbin/pccard/pccardd/pccard.conf.5
+++ b/usr.sbin/pccard/pccardd/pccard.conf.5
@@ -257,7 +257,7 @@ entries can match these entries secondly.
 The alias ``function'' can be used instead of ``generic'' because of
 the historical reason.
 .Pp  
-.Sh EXAMPLE
+.Sh EXAMPLES
 A typical configuration file may appear thus:
 .Bd -literal
 #
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.8 b/usr.sbin/pcvt/ispcvt/ispcvt.8
index bedd024583f4..01c17c9326cd 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.8
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.8
@@ -71,8 +71,8 @@ Specifying
 with the
 .Fl c
 option gives a verbose listing of the compile-time options.
-.Sh RETURN VALUE
-.Bl -tag -width Ds
+.Sh DIAGNOSTICS
+.Bl -tag -width Ds -compact
 .Pp
 .It Sy 0
 driver is pcvt and major and minor numbers match
diff --git a/usr.sbin/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5
index e91e71815d1b..60fb2376c9a6 100644
--- a/usr.sbin/pim6dd/pim6dd.conf.5
+++ b/usr.sbin/pim6dd/pim6dd.conf.5
@@ -131,7 +131,7 @@ are specified as a blank separated list of interfaces. Each interface is
 specified in the form of "name unit".
 .El
 .\"
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -literal -offset
 # phyint gif0 disable
 # phyint ep0 preference 101
diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5
index aac9fd869bbf..428406fefc51 100644
--- a/usr.sbin/pim6sd/pim6sd.conf.5
+++ b/usr.sbin/pim6sd/pim6sd.conf.5
@@ -307,7 +307,7 @@ specifies the interval of checking the rate in seconds.
 The default values are 50000 and 20, respectively.
 .El
 .\"
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -literal -offset
 # phyint gif0 disable;
 # phyint ep0 preference 101;
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index 17200341671a..b9994ec98ac9 100644
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ b/usr.sbin/pkg_install/version/pkg_version.1
@@ -197,7 +197,7 @@ Blindly running the output of this command may leave a system in an
 unusable state.
 .Pp
 .Dl % pkg_version -c > do_update
-.Sh AUTHOR
+.Sh AUTHORS
 .An Bruce A. Mah Aq bmah@FreeBSD.org
 .Sh CONTRIBUTORS
 .An Nik Clayton Aq nik@FreeBSD.org ,
diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5
index c5aec2f1401a..24d7eafd3eb4 100644
--- a/usr.sbin/rrenumd/rrenumd.conf.5
+++ b/usr.sbin/rrenumd/rrenumd.conf.5
@@ -232,7 +232,7 @@ each other.
 has just same syntax with above add|change|setglobal statement.
 .El
 .\"
-.Sh EXAMPLE
+.Sh EXAMPLES
 For each configuration file example shown below, we suppose
 every IPv6 subnet has its own prefix beginning with
 fec0:0:0::/48 and with its own subnet number. (in this case,
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index 53eb0ff09644..559b6a6a8136 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -237,7 +237,7 @@ capability.
 See
 .Xr termcap 5
 for details on the capability.
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -literal -offset
 #
 # common definitions.
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index c927477ed388..91be181add7c 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -183,7 +183,7 @@ If latter two parameters are omitted, they will not affect the
 corresponding SLIP configuration.
 If any of first two parameters is equal to zero, it will not affect
 the corresponding SLIP configuration.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The normal use of
 .Nm
 is to create a
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index b5149fe6068a..07b094bd9b6a 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -156,7 +156,7 @@ software font.
 See also
 .Sx Video Mode Support
 and
-.Sx EXAMPLE
+.Sx EXAMPLES
 below and the man page for
 .Xr syscons 4 .
 .It Fl s Ar number
@@ -257,7 +257,7 @@ font files.
 .It Pa /usr/share/syscons/scrnmaps/*
 screen output map files.
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 If you want to load
 .Pa /usr/share/syscons/fonts/iso-8x16.fnt
 to the kernel, run