7 files changed, 3 insertions, 58 deletions
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/man4.i386/alpm.4
index 3c5621b..64b9ff9 100644
--- a/share/man/man4/man4.i386/alpm.4
+++ b/share/man/man4/man4.i386/alpm.4
@@ -24,13 +24,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd February, 1999
 .Dt ALPM 4 i386
-.\" Note: Only specify the operating system when the command
-.\" is FreeBSD specific, otherwise use the .Os macro with no
-.\" arguments.
 .Os FreeBSD
 .Sh NAME
 .Nm alpm
@@ -38,7 +33,6 @@
 .Sh SYNOPSIS
 .Cd controller smbus
 .Cd controller alpm0
-
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn Aladdin 15x3 Power Management Unit. Currently, only smbus controller 
@@ -49,7 +43,6 @@ to the monitoring facilities of your mainboard. See
 .Xr smb 4
 for writing user code to fetch voltages, temperature and so on from the
 monitoring chip of your mainboard.
-
 .Sh SEE ALSO
 .Xr smb 4 ,
 .Xr smbus 4
diff --git a/share/man/man4/man4.i386/si.4 b/share/man/man4/man4.i386/si.4
index a4648c7..8f6cc91 100644
--- a/share/man/man4/man4.i386/si.4
+++ b/share/man/man4/man4.i386/si.4
@@ -1,5 +1,4 @@
 .\" $FreeBSD$
-.\" The following requests are required for all man pages.
 .Dd September 16, 1995
 .Os FreeBSD
 .Dt SI 4 i386
@@ -101,11 +100,6 @@ To manipulate the initial/locked settings, the
 command is useful.  When setting the "locked" variables, enabling the mode
 on the lock device will lock the termios mode, while disabling the mode will
 unlock it.
-.\" The following requests should be uncommented and used where appropriate.
-.\" This next request is for sections 2 and 3 function return values only.
-.\" .Sh RETURN VALUES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\" .Sh ENVIRONMENT
 .Sh FILES
 .Bl -tag -width /dev/si_control -compact
 .It Pa /dev/si_control
@@ -124,12 +118,6 @@ initial termios state devices for dialout ports
 .It Pa /dev/cualA*
 locked termios state devices for dialout ports
 .El
-.\" .Sh EXAMPLES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\"     (command return values (to shell) and fprintf/stderr type diagnostics)
-.\" .Sh DIAGNOSTICS
-.\" The next request is for sections 2 and 3 error and signal handling only.
-.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr stty 1 ,
 .Xr sio 4 ,
@@ -137,7 +125,6 @@ locked termios state devices for dialout ports
 .Xr tty 4 ,
 .Xr comcontrol 8 ,
 .Xr sicontrol 8
-.\" .Sh STANDARDS
 .Sh HISTORY
 This driver is loosely based on driver code originating at Specialix, which
 was ported to run on BSDI by
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index a4648c7..8f6cc91 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -1,5 +1,4 @@
 .\" $FreeBSD$
-.\" The following requests are required for all man pages.
 .Dd September 16, 1995
 .Os FreeBSD
 .Dt SI 4 i386
@@ -101,11 +100,6 @@ To manipulate the initial/locked settings, the
 command is useful.  When setting the "locked" variables, enabling the mode
 on the lock device will lock the termios mode, while disabling the mode will
 unlock it.
-.\" The following requests should be uncommented and used where appropriate.
-.\" This next request is for sections 2 and 3 function return values only.
-.\" .Sh RETURN VALUES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\" .Sh ENVIRONMENT
 .Sh FILES
 .Bl -tag -width /dev/si_control -compact
 .It Pa /dev/si_control
@@ -124,12 +118,6 @@ initial termios state devices for dialout ports
 .It Pa /dev/cualA*
 locked termios state devices for dialout ports
 .El
-.\" .Sh EXAMPLES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\"     (command return values (to shell) and fprintf/stderr type diagnostics)
-.\" .Sh DIAGNOSTICS
-.\" The next request is for sections 2 and 3 error and signal handling only.
-.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr stty 1 ,
 .Xr sio 4 ,
@@ -137,7 +125,6 @@ locked termios state devices for dialout ports
 .Xr tty 4 ,
 .Xr comcontrol 8 ,
 .Xr sicontrol 8
-.\" .Sh STANDARDS
 .Sh HISTORY
 This driver is loosely based on driver code originating at Specialix, which
 was ported to run on BSDI by
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 3aedb66..14d79a5 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -24,8 +24,6 @@
 .\"
 .\" $FreeBSD$
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd April 25, 1999
 .Dt LOADER.4TH 8
 .Os
@@ -191,4 +189,3 @@ was written by
 .An Daniel C. Sobral Aq dcs@freebsd.org .
 .Sh BUGS
 A british espionage series.
-
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 084b3db..77a670b 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -5,6 +5,8 @@
 .\"
 .\" Author: Stephen McKay
 .\"
+.\" $FreeBSD$
+.\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
 .Os
@@ -465,17 +467,9 @@ These messages go to
 or to the log file.  Messages from
 .Xr ctm
 turn up here too.  Error messages should be self explanatory.
-.\" The next request is for sections 2 and 3 error and signal handling only.
-.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr ctm 1 ,
 .Xr ctm 5
-.\" .Sh STANDARDS
 .\" .Sh HISTORY
 .Sh AUTHORS
 .An Stephen McKay Aq mckay@FreeBSD.org
-.\" .Sh BUGS
-.\" Gosh!  No bugs here!
-.\" This message brought to you by the Coalition for More Humour in Man Pages.
-.\"
-.\" $FreeBSD$
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index 3528a2e..be965a7 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.\" The following requests are required for all man pages.
+.\"
 .Dd September 26,1995
 .Dt SICONTROL 8
 .Os FreeBSD
@@ -67,11 +67,6 @@ wedged.
 Show the current "tty" structure that the kernel has for the specified port.
 This is not much use outside of debugging the driver.
 .El
-.\" The following requests should be uncommented and used where appropriate.
-.\" This next request is for sections 2 and 3 function return values only.
-.\" .Sh RETURN VALUES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\" .Sh ENVIRONMENT
 .Sh FILES
 .Bl -tag -width /dev/si_control -compact
 .It Pa /dev/si_control
@@ -86,20 +81,14 @@ initial termios state devices, for use by
 locked termios state devices, for use by
 .Xr stty 1
 .El
-.\" .Sh EXAMPLES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\"     (command return values (to shell) and fprintf/stderr type diagnostics)
 .Sh DIAGNOSTICS
 Generally self explanatory.....
-.\" The next request is for sections 2 and 3 error and signal handling only.
-.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr stty 1 ,
 .Xr si 4 ,
 .Xr termios 4 ,
 .Xr tty 4 ,
 .Xr comcontrol 8 .
-.\" .Sh STANDARDS
 .Sh HISTORY
 .Nm Sicontrol
 is loosely based on a utility called
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 5a71ce0..49e6670 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -131,8 +131,6 @@ arguments may be used to supplant the defaults.
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr setsockopt 2
-.\".Xr setsockopt 2 ,
-.\".Xr trsp 8
 .Sh DIAGNOSTICS
 .Bl -tag -width Ds
 .It Sy no namelist