diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1
index 1f58fc8738dd..0840c0914e5c 100644
--- a/libexec/getNAME/getNAME.1
+++ b/libexec/getNAME/getNAME.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: $
+.\" $Id: getNAME.1,v 1.1 1996/07/08 20:17:39 wosch Exp $
 
 .Dd July 8, 1996
 .Dt getNAME 1
@@ -65,4 +65,5 @@ print type of manual page (OLD, NEW, UNKNOWN).
 .Sh HISTORY
 The manual page for
 .Nm
-command appeared in FreeBSD 2.2.
+command appeared in
+.Fx 2.2 .
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 8417d108a225..6d050ce22f4b 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: dumpon.8,v 1.1 1995/05/12 19:10:08 wollman Exp $
+.\"	$Id: dumpon.8,v 1.2 1996/02/12 01:20:09 mpp Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
@@ -97,5 +97,4 @@ is taken, it is not possible to send crash dumps directly to a file.
 The
 .Nm
 command appeared in
-.Tn FreeBSD
-2.1.
+.Fx 2.1 .
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index c1f63a25306f..fc95cf05075d 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -349,4 +349,5 @@ Archie Cobbs.
 API based upon code written by Daniel Boulet for BSDI.
 .Sh HISTORY
 .Nm
-first appeared in FreeBSD 2.0.
+first appeared in
+.Fx 2.0 .
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index a222e51eef6e..01bce0a113b7 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -71,4 +71,5 @@ man page for possible options and their meanings.
 .Sh HISTORY
 The
 .Nm mount_ext2fs
-function first appeared in FreeBSD 2.2.
+function first appeared in
+.Fx 2.2 .
diff --git a/sbin/mount_std/mount_devfs.8 b/sbin/mount_std/mount_devfs.8
index 8c4d63ad9e1b..14d8b0c8477f 100644
--- a/sbin/mount_std/mount_devfs.8
+++ b/sbin/mount_std/mount_devfs.8
@@ -87,4 +87,5 @@ This filesystem may not be NFS-exported.
 .Sh HISTORY
 The
 .Nm mount_devfs
-utility first appeared in FreeBSD 2.0
+utility first appeared in
+.Fx 2.0 .
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 15fc65e8be3c..680c8fa9c50a 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: mount_std.8,v 1.1 1996/05/13 17:43:16 wollman Exp $
+.\"	$Id: mount_std.8,v 1.2 1996/05/14 15:16:46 wollman Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
@@ -135,4 +135,3 @@ the
 .Dq devfs
 filesystem type first appeared in
 .Fx 2.2 .
-
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index 5735e1badda8..e0f62f5e0b10 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -39,7 +39,7 @@
 .\" SUCH DAMAGE.
 .\" 
 .\"
-.\"	$Id: scsi.8,v 1.4 1995/05/01 12:35:04 dufault Exp $
+.\"	$Id: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
 .\"
 .Dd October 11, 1993
 .Dt SCSI 8
@@ -130,9 +130,13 @@ for a description of the "super scsi" device.
 .Pp
 The
 .Fr -r
-option can be used in FreeBSD 1.1 to reprobe a specific SCSI device at a given
+option can be used in 
+.Tn FreeBSD 
+1.1 to reprobe a specific SCSI device at a given
 Bus, Target and Lun.
-This is not needed in FreeBSD 2.1, since opening a fixed SCSI device
+This is not needed in
+.Fx 2.1 ,
+since opening a fixed SCSI device
 has the side effect of reprobing it, and probing with the bus with the
 -p option should bring on line any newly found devices.
 See
diff --git a/sbin/scsiformat/scsiformat.8 b/sbin/scsiformat/scsiformat.8
index fac307a39730..b781699d5949 100644
--- a/sbin/scsiformat/scsiformat.8
+++ b/sbin/scsiformat/scsiformat.8
@@ -94,7 +94,9 @@ may be useful, however.
 .Sh HISTORY
 The
 .Nm scsiformat
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
 This version has been reworked as a wrapper around
 .Xr scsi 8
-by Peter Dufault for FreeBSD 2.1 .
+by Peter Dufault for
+.Fx 2.1 .
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 503ff29500cf..eee62ef8c0ae 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: sysctl.8,v 1.7 1995/12/21 12:39:24 phk Exp $
+.\"	$Id: sysctl.8,v 1.8 1996/01/30 13:52:15 mpp Exp $
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
@@ -240,6 +240,10 @@ and name information.
 This correct interface is being thought about for the time being.
 .Sh HISTORY
 .Nm sysctl
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .
 .Pp
-In FreeBSD 2.2 sysctl was significantly remodeled.
+In 
+.Fx 2.2
+.Nm sysctl
+was significantly remodeled.
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index a952a7bf51c1..e6cd0c5cb76f 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $Id: fetch.1,v 1.4 1996/08/14 17:50:22 jkh Exp $
+.\" $Id: fetch.1,v 1.5 1996/08/22 21:30:50 jkh Exp $
 .Dd July 2, 1996
 .Dt FETCH 1
 .Os
@@ -129,4 +129,5 @@ an application firewall.
 .Sh HISTORY
 The 
 .Nm fetch
-command appeared in FreeBSD 2.1.5
+command appeared in
+.Fx 2.1.5 .
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 3307f0050038..bf939c33bbfb 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: killall.1,v 1.3 1996/02/03 22:52:26 wosch Exp $
+.\" $Id: killall.1,v 1.4 1996/05/30 22:04:05 smpatel Exp $
 .\"
 .Dd June 25, 1995
 .Os FreeBSD 2.2 
@@ -122,7 +122,9 @@ options.
 .Sh HISTORY
 The
 .Nm
-command appeared in FreeBSD 2.1.  It has been featured after the
+command appeared in
+.Fx 2.1 .
+It has been modeled after the
 .Nm
 command as available on other platforms.
 .Sh AUTHOR
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 934a49d8c687..54df0977c035 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -220,6 +220,7 @@ driver appeared in 386BSD 0.1 as a separate
 .Xr st 1
 command, and have been merged into the
 .Nm
-command in FreeBSD 2.1.
+command in
+.Fx 2.1 .
 .\" mt.1: mtio(4) missing
 .\" mt.1: wt(4) missing
diff --git a/usr.bin/sgmlfmt/sgmlfmt.1 b/usr.bin/sgmlfmt/sgmlfmt.1
index fd9bc221cef6..c332ccfc3dd5 100644
--- a/usr.bin/sgmlfmt/sgmlfmt.1
+++ b/usr.bin/sgmlfmt/sgmlfmt.1
@@ -146,7 +146,8 @@ format option.
 .Sh HISTORY
 The
 .Nm
-command appeared in Version 2.0.5 FreeBSD UNIX.
+command appeared in
+.Fx 2.0.5 .
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 62a4d2248634..f37f2f917725 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: which.1,v 1.3 1995/01/30 22:21:28 jkh Exp $
+.\" $Id: which.1,v 1.4 1996/08/17 23:31:38 wosch Exp $
 .Dd January 26, 1995
 .Dt WHICH 1
 .Os FreeBSD
@@ -55,7 +55,8 @@ none are found.
 .Sh HISTORY
 The
 .Nm
-command first appeared in FreeBSD 2.1
+command first appeared in
+.Fx 2.1 .
 .Sh SEE ALSO
 .Xr perl 1
 .Sh AUTHOR
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index e7afbc9ad84a..3a50a5422f1b 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -28,7 +28,7 @@
 .\"
 .\" /usr/sbin/adduser - add new user(s)
 .\"
-.\" $Id: adduser.8,v 1.8 1996/01/30 13:48:14 mpp Exp $
+.\" $Id: adduser.8,v 1.9 1996/06/09 20:45:35 wosch Exp $
 
 .Dd Jan, 9, 1995
 .Dt ADDUSER 8
@@ -249,4 +249,5 @@ logfile for adduser
 .Sh HISTORY
 The
 .Nm
-command appeared in FreeBSD 2.1
+command appeared in
+.Fx 2.1 .
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index 69b618821d01..ff8092a9fa55 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -156,4 +156,5 @@ Serge V.\ Vakulenko
 .Sh HISTORY
 The
 .Nm cdcontrol
-command appeared in FreeBSD 2.1
+command appeared in
+.Fx 2.1 .
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index af193f423802..c6f8fe396183 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -34,7 +34,7 @@
 .\"
 .\"   E-Mail: Wolfram Schneider <wosch@cs.tu-berlin.de>
 .\"
-.\" $Id: kbdmap.1,v 1.3 1996/02/11 22:33:15 mpp Exp $
+.\" $Id: kbdmap.1,v 1.4 1996/08/16 13:26:44 wosch Exp $
 .\"
 
 .Dd Mar 25, 1995
@@ -143,7 +143,8 @@ work only on a (virtual) console an not with X11.
 
 .Sh HISTORY
 .Nm kbdmap/vidfont
-command appeared in FreeBSD 2.1
+command appeared in
+.Fx 2.1 .
 
 .Sh AUTHOR
 Wolfram Schneider
diff --git a/usr.sbin/mkdosfs/mkdosfs.1 b/usr.sbin/mkdosfs/mkdosfs.1
index e08e7559a2e2..14e9813dfabf 100644
--- a/usr.sbin/mkdosfs/mkdosfs.1
+++ b/usr.sbin/mkdosfs/mkdosfs.1
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: mkdosfs.1,v 1.1.1.1 1995/11/05 16:02:04 joerg Exp $
+.\" $Id: mkdosfs.1,v 1.2 1996/01/30 02:35:04 joerg Exp $
 .\"
 .Dd November 5, 1995
 .Os
@@ -127,7 +127,7 @@ utility.
 .Sh HISTORY
 .Nm Mkdosfs
 appeared in
-.Em FreeBSD 2.2 .
+.Fx 2.2 .
 .Sh AUTHOR
 The program has been contributed by
 .if n Joerg Wunsch,
diff --git a/usr.sbin/qcamcontrol/qcamcontrol.1 b/usr.sbin/qcamcontrol/qcamcontrol.1
index 33f7a96c8c04..76d07636d872 100644
--- a/usr.sbin/qcamcontrol/qcamcontrol.1
+++ b/usr.sbin/qcamcontrol/qcamcontrol.1
@@ -61,4 +61,5 @@ Paul Traina
 .Sh HISTORY
 The
 .Nm qcamcontrol
-command appeared in FreeBSD 2.1.1
+command appeared in
+.Fx 2.1.5 .
diff --git a/usr.sbin/rndcontrol/random.4 b/usr.sbin/rndcontrol/random.4
index 1f823fa8a00f..1545133c5cc3 100644
--- a/usr.sbin/rndcontrol/random.4
+++ b/usr.sbin/rndcontrol/random.4
@@ -36,7 +36,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $Id: random.4,v 1.1.1.1 1995/10/28 17:04:25 markm Exp $
 .\"
 .Dd October 21, 1995
 .Dt RANDOM 4 i386
@@ -175,4 +175,4 @@ The
 .Nm random ,
 .Nm urandom
 files appeared in
-FreeBSD v2.2 .
+.Fx 2.1.5 .
diff --git a/usr.sbin/rndcontrol/rndcontrol.8 b/usr.sbin/rndcontrol/rndcontrol.8
index fb02a6c85b07..af80ef644a66 100644
--- a/usr.sbin/rndcontrol/rndcontrol.8
+++ b/usr.sbin/rndcontrol/rndcontrol.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: rndcontrol.8,v 1.2 1995/12/27 11:40:45 markm Exp $
+.\" $Id: rndcontrol.8,v 1.3 1996/06/26 17:11:04 markm Exp $
 .\"
 .Dd October 20, 1995
 .Dt RNDCONTROL 8
@@ -86,4 +86,5 @@ Theodore Ts'o wrote the core code. Mark Murray ported this code to
 FreeBSD and wrote the support routines and constructed the man pages.
 .Sh HISTORY
 .Nm rndcontrol
-first appeared in FreeBSD 2.1.5
+first appeared in
+.Fx 2.1.5 .
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index efde241a62c7..4a96437b378c 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rtprio.1,v 1.4 1996/01/30 13:50:29 mpp Exp $
+.\"	$Id: rtprio.1,v 1.5 1996/02/11 22:36:44 mpp Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -172,7 +172,7 @@ To make depend while not disturbing other machine usage:
 The
 .Nm rtprio
 utility appeared in
-FreeBSD 2.0,
+.Fx 2.0 ,
 but is similar to the HP-UX version.
 .Sh CAVEATS
 You can lock yourself out of the system by placing a cpu-heavy
@@ -182,12 +182,12 @@ There is no way to set/view the realtime priority of process 0
 (swapper) (see ps(1)).
 
 There is in
-FreeBSD
+.Tn FreeBSD
 no way to ensure that a process page is present in memory therefore
 the process may be stopped for pagein. (See mprotect(2), madvise(2)).
 
 Under
-FreeBSD
+.Tn FreeBSD
 system calls are currently never preempted, therefore non-realtime
 processes can starve realtime processes, or idletime processes can
 starve normal priority processes.
@@ -195,4 +195,6 @@ starve normal priority processes.
 Others ...
 .Sh AUTHOR
 Henrik Vestergaard Draboel - hvd@terry.ping.dk is the original author. This
-implementation in FreeBSD was substantially rewritten by David Greenman.
+implementation in
+.Tn FreeBSD 
+was substantially rewritten by David Greenman.
diff --git a/usr.sbin/sysctl/sysctl.8 b/usr.sbin/sysctl/sysctl.8
index 503ff29500cf..eee62ef8c0ae 100644
--- a/usr.sbin/sysctl/sysctl.8
+++ b/usr.sbin/sysctl/sysctl.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: sysctl.8,v 1.7 1995/12/21 12:39:24 phk Exp $
+.\"	$Id: sysctl.8,v 1.8 1996/01/30 13:52:15 mpp Exp $
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
@@ -240,6 +240,10 @@ and name information.
 This correct interface is being thought about for the time being.
 .Sh HISTORY
 .Nm sysctl
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .
 .Pp
-In FreeBSD 2.2 sysctl was significantly remodeled.
+In 
+.Fx 2.2
+.Nm sysctl
+was significantly remodeled.
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index d0b2a3f0392b..50bd5b87414d 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -76,4 +76,5 @@ All user output is reproduced as-is.
 Ugen J.S. Antsilevich <ugen@NetVision.net.il> 
 .Sh HISTORY
 .Nm Watch
-first appeared in FreeBSD 2.1
+first appeared in
+.Fx 2.1 .
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 988f4ac2bdc4..770692a17a9a 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ypserv.8,v 1.6 1996/02/26 20:09:22 guido Exp $
+.\"	$Id: ypserv.8,v 1.7 1996/04/07 00:06:21 mpp Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -355,4 +355,5 @@ Bill Paul <wpaul@ctr.columbia.edu>
 .Sh HISTORY
 This version of
 .Nm ypserv
-first appeared in FreeBSD 2.2.
+first appeared in
+.Fx 2.2 .