Use the .Fx macro for FreeBSD references for releases prior to 2.0.

Use the .Tn macro for generic FreeBSD references.  Cleanup other
formatting problems noticed while making the above changes.

31 files changed, 372 insertions, 172 deletions

diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 8f82c3c..84a188e 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: cd.4,v 1.10 1997/02/22 13:24:23 peter Exp $
 .\"
 .Dd January 16, 1996
 .Dt CD 4
@@ -63,12 +63,16 @@ bus is scanned for devices. Any devices found which answer as `Read-only'
 type devices will be `attached' to the 
 .Nm
 driver.
-In FreeBSD releases prior to 2.1, the first found will be attached as
+Prior to
+.Fx 2.1 ,
+the first device found will be attached as
 .Li cd0
 the next, 
 .Li cd1 ,
 etc.
-Beginning in 2.1 it is possible to specify what cd unit a device should
+Beginning in
+.Fx 2.1
+it is possible to specify what cd unit a device should
 come on line as; refer to
 .Xr scsi 4
 for details on kernel configuration.
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index 0b4c0a9..6fd1017 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $
-.\"	$Id: cy.4,v 1.6 1997/02/22 13:25:15 peter Exp $
+.\"	$Id: cy.4,v 1.7 1997/03/03 18:38:37 bde Exp $
 .\"
 .Dd October 10, 1995
 .Dt CY 4 i386
@@ -223,7 +223,8 @@ changed for higher efficiency:
 .Pp
 RxFifoThreshold: default 6; on a 486DX-33, this works for 8 ports
 talking to each other at 115200 bps; 11 works for 8 ports talking
-to each other at 57600 bps.  The low threshold is not for FreeBSD,
+to each other at 57600 bps.  The low threshold is not for
+.Tn FreeBSD ,
 it's for the CD1400, which can't really keep up with 115200 bps.
 .Pp
 PollMode: required for Cyclom-16Y's; costs 10-20% relative efficiency
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 6545cfc..347164e 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ed.4,v 1.8 1997/02/22 13:25:18 peter Exp $
+.\"	$Id: ed.4,v 1.9 1997/02/28 02:20:42 mpp Exp $
 .\"
 .Dd October 28, 1995
 .Dt ED 4 i386
@@ -82,7 +82,9 @@ identify themselves as 8bit, even though they have a 16bit ISA interface.
 Disable transmitter multi-buffering. This flag disables the use of multiple
 transmit buffers and may be necessary in rare cases where packets are sent out
 faster than a machine on the other end can handle (as evidenced by severe packet
-lossage). Some (non-FreeBSD :-)) machines have terrible ethernet performance
+lossage). Some
+.Pf ( No non- Ns Tn FreeBSD
+:-)) machines have terrible ethernet performance
 and simply can't cope with 1100K+ data rates. Use of this flag also provides
 one more packet worth of receiver buffering, and on 8bit cards, this may help
 reduce receiver lossage.
@@ -164,7 +166,8 @@ have been received but not yet transfered from the card to main memory.
 .Sh HISTORY
 The
 .Nm ed
-device driver first appeared in FreeBSD 1.0.
+device driver first appeared in
+.Fx 1.0 .
 .Sh AUTHOR
 The
 .Nm
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index 8af9217..cf1983fa 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -2,7 +2,7 @@
 .\" Copyright (c) 1995, Matt Thomas
 .\" All rights reserved.
 .\"
-.\"	$Id$
+.\"	$Id: fpa.4,v 1.8 1997/02/22 13:24:29 peter Exp $
 .\"
 .Dd March 13, 1995
 .Dt FPA 4 i386
@@ -15,7 +15,8 @@
 .Cd "device fpa0"
 .Cd "device fea0"
 .Pp
-FreeBSD only:
+.Tn FreeBSD
+only:
 .Cd "pseudo-device fddi"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index d40503e..23cfb8d 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $Id: ar.4,v 1.5 1997/02/22 13:25:12 peter Exp $
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
@@ -51,7 +51,9 @@ HD64570 chip. Both the 2 and 4 port cards is supported and auto detected.
 Line speeds of up to 2Mbps is possible. At this speed about 85% of the
 bandwidth is usable with 486DX processors.
 .Pp
-The standard FreeBSD sppp code is used for the link level layer. The
+The standard
+.Tn FreeBSD
+sppp code is used for the link level layer. The
 default protocol used is PPP. The Cisco HDLC protocol can be used by
 adding
 .Ar link2
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index 0b4c0a9..6fd1017 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/cy.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $
-.\"	$Id: cy.4,v 1.6 1997/02/22 13:25:15 peter Exp $
+.\"	$Id: cy.4,v 1.7 1997/03/03 18:38:37 bde Exp $
 .\"
 .Dd October 10, 1995
 .Dt CY 4 i386
@@ -223,7 +223,8 @@ changed for higher efficiency:
 .Pp
 RxFifoThreshold: default 6; on a 486DX-33, this works for 8 ports
 talking to each other at 115200 bps; 11 works for 8 ports talking
-to each other at 57600 bps.  The low threshold is not for FreeBSD,
+to each other at 57600 bps.  The low threshold is not for
+.Tn FreeBSD ,
 it's for the CD1400, which can't really keep up with 115200 bps.
 .Pp
 PollMode: required for Cyclom-16Y's; costs 10-20% relative efficiency
diff --git a/share/man/man4/man4.i386/ed.4 b/share/man/man4/man4.i386/ed.4
index 6545cfc..347164e 100644
--- a/share/man/man4/man4.i386/ed.4
+++ b/share/man/man4/man4.i386/ed.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ed.4,v 1.8 1997/02/22 13:25:18 peter Exp $
+.\"	$Id: ed.4,v 1.9 1997/02/28 02:20:42 mpp Exp $
 .\"
 .Dd October 28, 1995
 .Dt ED 4 i386
@@ -82,7 +82,9 @@ identify themselves as 8bit, even though they have a 16bit ISA interface.
 Disable transmitter multi-buffering. This flag disables the use of multiple
 transmit buffers and may be necessary in rare cases where packets are sent out
 faster than a machine on the other end can handle (as evidenced by severe packet
-lossage). Some (non-FreeBSD :-)) machines have terrible ethernet performance
+lossage). Some
+.Pf ( No non- Ns Tn FreeBSD
+:-)) machines have terrible ethernet performance
 and simply can't cope with 1100K+ data rates. Use of this flag also provides
 one more packet worth of receiver buffering, and on 8bit cards, this may help
 reduce receiver lossage.
@@ -164,7 +166,8 @@ have been received but not yet transfered from the card to main memory.
 .Sh HISTORY
 The
 .Nm ed
-device driver first appeared in FreeBSD 1.0.
+device driver first appeared in
+.Fx 1.0 .
 .Sh AUTHOR
 The
 .Nm
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 5e78b5e..798e2b6 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/man4.i386/io.4
@@ -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$
+.\" $Id: io.4,v 1.4 1997/02/22 13:25:31 peter Exp $
 .\"
 .Dd Jan 1, 1996
 .Dt IO 4 i386
@@ -62,4 +62,4 @@ that even read/only access will grant the full I/O privileges.
 The
 .Nm io
 file appeared in
-FreeBSD 1.0.
+.Fx 1.0 .
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 1072e80..16a3ba4 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -24,7 +24,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$
+.\"	$Id: mcd.4,v 1.3 1997/03/07 02:49:51 jmg Exp $
 .\"
 .Dd December 8, 1994
 .Dt MCD 4 i386
@@ -145,4 +145,5 @@ Andrew A. Chernov, and Jordan K. Hubbard.
 .Sh HISTORY
 An
 .Nm mcd
-driver appeared in FreeBSD Release 1.0.
+driver appeared in
+.Fx 1.0.
diff --git a/share/man/man4/man4.i386/meteor.4 b/share/man/man4/man4.i386/meteor.4
index 1c64998..d8bc409 100644
--- a/share/man/man4/man4.i386/meteor.4
+++ b/share/man/man4/man4.i386/meteor.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id$
+.\"	$Id: meteor.4,v 1.5 1997/03/07 02:49:52 jmg Exp $
 .\"
 .Dd August 15, 1995
 .br
@@ -35,7 +35,9 @@ The files required for Matrox Meteor card are:
 /usr/include/machine/ioctl_meteor.h)
 .br
 .in -0.5i
-For FreeBSD release versions 2.1 and earlier, the following patch files are also required:
+For
+.Tn FreeBSD
+release versions 2.1 and earlier, the following patch files are also required:
 .br
 .in +0.5i
 meteor/usr/sys/i386/i386/conf.patch
diff --git a/share/man/man4/man4.i386/pcvt.4 b/share/man/man4/man4.i386/pcvt.4
index 4152aae..372f15f 100644
--- a/share/man/man4/man4.i386/pcvt.4
+++ b/share/man/man4/man4.i386/pcvt.4
@@ -31,7 +31,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)pcvt.4, 3.20, Last Edit-Date: [Sun Apr  2 18:23:39 1995]
-.\"	$Id$
+.\"	$Id: pcvt.4,v 1.7 1997/03/07 02:49:54 jmg Exp $
 .\"
 .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93
 .\" by Joerg Wunsch
@@ -166,9 +166,11 @@ The
 .Nm pcvt
 console driver is currently available for the Intel-based BSD operating
 systems
-.Em NetBSD/i386 Pq release 0.9 or higher,
+.Tn NetBSD/i386
+(release 0.9 or higher),
 and
-.Em FreeBSD Pq release 1.0-GAMMA or higher .
+.Tn FreeBSD
+(release 1.0-GAMMA or higher) .
 In order to get the appropriate system support, one of the options
 .Em PCVT_NETBSD ,
 or
@@ -176,13 +178,13 @@ or
 must be defined in the system's config file
 .Pq see Xr config 8 .
 In addition, for the
-.Em FreeBSD
+.Tn FreeBSD
 and
-.Em NetBSD
+.Tn NetBSD
 operating systems, it is necessary to set this option to the operating
 system's version number.
 For
-.Em FreeBSD
+.Tn FreeBSD
 this version number must be expressed as a 3-digit number.
 E.\& g., if you are running the 1.0 release
 .Pq which is actually version 1.0.2 ,
@@ -194,8 +196,15 @@ For
 .Em NetBSD
 this version number must be expressed as 9 if you are running NetBSD 0.9
 and anything greater than 9 for NetBSD-current (pre 1.0). It is recommended
-to use (as with FreeBSD) 100 for NetBSD 1.0 and 999 for NetBSD-current.
-E.\& g., if you are running the NetBSD 1.0 release, you should define
+to use (as with
+.Tn FreeBSD )
+100 for
+.Nx 1.0
+and 999 for
+.Tn NetBSD-current.
+E.g., if you are running the
+.Nx 1.0
+release, you should define
 
 .Em PCVT_NETBSD = 100
 
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index e368d10..c999289 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id$
+.\"	$Id: spkr.4,v 1.8 1997/03/07 02:49:58 jmg Exp $
 .\"
 .Dd November 7, 1993
 .Dt SPKR 4 i386
@@ -15,7 +15,8 @@
 The speaker device driver allows applications to control the PC console
 speaker on an 
 .Tn IBM-PC Ns --compatible
-machine running FreeBSD.
+machine running
+.Tn FreeBSD .
 .Pp
 Only one process may have this device open at any given time; 
 .Xr open 2
@@ -219,4 +220,5 @@ Andrew A. Chernov <ache@astral.msk.su>
 .Sh HISTORY
 The
 .Nm
-device appeared in FreeBSD 1.0.
+device appeared in
+.Fx 1.0 .
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 71fba77..81c4689 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $Id: sr.4,v 1.5 1997/02/22 13:25:43 peter Exp $
 .\"
 .Dd July 4, 1996
 .Dt SR 4 i386
@@ -50,7 +50,9 @@ HD64570 chip.
 Line speeds of up to 2Mbps is possible. At this speed about 95% of the
 bandwidth is usable with 486DX processors.
 .Pp
-The standard FreeBSD sppp code is used for the link level layer. The
+The standard
+.Tn FreeBSD
+sppp code is used for the link level layer. The
 default protocol used is PPP. The Cisco HDLC protocol can be used by
 adding
 .Em link2
diff --git a/share/man/man4/man4.i386/tw.4 b/share/man/man4/man4.i386/tw.4
index f89267a..724a1bf 100644
--- a/share/man/man4/man4.i386/tw.4
+++ b/share/man/man4/man4.i386/tw.4
@@ -27,11 +27,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: tw.4,v 1.6 1997/02/22 13:25:43 peter Exp $
 .\"
 .Dd Oct 30, 1993
 .Dt TW 4 i386
-.Os BSD FreeBSD
+.Os FreeBSD
 .Sh NAME
 .Nm tw
 .Nd TW-523 X-10 device driver
diff --git a/share/man/man4/man4.i386/ze.4 b/share/man/man4/man4.i386/ze.4
index d9c23c7..6125d3b 100644
--- a/share/man/man4/man4.i386/ze.4
+++ b/share/man/man4/man4.i386/ze.4
@@ -23,7 +23,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$
+.\" $Id: ze.4,v 1.3 1997/02/22 13:25:46 peter Exp $
 .\"
 .Dd January 19, 1997
 .Dt ZE 4 i386
@@ -69,12 +69,15 @@ Currently the driver does not support multicast.
 .Sh HISTORY
 The
 .Nm
-device driver first appeared in FreeBSD 1.1.5.
+device driver first appeared in
+.Fx 1.1.5 .
 .Sh AUTHORS
 The
 .Nm
 device driver was written by Keith Moore.
 It is based on work originally by David Greenman, where
 Keith made PCMCIA modifications and additions.
-It was adapted for FreeBSD 1.1.5 by Jordan Hubbard.
+It was adapted for
+.Fx 1.1.5
+by Jordan Hubbard.
 This manual page was written by David E. O'Brien.
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 4152aae..372f15f 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -31,7 +31,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)pcvt.4, 3.20, Last Edit-Date: [Sun Apr  2 18:23:39 1995]
-.\"	$Id$
+.\"	$Id: pcvt.4,v 1.7 1997/03/07 02:49:54 jmg Exp $
 .\"
 .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93
 .\" by Joerg Wunsch
@@ -166,9 +166,11 @@ The
 .Nm pcvt
 console driver is currently available for the Intel-based BSD operating
 systems
-.Em NetBSD/i386 Pq release 0.9 or higher,
+.Tn NetBSD/i386
+(release 0.9 or higher),
 and
-.Em FreeBSD Pq release 1.0-GAMMA or higher .
+.Tn FreeBSD
+(release 1.0-GAMMA or higher) .
 In order to get the appropriate system support, one of the options
 .Em PCVT_NETBSD ,
 or
@@ -176,13 +178,13 @@ or
 must be defined in the system's config file
 .Pq see Xr config 8 .
 In addition, for the
-.Em FreeBSD
+.Tn FreeBSD
 and
-.Em NetBSD
+.Tn NetBSD
 operating systems, it is necessary to set this option to the operating
 system's version number.
 For
-.Em FreeBSD
+.Tn FreeBSD
 this version number must be expressed as a 3-digit number.
 E.\& g., if you are running the 1.0 release
 .Pq which is actually version 1.0.2 ,
@@ -194,8 +196,15 @@ For
 .Em NetBSD
 this version number must be expressed as 9 if you are running NetBSD 0.9
 and anything greater than 9 for NetBSD-current (pre 1.0). It is recommended
-to use (as with FreeBSD) 100 for NetBSD 1.0 and 999 for NetBSD-current.
-E.\& g., if you are running the NetBSD 1.0 release, you should define
+to use (as with
+.Tn FreeBSD )
+100 for
+.Nx 1.0
+and 999 for
+.Tn NetBSD-current.
+E.g., if you are running the
+.Nx 1.0
+release, you should define
 
 .Em PCVT_NETBSD = 100
 
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index 6ec3c2f..548ed3e 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -1,5 +1,5 @@
 .\"
-.\"  $Id: snp.4,v 1.11 1997/02/22 13:24:43 peter Exp $
+.\"  $Id: snp.4,v 1.12 1997/03/19 04:58:33 bde Exp $
 .\"  $Source: /home/ncvs/src/share/man/man4/snp.4,v $
 .\"
 .Dd February 24, 1995
@@ -63,4 +63,5 @@ Ugen J.S. Antsilevich <ugen@NetVision.net.il>
 .Sh HISTORY
 The
 .Nm snp
-device first appeared in FreeBSD 2.1.
+device first appeared in
+.Fx 2.1 .
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index e368d10..c999289 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id$
+.\"	$Id: spkr.4,v 1.8 1997/03/07 02:49:58 jmg Exp $
 .\"
 .Dd November 7, 1993
 .Dt SPKR 4 i386
@@ -15,7 +15,8 @@
 The speaker device driver allows applications to control the PC console
 speaker on an 
 .Tn IBM-PC Ns --compatible
-machine running FreeBSD.
+machine running
+.Tn FreeBSD .
 .Pp
 Only one process may have this device open at any given time; 
 .Xr open 2
@@ -219,4 +220,5 @@ Andrew A. Chernov <ache@astral.msk.su>
 .Sh HISTORY
 The
 .Nm
-device appeared in FreeBSD 1.0.
+device appeared in
+.Fx 1.0 .
diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4
index e943b2c..06860e9 100644
--- a/share/man/man4/uk.4
+++ b/share/man/man4/uk.4
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$Id: uk.4,v 1.11 1997/02/22 13:24:52 peter Exp $
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
 .\"
@@ -39,13 +39,17 @@ driver provides support for a
 process to address devices on the scsi bus for which there is no configured
 driver. 
 .Pp
-In FreeBSD releases prior to 2.1, the first unknown device
+Prior to
+.Fx 2.1 ,
+the first unknown device
 found will be attached as
 .Em uk0
 and the next, 
 .Em uk1
 etc.
-Beginning in 2.1 it is possible to specify what uk unit a device should
+Beginning in
+.Fx 2.1
+it is possible to specify what uk unit a device should
 come on line as; refer to
 .Xr scsi 4
 for details on kernel configuration.
diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4
index 340e321..b9713f0 100644
--- a/share/man/man4/yp.4
+++ b/share/man/man4/yp.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)yp.8	1.0 (deraadt) 4/26/93
-.\"	$Id$
+.\"	$Id: yp.4,v 1.11 1997/02/22 13:24:55 peter Exp $
 .\"
 .Dd April 5, 1993
 .Dt YP 4
@@ -89,7 +89,9 @@ called the
 .Pa NIS master server .
 The databases used to store the information are called
 .Pa NIS maps.
-In FreeBSD, these maps are stored in
+In
+.Tn FreeBSD ,
+these maps are stored in
 .Pa /var/yp/[domainname]
 where
 .Pa [domainname]
@@ -98,7 +100,9 @@ support several domains at once, therefore it is possible to have several
 such directories, one for each supported domain. Each domain will have
 its own independent set of maps.
 .Pp
-In FreeBSD, the NIS maps are Berkeley DB hashed database files (the
+In
+.Tn FreeBSD ,
+the NIS maps are Berkeley DB hashed database files (the
 same format used for the
 .Xr passwd 5
 database files). Other operating systems that support NIS use old-style
@@ -117,7 +121,9 @@ both pieces of information. This means that while you may have
 and
 .Pa passwd.byname.pag
 files on other operating systems (both of which are really parts of the
-same map), FreeBSD will have only one file called
+same map),
+.Tn FreeBSD
+will have only one file called
 .Pa passwd.byname .
 The difference in format is not significant: only the
 NIS server,
@@ -223,8 +229,8 @@ server. A slave server provides the exact same information as a master
 server: whenever the maps on the master server are updated, the new
 data should be propagated to the slave systems using the
 .Xr yppush 8
-command. The NIS Makefile (
-.Pa /var/yp/Makefile )
+command. The NIS Makefile
+.Pf ( Pa /var/yp/Makefile )
 will do this automatically if the administrator comments out the
 line which says
 .Em NOPUSH=true
@@ -265,11 +271,16 @@ but this is sometimes inconvenient. This problem can be avoided simply by
 placing a slave server on the local network.)
 .El
 .Pp
-The FreeBSD
+The
+.Tn FreeBSD
 .Xr ypserv 8
 is specially designed to provided enhanced security (compared to
-other NIS implementations) when used exclusively with FreeBSD client
-systems. The FreeBSD password database system (which is derived directly
+other NIS implementations) when used exclusively with
+.Tn FreeBSD
+client
+systems. The
+.Tn FreeBSD
+password database system (which is derived directly
 from
 .Bx 4.4 )
 includes support for
@@ -281,9 +292,11 @@ If the encrypted password database were made available as an NIS
 map, this security feature would be totally disabled, since any user
 is allowed to retrieve NIS data.
 .Pp
-To help prevent this, FreeBSD's NIS server
-handles the shadow password maps (
-.Pa master.passwd.byname
+To help prevent this,
+.Tn FreeBSD Ns 's
+NIS server
+handles the shadow password maps
+.Pf ( Pa master.passwd.byname
 and
 .Pa master.passwd.byuid )
 in a special way: the server will only provide access to these
@@ -292,7 +305,7 @@ Since only the super-user is allowed to bind to a privileged port,
 the server assumes that all such requests come from privileged
 users. All other requests are denied: requests from non-privileged
 ports will receive only an error code from the server. Additionally,
-FreeBSD's
+.Tn FreeBSD Ns 's
 .Xr ypserv 8
 includes support for Wietse Venema's tcp wrapper package; with tcp
 wrapper support enabled, the administrator can configure
@@ -304,7 +317,8 @@ they are by no means 100% effective. It is still possible for
 someone with access to your network to spoof the server into disclosing
 the shadow password maps.
 .Pp
-On the client side, FreeBSD's
+On the client side,
+.Tn FreeBSD Ns 's
 .Fn getpwent 3
 functions will automatically search for the
 .Pa master.passwd
@@ -325,16 +339,22 @@ a host that doesn't exist in its
 .Pa hosts.byname
 or
 .Pa hosts.byaddr
-maps. FreeBSD's resolver uses DNS by default (it can be made to use
+maps.
+.Tn FreeBSD Ns 's
+resolver uses DNS by default (it can be made to use
 NIS, if desired), therefore its NIS server doesn't do DNS lookups
 by default. However,
 .Xr ypserv 8
 can be made to perform DNS lookups if it is started with a special
 flag. It can also be made to register itself as an NIS v1 server
 in order to placate certain systems that insist on the presence of
-a v1 server (FreeBSD uses only NIS v2, but many other systems,
-including SunOS 4.x, search for both a v1 and v2 server when binding).
-FreeBSD's
+a v1 server 
+.Pf ( Tn FreeBSD
+uses only NIS v2, but many other systems,
+including 
+.Tn SunOS
+4.x, search for both a v1 and v2 server when binding).
+.Tn FreeBSD Ns 's
 .Xr ypserv 8
 does not actually handle NIS v1 requests, but this ``kludge mode''
 is useful for silencing stubborn systems that search for both
@@ -345,12 +365,16 @@ a v1 and v2 server.
 manual page for a detailed description of these special features
 and flags.)
 .Sh BUGS
-While FreeBSD now has both NIS client and server capabilities,
+While
+.Tn FreeBSD
+now has both NIS client and server capabilities,
 it does not yet have support for
 .Xr ypupdated 8
 or the
 .Fn yp_update
-function. Both of these require secure RPC, which FreeBSD doesn't
+function. Both of these require secure RPC, which
+.Tn FreeBSD
+doesn't
 support yet either.
 .Pp
 The
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index dc2809d..86f1823 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -26,7 +26,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$
+.\"	$Id: link.5,v 1.11 1997/02/22 13:26:03 peter Exp $
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
@@ -126,9 +126,12 @@ and
 .Xr ld.so 1
 are
 .Em LD_VERSION_SUN (3),
-which is used by the SunOS 4.x releases, and
+which is used by the
+.Tn SunOS
+4.x releases, and
 .Em LD_VERSION_BSD (8),
-which is currently in use by FreeBSD since release 1.1.
+which has been in use since
+.Fx 1.1 .
 .It Fa d_un
 Refers to a
 .Em d_version
@@ -482,7 +485,9 @@ was loaded by crt0.
 .It Fa crt_dzfd
 On SunOS systems, this field contains an open file descriptor to
 .Dq Pa /dev/zero
-used to get demand paged zeroed pages. On FreeBSD systems it contains -1.
+used to get demand paged zeroed pages. On
+.Tn FreeBSD
+systems it contains -1.
 .It Fa crt_ldfd
 Contains an open file descriptor that was used by crt0 to load
 .Nm ld.so .
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index db605da..1c906ee 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\"	$Id: passwd.5,v 1.14 1997/03/12 14:05:36 mpp Exp $
+.\"	$Id: passwd.5,v 1.15 1997/03/14 02:37:27 mpp Exp $
 .\"
 .Dd September 29, 1994
 .Dt PASSWD 5
@@ -185,7 +185,9 @@ Check the specific shell documentation to determine how this is
 done with other shells.
 .Sh YP/NIS INTERACTION
 .Ss Enabling access to NIS passwd data
-The system administrator can configure FreeBSD to use NIS/YP for
+The system administrator can configure
+.Tn FreeBSD
+to use NIS/YP for
 its password information by adding special records to the
 .Pa /etc/master.passwd
 file. These entries should be added with
@@ -209,7 +211,9 @@ with only a plus sign (`+') in the name field, such as this:
 .Ed
 The `+' will tell the
 .Xr getpwent 3
-routines in FreeBSD's standard C library to begin using the NIS passwd maps
+routines in
+.Tn FreeBSD Ns 's
+standard C library to begin using the NIS passwd maps
 for lookups.
 .Pp
 Note that the entry shown above is known as a
@@ -324,7 +328,8 @@ the NIS master server; once a host's access list has been set in
 it need not be modified again unless new netgroups are created.
 .Sh NOTES
 .Ss Shadow passwords through NIS
-FreeBSD uses a shadow password scheme: users' encrypted passwords
+.Tn FreeBSD
+uses a shadow password scheme: users' encrypted passwords
 are stored only in
 .Pa /etc/master.passwd
 and
@@ -334,12 +339,17 @@ to prevent users from running the encrypted passwords through
 password-guessing programs and gaining unauthorized access to
 other users' accounts. NIS does not support a standard means of
 password shadowing, which implies that placing your password data
-into the NIS passwd maps totally defeats the security of FreeBSD's
+into the NIS passwd maps totally defeats the security of
+.Tn FreeBSD Ns 's
 password shadowing system.
 .Pp
-FreeBSD provides a few special features to help get around this
+.Tn FreeBSD
+provides a few special features to help get around this
 problem. It is possible to implement password shadowing between
-FreeBSD NIS clients and FreeBSD NIS servers. The
+.Tn FreeBSD
+NIS clients and
+.Tn FreeBSD
+NIS servers. The
 .Xr getpwent 3
 routines will search for a
 .Pa master.passwd.byname
@@ -347,12 +357,15 @@ and
 .Pa master.passwd.byuid
 maps which should contain the same data found in the
 .Pa /etc/master.passwd
-file. If the maps exist, FreeBSD will attempt to use them for user
+file. If the maps exist,
+.Tn FreeBSD
+will attempt to use them for user
 authentication instead of the standard
 .Pa passwd.byname
 and
 .Pa passwd.byuid
-maps. FreeBSD's
+maps.
+.Tn FreeBSD Ns 's
 .Xr ypserv 8
 will also check client requests to make sure they originate on a
 privileged port. Since only the superuser is allowed to bind to
@@ -368,13 +381,17 @@ be allowed access to the standard
 maps which contain no password information.
 .Pp
 Note that this feature cannot be used in an environment with
-non-FreeBSD systems. Note also that a truly determined user with
+.No non- Ns Tn FreeBSD
+systems. Note also that a truly determined user with
 unrestricted access to your network could still compromise the
 .Pa master.passwd
 maps.
 .Ss UID and GID remapping with NIS overrides
-Unlike SunOS and other operating systems that use Sun's NIS code,
-FreeBSD allows the user to override
+Unlike
+.Tn SunOS
+and other operating systems that use Sun's NIS code,
+.Tn FreeBSD
+allows the user to override
 .Pa all
 of the fields in a user's NIS
 .Pa passwd
@@ -400,7 +417,9 @@ using an NIS wildcard entry that looks like this:
 +:*:0:0:::
 
 .Ed
-This often leads to new FreeBSD administrators choosing NIS entries for their
+This often leads to new
+.Tn FreeBSD
+administrators choosing NIS entries for their
 .Pa master.passwd
 files that look like this:
 .Bd -literal -offset indent
@@ -412,10 +431,12 @@ Or worse, this
 +::0:0::::::
 
 .Ed
-.Pa DO _NOT_ PUT ENTRIES LIKE THIS IN YOUR
-.Nm master.passwd
-.Pa FILE!!
-The first tells FreeBSD to remap all passwords to `*' (which
+.Sy DO _NOT_ PUT ENTRIES LIKE THIS IN YOUR
+.Sy Pa master.passwd
+.Sy FILE!!
+The first tells
+.Tn FreeBSD
+to remap all passwords to `*' (which
 will prevent anybody from logging in) and to remap all UIDs and GIDs
 to 0 (which will make everybody appear to be the superuser). The
 second case just maps all UIDs and GIDs to 0, which means that
@@ -424,9 +445,15 @@ second case just maps all UIDs and GIDs to 0, which means that
 .Ss Compatibility of NIS override evaluation
 When Sun originally added NIS support to their
 .Xr getpwent 3
-routines, they took into account the fact that the SunOS password
+routines, they took into account the fact that the
+.Tn SunOS
+password
 .Pa /etc/passwd
-file is in plain ASCII format. The SunOS documentation claims that
+file is in plain
+.Tn ASCII
+format. The
+.Tn SunOS
+documentation claims that
 adding a '+' entry to the password file causes the contents of
 the NIS password database to be 'inserted' at the position in
 the file where the '+' entry appears. If, for example, the
@@ -441,22 +468,33 @@ then the NIS password map would appear twice: once in the middle
 of the file and once at the end. (By using override entries
 instead of simple wildcards, other combinations could be achieved.)
 .Pp
-By contrast, FreeBSD does not have a single ASCII password file: it
+By contrast,
+.Tn FreeBSD
+does not have a single
+.Tn ASCII
+password file: it
 has a hashed password database. This database does not have an
 easily-defined beginning, middle or end, which makes it very hard
-to design a scheme that is 100% compatible with SunOS. For example,
+to design a scheme that is 100% compatible with
+.Tn SunOS .
+For example,
 the
 .Fn getpwnam
 and
 .Fn getpwuid
-functions in FreeBSD are designed to do direct queries to the
+functions in
+.Tn FreeBSD
+are designed to do direct queries to the
 hash database rather than a linear search. This approach is faster
 on systems where the password database is large. However, when
 using direct database queries, the system does not know or care
 about the order of the original password file, and therefore
-it cannot easily apply the same override logic used by SunOS.
+it cannot easily apply the same override logic used by
+.Tn SunOS .
 .Pp
-Instead, FreeBSD groups all the NIS override entries together
+Instead,
+.Tn FreeBSD
+groups all the NIS override entries together
 and constructs a filter out of them. Each NIS password entry
 is compared against the override filter exactly once and 
 treated accordingly: if the filter allows the entry through
@@ -472,10 +510,16 @@ in the
 .Pa /etc/master.passwd
 file since doing otherwise would lead to unpredicable behavior.
 .Pp
-The end result is that FreeBSD's provides a very close approximation
-of SunOS's behavior while maintaining the database paradigm, though the
+The end result is that
+.Tn FreeBSD Ns 's
+provides a very close approximation
+of
+.Tn SunOS Ns 's
+behavior while maintaining the database paradigm, though the
 .Xr getpwent 3
-functions do behave somewhat differently that their SunOS counterparts.
+functions do behave somewhat differently that their
+.Tn SunOS
+counterparts.
 The primary differences are:
 .Bl -bullet -offset indent
 .It
@@ -487,12 +531,17 @@ affect where NIS password records will be mapped into
 the password space.
 .El
 .Pp
-In %99 of all FreeBSD configurations, NIS client behavior will be
-indistinguishable from that of SunOS or other similar systems. Even
+In %99 of all
+.Tn FreeBSD
+configurations, NIS client behavior will be
+indistinguishable from that of
+.Tn SunOS
+or other similar systems. Even
 so, users should be aware of these architectural differences.
 .Pp
 .Ss Using groups instead of netgroups for NIS overrides
-FreeBSD offers the capability to do override matching based on
+.Tn FreeBSD
+offers the capability to do override matching based on
 user groups rather than netgroups. If, for example, an NIS entry
 is specified as:
 .Bd -literal -offset indent
@@ -503,8 +552,10 @@ the system will first try to match users against a netgroup called
 `operator.' If an `operator' netgroup doesn't exist, the system
 will try to match users against the normal `operator' group
 instead. 
-.Ss Changes in behavior from older versions of FreeBSD
-There have been several bug fixes and improvements in FreeBSD's
+.Ss Changes in behavior from older versions of
+.Tn FreeBSD
+There have been several bug fixes and improvements in
+.Tn FreeBSD Ns 's
 NIS/YP handling, some of which have caused changes in behavior.
 While the behavior changes are generally positive, it is important
 that users and system administrators be aware of them:
@@ -524,31 +575,42 @@ now apply to all
 .Xr getpwent 3
 functions.
 .It
-Prior to FreeBSD 2.0.5, netgroup overrides did not work at
-all, largely because FreeBSD did not have support for reading
+Prior to
+.Fx 2.0.5 ,
+netgroup overrides did not work at
+all, largely because
+.Tn FreeBSD
+did not have support for reading
 netgroups through NIS. Again, this has been fixed, and
-netgroups can be specified just as in SunOS and similar NIS-capable
+netgroups can be specified just as in
+.Tn SunOS
+and similar NIS-capable
 systems.
 .It
-FreeBSD now has NIS server capabilities and supports the use
+.Tn FreeBSD
+now has NIS server capabilities and supports the use
 of
 .Pa master.passwd
 NIS maps in addition to the standard Sixth Edition format
 .Pa passwd
 maps.
 This means that you can specify change, expiration and class
-information through NIS, provided you use a FreeBSD system as
+information through NIS, provided you use a
+.Tn FreeBSD
+system as
 the NIS server.
 .El
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact
 .It Pa /etc/passwd
-ASCII password file, with passwords removed
+.Tn ASCII
+password file, with passwords removed
 .It Pa /etc/pwd.db
 .Xr db 3 -format
 password database, with passwords removed
 .It Pa /etc/master.passwd
-ASCII password file, with passwords intact
+.Tn ASCII
+password file, with passwords intact
 .It Pa /etc/spwd.db
 .Xr db 3 -format
 password database, with passwords intact
@@ -571,11 +633,13 @@ The YP/NIS password database makes encrypted passwords visible to
 ordinary users, thus making password cracking easier unless you use
 shadow passwords with the
 .Pa master.passwd
-maps and FreeBSD's
+maps and
+.Tn FreeBSD Ns 's
 .Xr ypserv 8
 server.
 .Pp
-Unless you're using FreeBSD's
+Unless you're using
+.Tn FreeBSD Ns 's
 .Xr ypserv 8 ,
 which supports the use of
 .Pa master.passwd
@@ -583,7 +647,9 @@ type maps,
 the YP/NIS password database will be in old-style (Sixth Edition) format,
 which means that site-wide values for user login class, password
 expiration date, and other fields present in the current format
-will not be available when a FreeBSD system is used as a client with
+will not be available when a
+.Tn FreeBSD
+system is used as a client with
 a standard NIS server.
 .Sh COMPATIBILITY
 The password file format has changed since
@@ -611,8 +677,8 @@ file format appeared in
 The YP/NIS functionality is modeled after
 .Tn SunOS
 and first appeared in
-.Tn FreeBSD
-1.1.  The override capability is new in
+.Fx 1.1
+The override capability is new in
 .Fx 2.0 .
 The override capability was updated to properly support netgroups
 in
diff --git a/share/man/man5/skey.access.5 b/share/man/man5/skey.access.5
index 009f866..710187b 100644
--- a/share/man/man5/skey.access.5
+++ b/share/man/man5/skey.access.5
@@ -1,9 +1,9 @@
 .\" this is comment
-.\"	$Id$
+.\"	$Id: skey.access.5,v 1.5 1997/02/22 13:26:07 peter Exp $
 .\"
 .Dd April 30, 1994
 .Dt SKEY.ACCESS 5
-.Os FreeBSD 1.2
+.Os FreeBSD
 .Sh NAME
 .Nm skey.access
 .Nd List of S/Key obligated host addresses
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index bce5d3d..081f947 100644
--- a/share/man/man7/clocks.7
+++ b/share/man/man7/clocks.7
@@ -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$
+.\" $Id: clocks.7,v 1.5 1997/02/22 13:26:13 peter Exp $
 .\" "
 .Dd April 1, 1996
 .Os
@@ -58,7 +58,9 @@ Note that
 .Dv CLOCKS_PER_SEC
 may be floating point.  Don't use 
 .Fn clock
-in new programs under FreeBSD.  It is feeble compared with
+in new programs under
+.Tn FreeBSD .
+It is feeble compared with
 .Xr getrusage 2 .
 It is provided for ANSI conformance.  It is implemented by calling
 .Fn getrusage
@@ -77,7 +79,9 @@ Note that its frequency may be different from
 .Dv CLOCKS_PER_SEC .
 Don't use 
 .Xr times 3
-in new programs under FreeBSD.  It is feeble compared with
+in new programs under
+.Tn FreeBSD .
+It is feeble compared with
 .Xr gettimeofday 2
 together with 
 .Fn getrusage .
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 4eb1ba1..6007159 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\"	$Id: hier.7,v 1.12 1997/03/08 15:54:56 wosch Exp $
+.\"	$Id: hier.7,v 1.13 1997/03/09 22:39:56 wosch Exp $
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
@@ -280,7 +280,9 @@ see
 .It Li local/
 local executables, libraries, etc.
 .br
-Also used as the default destination for the FreeBSD ports framework.
+Also used as the default destination for the
+.Tn FreeBSD
+ports framework.
 Within local/, the general layout sketched out by
 .Xr hier 7
 should be used.  Exceptions are the man directory is directly under local/
@@ -292,7 +294,9 @@ see
 .It Li obj/
 architecture-specific target tree produced by building the /usr/src tree
 .It Li ports
-The FreeBSD ports collection (optional).
+The
+.Tn FreeBSD
+ports collection (optional).
 .It Li sbin/
 system daemons & system utilities (executed by users)
 .It Li share/
@@ -333,9 +337,10 @@ from the
 association)
 .Bl -tag -width Fl -compact
 .It Li FAQ/
- Frequently Asked Questions
+Frequently Asked Questions
 .It Li handbook/
- FreeBSD Handbook
+.Tn FreeBSD
+Handbook
 .It Li papers/
 UNIX Papers
 .It Li psd/
@@ -449,7 +454,9 @@ src for files in /usr/local
 .It Li lkm
 src for files in /lkm
 .It Li release
-Files required to produce a FreeBSD 
+Files required to produce a
+.Tn FreeBSD 
+release
 .It Li sbin/
 src for files in /sbin
 .It Li secure
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index e02ae85..7745a95 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -34,14 +34,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: crash.8,v 1.6 1997/02/22 13:26:18 peter Exp $
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8 i386
 .Os FreeBSD
 .Sh NAME
 .Nm crash
-.Nd FreeBSD system failures
+.Nd 
+.Tn FreeBSD
+system failures
 .Sh DESCRIPTION
 This section explains a bit about system crashes
 and (very briefly) how to analyze crash dumps.
@@ -199,7 +201,9 @@ flag on the system load image and core dump.
 If the core image is the result of a panic,
 the panic message is printed.
 For more details consult the chapter on kernel debugging in
-the FreeBSD handbook (http://www.freebsd.org).
+the
+.Tn FreeBSD
+handbook (http://www.freebsd.org).
 .Sh SEE ALSO
 .Xr gdb 1 ,
 .Xr dumpon 8 ,
diff --git a/share/man/man8/man8.alpha/crash.8 b/share/man/man8/man8.alpha/crash.8
index e02ae85..7745a95 100644
--- a/share/man/man8/man8.alpha/crash.8
+++ b/share/man/man8/man8.alpha/crash.8
@@ -34,14 +34,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: crash.8,v 1.6 1997/02/22 13:26:18 peter Exp $
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8 i386
 .Os FreeBSD
 .Sh NAME
 .Nm crash
-.Nd FreeBSD system failures
+.Nd 
+.Tn FreeBSD
+system failures
 .Sh DESCRIPTION
 This section explains a bit about system crashes
 and (very briefly) how to analyze crash dumps.
@@ -199,7 +201,9 @@ flag on the system load image and core dump.
 If the core image is the result of a panic,
 the panic message is printed.
 For more details consult the chapter on kernel debugging in
-the FreeBSD handbook (http://www.freebsd.org).
+the
+.Tn FreeBSD
+handbook (http://www.freebsd.org).
 .Sh SEE ALSO
 .Xr gdb 1 ,
 .Xr dumpon 8 ,
diff --git a/share/man/man8/man8.i386/crash.8 b/share/man/man8/man8.i386/crash.8
index e02ae85..7745a95 100644
--- a/share/man/man8/man8.i386/crash.8
+++ b/share/man/man8/man8.i386/crash.8
@@ -34,14 +34,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: crash.8,v 1.6 1997/02/22 13:26:18 peter Exp $
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8 i386
 .Os FreeBSD
 .Sh NAME
 .Nm crash
-.Nd FreeBSD system failures
+.Nd 
+.Tn FreeBSD
+system failures
 .Sh DESCRIPTION
 This section explains a bit about system crashes
 and (very briefly) how to analyze crash dumps.
@@ -199,7 +201,9 @@ flag on the system load image and core dump.
 If the core image is the result of a panic,
 the panic message is printed.
 For more details consult the chapter on kernel debugging in
-the FreeBSD handbook (http://www.freebsd.org).
+the
+.Tn FreeBSD
+handbook (http://www.freebsd.org).
 .Sh SEE ALSO
 .Xr gdb 1 ,
 .Xr dumpon 8 ,
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 340e321..b9713f0 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)yp.8	1.0 (deraadt) 4/26/93
-.\"	$Id$
+.\"	$Id: yp.4,v 1.11 1997/02/22 13:24:55 peter Exp $
 .\"
 .Dd April 5, 1993
 .Dt YP 4
@@ -89,7 +89,9 @@ called the
 .Pa NIS master server .
 The databases used to store the information are called
 .Pa NIS maps.
-In FreeBSD, these maps are stored in
+In
+.Tn FreeBSD ,
+these maps are stored in
 .Pa /var/yp/[domainname]
 where
 .Pa [domainname]
@@ -98,7 +100,9 @@ support several domains at once, therefore it is possible to have several
 such directories, one for each supported domain. Each domain will have
 its own independent set of maps.
 .Pp
-In FreeBSD, the NIS maps are Berkeley DB hashed database files (the
+In
+.Tn FreeBSD ,
+the NIS maps are Berkeley DB hashed database files (the
 same format used for the
 .Xr passwd 5
 database files). Other operating systems that support NIS use old-style
@@ -117,7 +121,9 @@ both pieces of information. This means that while you may have
 and
 .Pa passwd.byname.pag
 files on other operating systems (both of which are really parts of the
-same map), FreeBSD will have only one file called
+same map),
+.Tn FreeBSD
+will have only one file called
 .Pa passwd.byname .
 The difference in format is not significant: only the
 NIS server,
@@ -223,8 +229,8 @@ server. A slave server provides the exact same information as a master
 server: whenever the maps on the master server are updated, the new
 data should be propagated to the slave systems using the
 .Xr yppush 8
-command. The NIS Makefile (
-.Pa /var/yp/Makefile )
+command. The NIS Makefile
+.Pf ( Pa /var/yp/Makefile )
 will do this automatically if the administrator comments out the
 line which says
 .Em NOPUSH=true
@@ -265,11 +271,16 @@ but this is sometimes inconvenient. This problem can be avoided simply by
 placing a slave server on the local network.)
 .El
 .Pp
-The FreeBSD
+The
+.Tn FreeBSD
 .Xr ypserv 8
 is specially designed to provided enhanced security (compared to
-other NIS implementations) when used exclusively with FreeBSD client
-systems. The FreeBSD password database system (which is derived directly
+other NIS implementations) when used exclusively with
+.Tn FreeBSD
+client
+systems. The
+.Tn FreeBSD
+password database system (which is derived directly
 from
 .Bx 4.4 )
 includes support for
@@ -281,9 +292,11 @@ If the encrypted password database were made available as an NIS
 map, this security feature would be totally disabled, since any user
 is allowed to retrieve NIS data.
 .Pp
-To help prevent this, FreeBSD's NIS server
-handles the shadow password maps (
-.Pa master.passwd.byname
+To help prevent this,
+.Tn FreeBSD Ns 's
+NIS server
+handles the shadow password maps
+.Pf ( Pa master.passwd.byname
 and
 .Pa master.passwd.byuid )
 in a special way: the server will only provide access to these
@@ -292,7 +305,7 @@ Since only the super-user is allowed to bind to a privileged port,
 the server assumes that all such requests come from privileged
 users. All other requests are denied: requests from non-privileged
 ports will receive only an error code from the server. Additionally,
-FreeBSD's
+.Tn FreeBSD Ns 's
 .Xr ypserv 8
 includes support for Wietse Venema's tcp wrapper package; with tcp
 wrapper support enabled, the administrator can configure
@@ -304,7 +317,8 @@ they are by no means 100% effective. It is still possible for
 someone with access to your network to spoof the server into disclosing
 the shadow password maps.
 .Pp
-On the client side, FreeBSD's
+On the client side,
+.Tn FreeBSD Ns 's
 .Fn getpwent 3
 functions will automatically search for the
 .Pa master.passwd
@@ -325,16 +339,22 @@ a host that doesn't exist in its
 .Pa hosts.byname
 or
 .Pa hosts.byaddr
-maps. FreeBSD's resolver uses DNS by default (it can be made to use
+maps.
+.Tn FreeBSD Ns 's
+resolver uses DNS by default (it can be made to use
 NIS, if desired), therefore its NIS server doesn't do DNS lookups
 by default. However,
 .Xr ypserv 8
 can be made to perform DNS lookups if it is started with a special
 flag. It can also be made to register itself as an NIS v1 server
 in order to placate certain systems that insist on the presence of
-a v1 server (FreeBSD uses only NIS v2, but many other systems,
-including SunOS 4.x, search for both a v1 and v2 server when binding).
-FreeBSD's
+a v1 server 
+.Pf ( Tn FreeBSD
+uses only NIS v2, but many other systems,
+including 
+.Tn SunOS
+4.x, search for both a v1 and v2 server when binding).
+.Tn FreeBSD Ns 's
 .Xr ypserv 8
 does not actually handle NIS v1 requests, but this ``kludge mode''
 is useful for silencing stubborn systems that search for both
@@ -345,12 +365,16 @@ a v1 and v2 server.
 manual page for a detailed description of these special features
 and flags.)
 .Sh BUGS
-While FreeBSD now has both NIS client and server capabilities,
+While
+.Tn FreeBSD
+now has both NIS client and server capabilities,
 it does not yet have support for
 .Xr ypupdated 8
 or the
 .Fn yp_update
-function. Both of these require secure RPC, which FreeBSD doesn't
+function. Both of these require secure RPC, which
+.Tn FreeBSD
+doesn't
 support yet either.
 .Pp
 The
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index dbf5e57..5da0009 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -23,7 +23,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$
+.\" $Id: spl.9,v 1.3 1997/02/22 13:26:27 peter Exp $
 .\" "
 .Dd July 21, 1996
 .Os
@@ -184,7 +184,9 @@ The interrupt priority levels appeared in a very early version of
 Unix.  They have been traditionally known by number instead of by
 names, and were inclusive up to higher priority levels (i.e., priority
 5 has been blocking everything up to level 5).  This is no longer the
-case in FreeBSD.  The traditional name
+case in
+.Tn FreeBSD .
+The traditional name
 .Ql level
 for them is still reflected in the letter
 .Ql l
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index ce6f694..5647f97 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: style.9,v 1.15 1997/02/22 13:26:28 peter Exp $
 .\"
 .Dd December 14, 1995
 .Dt STYLE 9
@@ -32,14 +32,16 @@
 .Nd "Kernel source file style guide"
 .Sh DESCRIPTION
 This file contains an example of the preferred style for kernel source
-files in the FreeBSD source tree.
+files in the
+.Tn FreeBSD
+source tree.
 .Bd -literal -offset 0i
 /*
  * Style guide for the 4BSD KNF (Kernel Normal Form).
  *
  *	@(#)style	1.14 (Berkeley) 4/28/95
  *
- *	$Id$
+ *	$Id: style.9,v 1.15 1997/02/22 13:26:28 peter Exp $
  *
  */
 
@@ -435,5 +437,9 @@ there.
 .Xr warn 3
 .Sh HISTORY
 This man page is largely based on the src/admin/style/style file from
-the BSD 4.4-Lite2 release, with a few updates to reflect the current
-practice and desire of the FreeBSD project.
+the 
+.Tn BSD 
+4.4-Lite2 release, with a few updates to reflect the current
+practice and desire of the
+.Tn FreeBSD
+project.