15 files changed, 305 insertions, 166 deletions
diff --git a/share/man/man4/ioprbs.4 b/share/man/man4/ioprbs.4
index 8d1cef009c6..c2dd7e0fe34 100644
--- a/share/man/man4/ioprbs.4
+++ b/share/man/man4/ioprbs.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ioprbs.4,v 1.3 2001/07/27 10:03:42 niklas Exp $
+.\"	$OpenBSD: ioprbs.4,v 1.4 2001/08/17 11:13:58 mpech Exp $
 .\"
 .\" Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
 .\"
@@ -41,7 +41,9 @@ The
 .Nm
 driver was written by
 .An Niklas Hallqvist Aq niklas@openbsd.org ,
-inspired by the NetBSD ld_iop driver by
+inspired by the
+.Nx
+ld_iop driver by
 .An Andrew Doran Aq ad@netbsd.org .
 .Sh HISTORY
 The
diff --git a/share/man/man4/man4.i386/xf86.4 b/share/man/man4/man4.i386/xf86.4
index 5f1fa5ba0a0..98eff4ad8a5 100644
--- a/share/man/man4/man4.i386/xf86.4
+++ b/share/man/man4/man4.i386/xf86.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xf86.4,v 1.14 2001/08/03 14:30:26 mpech Exp $
+.\"	$OpenBSD: xf86.4,v 1.15 2001/08/17 11:13:58 mpech Exp $
 .\"
 .\" Copyright (c) 1998 Matthieu Herrb
 .\" All rights reserved.
@@ -77,7 +77,8 @@ memory.
 .Xr sysctl 8
 .Sh HISTORY
 .Pa /dev/xf86
-was introduced as a loadable kernel module for NetBSD 0.9C
+was introduced as a loadable kernel module for
+.Nx 0.9 c
 with XFree86 3.1.
 It was integrated as an in-kernel device on
 .Ox 2.3 .
diff --git a/share/man/man4/man4.vax/tu.4 b/share/man/man4/man4.vax/tu.4
index b6e92a5d4cc..79dd119b5ce 100644
--- a/share/man/man4/man4.vax/tu.4
+++ b/share/man/man4/man4.vax/tu.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tu.4,v 1.4 2000/01/22 13:39:28 aaron Exp $
+.\"	$OpenBSD: tu.4,v 1.5 2001/08/17 11:13:58 mpech Exp $
 .\"	$NetBSD: tu.4,v 1.4 1996/03/03 17:14:09 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -90,7 +90,8 @@ The
 driver appeared in
 .Bx 4.1 .
 .br
-A new driver showed up in NetBSD 1.1A.
+A new driver showed up in
+.Nx 1.1 a.
 .Sh BUGS
 The
 .Tn VAX Ns \-11/750
diff --git a/share/man/man4/rln.4 b/share/man/man4/rln.4
index bfc69450e27..d06f52c5966 100644
--- a/share/man/man4/rln.4
+++ b/share/man/man4/rln.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rln.4,v 1.10 2001/06/22 12:15:46 mpech Exp $
+.\"	$OpenBSD: rln.4,v 1.11 2001/08/17 11:13:58 mpech Exp $
 .\"
 .Dd 2 April, 1999
 .Dt RLN 4
@@ -134,7 +134,8 @@ the RSSI link quality values.
 There is no way to change the channel or security ID on the card, or
 to make it a master, except through source code.
 This is because it is currently impossible under
-OpenBSD to trigger such changes through calls to
+.Ox
+to trigger such changes through calls to
 .Xr ioctl 2
 on the interface.
 .Pp
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 185b3cdcb40..979e4c24649 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.44 2001/08/16 14:59:47 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.45 2001/08/17 11:13:58 mpech Exp $
 .\"
 .\" Copyright (c) 2000 Marc Espie
 .\"
@@ -79,7 +79,8 @@ is set to a list of files to ignore.
 Invoking
 .Ar checksum
 with REFETCH=true
-will try to fetch a version of with mismatched checksums off the OpenBSD
+will try to fetch a version of with mismatched checksums off the
+.Ox
 main archive site.
 .It Ar clean
 Clean ports contents. 
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 2ff9b66535f..5c9cf08b647 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.26 2001/06/27 03:32:57 angelos Exp $
+.\"	$OpenBSD: hier.7,v 1.27 2001/08/17 11:13:58 mpech Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -256,7 +256,9 @@ Architecture specific target tree produced by building the
 .Pa /usr/src
 tree.
 .It Li ports/
-The OpenBSD ports collection (see
+The
+.Ox
+ports collection (see
 .Xr ports 7 ) .
 .It Li sbin/
 System daemons and utilities (executed by users).
diff --git a/share/man/man8/boot_config.8 b/share/man/man8/boot_config.8
index 11ed7bde348..28f9efba581 100644
--- a/share/man/man8/boot_config.8
+++ b/share/man/man8/boot_config.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_config.8,v 1.15 2001/08/03 15:21:17 mpech Exp $
+.\"	$OpenBSD: boot_config.8,v 1.16 2001/08/17 11:13:58 mpech Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson
 .\" All rights reserved.
@@ -47,7 +47,9 @@ argument to
 .Pp
 The boot time configuration is invoked by the
 .Fl c
-option when OpenBSD prompts for a kernel to boot:
+option when
+.Ox
+prompts for a kernel to boot:
 .Pp
 .Bd -literal
 >> OpenBSD BOOT 640/31744 k [1.29]
diff --git a/share/man/man8/compat_bsdos.8 b/share/man/man8/compat_bsdos.8
index 04baca1b15c..62503c8a049 100644
--- a/share/man/man8/compat_bsdos.8
+++ b/share/man/man8/compat_bsdos.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_bsdos.8,v 1.3 1999/09/16 18:28:13 aaron Exp $
+.\"	$OpenBSD: compat_bsdos.8,v 1.4 2001/08/17 11:13:58 mpech Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -35,13 +35,15 @@
 .Os
 .Sh NAME
 .Nm compat_bsdos
-.Nd setup procedure for running BSD/OS binaries under emulation
+.Nd setup procedure for running BSDI binaries under emulation
 .Sh DESCRIPTION
-OpenBSD supports the execution of BSD/OS binaries; most binaries should
-work, at least from the BSD/OS 2.1 era.  Some things that are not currently
-supported are proprietary extensions made to the BSD/OS kernel.
+.Ox
+supports the execution of BSDI binaries; most binaries should
+work, at least from the BSDI 2.1 era.
+Some things that are not currently
+supported are proprietary extensions made to the BSDI kernel.
 .Pp
-To activate the BSD/OS compatibility feature, the kernel must be compiled
+To activate the BSDI compatibility feature, the kernel must be compiled
 with the
 .Nm COMPAT_BSDOS
 option enabled.
@@ -51,28 +53,27 @@ follows the standard
 .Dq emul
 filesystem scheme, using
 .Pa /emul/bsdos
-as the prefix.  This means that all BSD/OS executables first look in
+as the prefix.  This means that all BSDI executables first look in
 .Pa /emul/bsdos
 whenever opening a file; configuration information, shared library images,
-etc., for BSD/OS binaries should all be installed under the emulation
+etc., for BSDI binaries should all be installed under the emulation
 directory in order to avoid conflicts with native files.
 .Pp
-Although many commercial BSD/OS binaries are
+Although many commercial BSDI binaries are
 .Dq pure
 (in that they need no shared libraries), system binaries and those
-compiled/linked with the
-BSD/OS
+compiled/linked with the BSDI
 .\" no .Xr here because we don't have junk like shlicc.
 .Nm shlicc
 program require the appropriate shared library images.  These may be
 found in the
 .Pa /shlib
-directory on a BSD/OS system, and must be copied to
+directory on a BSDI system, and must be copied to
 .Pa /emul/bsdos/shlib
 in order for such binaries to work.  The user is responsible for having
-the appropriate BSD/OS licenses in order to use the shared library images.
+the appropriate BSDI licenses in order to use the shared library images.
 .Sh BUGS
-If BSDi ever manages to port their system to more architectures or switch
+If BSDI ever manages to port their system to more architectures or switch
 to real dynamically linked libraries these instructions may have to change.
 .Pp
 .Nm COMPAT_BSDOS
diff --git a/share/man/man8/compat_freebsd.8 b/share/man/man8/compat_freebsd.8
index 231fbb34a84..3dd260d8d29 100644
--- a/share/man/man8/compat_freebsd.8
+++ b/share/man/man8/compat_freebsd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_freebsd.8,v 1.7 2001/08/09 05:35:44 jsyn Exp $
+.\"	$OpenBSD: compat_freebsd.8,v 1.8 2001/08/17 11:13:58 mpech Exp $
 .\"	$NetBSD: compat_linux.8,v 1.1 1995/03/05 23:30:36 fvdl Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -35,62 +35,108 @@
 .Os
 .Sh NAME
 .Nm compat_freebsd
-.Nd setup procedure for running FreeBSD binaries under emulation
+.Nd setup procedure for running
+.Fx
+binaries under emulation
 .Sh DESCRIPTION
-OpenBSD supports running FreeBSD binaries. Most binaries should work,
-except programs that use FreeBSD-specific features. These include
-i386-specific calls, such as syscons utilities, and audio devices.
-.Pp
-The FreeBSD compatibility feature is active for kernels compiled
+.Ox
+supports running
+.Fx
+binaries.
+Most binaries should work, except programs that use FreeBSD-specific
+features.
+These include i386-specific calls, such as syscons utilities, and audio
+devices.
+.Pp
+The
+.Fx
+compatibility feature is active for kernels compiled
 with the
 .Nm COMPAT_FREEBSD
 option enabled.
 .Pp
 A lot of programs are dynamically linked. This means, that you will
-also need the FreeBSD shared libraries that the program depends on, and
-the runtime linker. Also, you will need to create a "shadow root"
-directory for FreeBSD binaries on your OpenBSD system. This directory
-is named /emul/freebsd. Any file operations done by FreeBSD programs
-run under OpenBSD will look in this directory first. So, if a FreeBSD
-program opens, for example, /etc/passwd, OpenBSD will
-first try to open /emul/freebsd/etc/passwd, and if that does not exist
-open the 'real' /etc/passwd file. It is recommended that you install
-FreeBSD packages that include configuration files, etc under /emul/freebsd,
-to avoid naming conflicts with possible OpenBSD counterparts. Shared
-libraries should also be installed in the shadow tree.
-.Pp
-Generally, you will need to look for the shared libraries that FreeBSD
-binaries depend on only the first few times that you install a FreeBSD
-program on your OpenBSD system. After a while, you will have a sufficient
-set of FreeBSD shared libraries on your system to be able to run newly
-imported FreeBSD binaries without any extra work.
-
+also need the
+.Fx
+shared libraries that the program depends on, and the runtime linker.
+Also, you will need to create a "shadow root" directory for
+.Fx
+binaries on your
+.Ox
+system.
+This directory is named /emul/freebsd.
+Any file operations done by
+.Fx
+programs run under
+.Ox
+will look in this directory first.
+So, if a
+.Fx
+program opens, for example, /etc/passwd,
+.Ox
+will first try to open /emul/freebsd/etc/passwd, and if that does not exist
+open the 'real' /etc/passwd file.
+It is recommended that you install
+.Fx
+packages that include configuration files, etc under /emul/freebsd,
+to avoid naming conflicts with possible 
+.Ox
+counterparts.
+Shared libraries should also be installed in the shadow tree.
+.Pp
+Generally, you will need to look for the shared libraries that
+.Fx
+binaries depend on only the first few times that you install a
+.Fx
+program on your
+.Ox
+system.
+After a while, you will have a sufficient set of
+.Fx
+shared libraries on your system to be able to run newly imported
+.Fx
+binaries without any extra work.
 .Ss Setting up shared libraries
-How to get to know which shared libraries FreeBSD binaries need, and where
-to get them? Basically, there are 3 possibilities (when following
-these instructions: you will need to be root on your OpenBSD system to
-do the necessary installation steps).
-
+How to get to know which shared libraries
+.Fx
+binaries need, and where to get them?
+Basically, there are 3 possibilities (when following these instructions:
+you will need to be root on your
+.Ox
+system to do the necessary installation steps).
+.Pp
 .Bl -tag -width 123 -compact
 .It 1.
-You have access to the OpenBSD
+You have access to the
+.Ox
 .Xr ports 7
-system.  Install the port named
+system.
+Install the port named
 .Nm freebsd_lib
 in the
 .Nm emulators
 category.  The
 .Nm freebsd_lib
 port contains the shared libraries, binaries, and other related files
-necessary to run FreeBSD applications. 
+necessary to run
+.Fx
+applications. 
 .Pp
 .It 2.
-You have access to a FreeBSD system. In this case you can
-temporarily install the binary there, see what shared libraries
-it needs, and copy them to your OpenBSD system. Example: you have
-just ftp-ed the FreeBSD binary of SimCity. Put it on the FreeBSD
-system you have access to, and check which shared libraries it
-needs by running `ldd sim':
+You have access to a
+.Fx
+system.
+In this case you can temporarily install the binary there, see what shared
+libraries it needs, and copy them to your
+.Ox
+system.
+Example: you have just ftp-ed the
+.Fx
+binary of SimCity.
+Put it on the
+.Fx
+system you have access to, and check which shared libraries it needs by running
+`ldd sim':
 .Pp
 .Bl -tag -width 123 -compact -offset indent
 .It me@freebsd% ldd /usr/local/lib/SimCity/res/sim
@@ -106,7 +152,9 @@ needs by running `ldd sim':
 .Pp
 You would need go get all the files from the last column, and
 put them under /emul/freebsd. This means you eventually have
-these files on your OpenBSD system:
+these files on your
+.Ox
+system:
 .Pp
 .nf
 /emul/freebsd/usr/X11R6/lib/libXext.so.6.0
@@ -116,13 +164,14 @@ these files on your OpenBSD system:
 /emul/freebsd/usr/lib/libgcc.so.261.0
 .fi
 .Pp
-Note that if you already have a FreeBSD shared library with a
-matching major revision number to the first column of the 'ldd'
-output, you won't need to copy the file named in the last column
-to your system, the one you already have should work. It is
-advisable to copy the shared library anyway if it is a newer version,
-though. You can remove the old one. So, if you have these libraries
-on your system:
+Note that if you already have a
+.Fx
+shared library with a matching major revision number to the first
+column of the 'ldd' output, you won't need to copy the file named in the
+last column to your system, the one you already have should work.
+It is advisable to copy the shared library anyway if it is a newer version,
+though.
+You can remove the old one. So, if you have these libraries on your system:
 .Pp
 .nf
 /emul/freebsd/usr/lib/libc.so.2.0
@@ -144,10 +193,14 @@ you with:
 /emul/freebsd/usr/lib/libc.so.2.1
 .fi
 .Pp
-Finally, you must make sure that you have the FreeBSD runtime linker
-and its config files on your system. You should copy these
-files from the FreeBSD system to their appropriate place on your
-OpenBSD system (in the /emul/freebsd tree):
+Finally, you must make sure that you have the
+.Fx
+runtime linker and its config files on your system.
+You should copy these files from the
+.Fx
+system to their appropriate place on your 
+.Ox
+system (in the /emul/freebsd tree):
 .Pp
 .nf
 usr/libexec/ld-elf.so.1
@@ -157,10 +210,13 @@ var/run/ld.so.hints
 .fi
 .Pp
 .It 3.
-You don't have access to a FreeBSD system. In that case, you
-should get the extra files you need from various ftp sites.
+You don't have access to a
+.Fx
+system.
+In that case, you should get the extra files you need from various ftp sites.
 Information on where to look for the various files is appended
-below. For now, let's assume you know where to get the files.
+below.
+For now, let's assume you know where to get the files.
 .Pp
 Retrieve the following files (from _one_ ftp site to avoid
 any version mismatches), and install them under /emul/freebsd
@@ -175,13 +231,18 @@ usr/libexec/ld.so
 .fi
 .Pp
 ldconfig and ldd don't necessarily need to be under /emul/freebsd,
-you can install them elsewhere in the system too. Just make sure
-they don't conflict with their OpenBSD counterparts. A good idea
-would be to install them in /usr/local/bin as ldconfig-freebsd and
-ldd-freebsd.
-.Pp
-Run the FreeBSD ldconfig program with directory arguments in
-which the FreeBSD runtime linker should look for shared libs.
+you can install them elsewhere in the system too.
+Just make sure they don't conflict with their
+.Ox
+counterparts.
+A good idea would be to install them in /usr/local/bin as ldconfig-freebsd
+and ldd-freebsd.
+.Pp
+Run the
+.Fx
+ldconfig program with directory arguments in which the
+.Fx
+runtime linker should look for shared libs. 
 /usr/lib are standard, you could run like the following:
 .Pp
 .Bl -tag -width 123 -compact -offset indent
@@ -196,17 +257,23 @@ mapped to /emul/freebsd/XXXX by
 OpenBSD's compat code, and should exist as such on your system.
 Make sure /emul/freebsd/var/run/ld.so.hints exists when you run
 FreeBSD's ldconfig, if not, you may lose OpenBSD's /var/run/ld.so.hints.
-
-FreeBSD ldconfig should be statically
+.Pp
+.Fx
+ldconfig should be statically
 linked, so it doesn't need any shared libraries by itself.
 It will create the file /emul/freebsd/var/run/ld.so.hints.
-You should rerun the FreeBSD version of the ldconfig program
-each time you add a new shared library.
-.Pp
-You should now be set up for FreeBSD binaries which only need
-a shared libc. You can test this by running the FreeBSD ldd
-on itself. Suppose that you have it installed as ldd-freebsd, it
-should produce something like:
+You should rerun the
+.Fx
+version of the ldconfig program each time you add a new shared library.
+.Pp
+You should now be set up for
+.Fx
+binaries which only need a shared libc.
+You can test this by running the 
+.Fx
+ldd on itself.
+Suppose that you have it installed as ldd-freebsd, it should produce
+something like:
 .Pp
 .Bl -tag -width 123 -compact -offset indent
 .It me@openbsd% ldd-freebsd `which ldd-freebsd`
@@ -216,11 +283,16 @@ should produce something like:
 .fi
 .El
 .Pp
-This being done, you are ready to install new FreeBSD binaries.
-Whenever you install a new FreeBSD program, you should check
-if it needs shared libraries, and if so, whether you have
-them installed in the /emul/freebsd tree. To do this, you run
-the FreeBSD version ldd on the new program, and watch its output.
+This being done, you are ready to install new
+.Fx
+binaries. 
+Whenever you install a new
+.Fx
+program, you should check if it needs shared libraries, and if so,
+whether you have them installed in the /emul/freebsd tree.
+To do this, you run the
+.Fx
+version ldd on the new program, and watch its output.
 ldd (see also the manual page for ldd(1)) will print a list
 of shared libraries that the program depends on, in the
 form -l<majorname> => <fullname>.
@@ -228,13 +300,14 @@ form -l<majorname> => <fullname>.
 If it prints "not found" instead of <fullname> it means that
 you need an extra library. Which library this is, is shown
 in <majorname>, which will be of the form XXXX.<N>
-You will need to find a libXXXX.so.<N>.<mm> on a FreeBSD ftp site,
-and install it on your system. The XXXX (name) and <N> (major
+You will need to find a libXXXX.so.<N>.<mm> on a
+.Fx
+ftp site, and install it on your system.
+The XXXX (name) and <N> (major
 revision number) should match; the minor number(s) <mm> are
 less important, though it is advised to take the most
 recent version.
 .El
-
 .Ss Finding the necessary files.
 .Nm Note:
 the information below is valid as of the time this
@@ -242,8 +315,9 @@ document was written (Jun, 1995), but certain details
 such as names of ftp sites, directories and distribution names
 may have changed by the time you read this.
 .Pp
-FreeBSD distribution is
-available on a lot of ftp sites. Sometimes the files are unpacked,
+.Fx
+distribution is available on a lot of ftp sites.
+Sometimes the files are unpacked,
 and you can get the individual files you need, but mostly they
 are stored in distribution sets, usually consisting of subdirectories
 with gzipped tar files in them. The primary ftp sites for the
@@ -287,4 +361,6 @@ Extract the files from these gzipped tarfiles in your /emul/freebsd directory
 (possibly omitting or afterwards removing files you don't need), and you
 are done.
 .Sh BUGS
-The information about FreeBSD distributions may become outdated.
+The information about
+.Fx
+distributions may become outdated.
diff --git a/share/man/man8/compat_ibcs2.8 b/share/man/man8/compat_ibcs2.8
index 26645c9739e..29af1686ff8 100644
--- a/share/man/man8/compat_ibcs2.8
+++ b/share/man/man8/compat_ibcs2.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_ibcs2.8,v 1.6 2001/08/03 15:21:17 mpech Exp $
+.\"	$OpenBSD: compat_ibcs2.8,v 1.7 2001/08/17 11:13:58 mpech Exp $
 .\"
 .\" Copyright (c) 1998 Scott Bartram
 .\" Copyright (c) 1995 Frank van der Linden
@@ -76,29 +76,41 @@ option should be enabled in addition to
 Many COFF-format programs and most ELF-format programs are dynamically
 linked. This means that you will also need the shared libraries that
 the program depends on.  Also, you will need to create a "shadow root"
-directory for iBCS2 binaries on your OpenBSD system. This directory is
-named /emul/ibcs2.  Any file operations done by iBCS2 programs run
-under OpenBSD will look in this directory first. So, if an iBCS2
-program opens, for example, /etc/passwd, OpenBSD will first try to open
-/emul/ibcs2/etc/passwd, and if that does not exist open the 'real'
-/etc/passwd file. It is recommended that you install iBCS2 packages
-that include configuration files, etc. under /emul/ibcs2, to avoid
-naming conflicts with possible OpenBSD counterparts. Shared libraries
-should also be installed in the shadow tree.
+directory for iBCS2 binaries on your
+.Ox
+system.
+This directory is named /emul/ibcs2.
+Any file operations done by iBCS2 programs run
+under
+.Ox
+will look in this directory first. So, if an iBCS2
+program opens, for example, /etc/passwd,
+.Ox
+will first try to open /emul/ibcs2/etc/passwd, and if that does not
+exist open the 'real' /etc/passwd file.
+It is recommended that you install iBCS2 packages that include
+configuration files, etc. under /emul/ibcs2, to avoid naming conflicts
+with possible
+.Ox 
+counterparts.
+Shared libraries should also be installed in the shadow tree.
 .Pp
 Generally, you will need to look for the shared libraries that
 iBCS2 binaries depend on only the first few times that you install
-an iBCS2 program on your OpenBSD system. After a while, you will
-have a sufficient set of iBCS2 shared libraries on your system to
-be able to run newly imported iBCS2 binaries without any extra
-work.
+an iBCS2 program on your
+.Ox
+system.
+After a while, you will have a sufficient set of iBCS2 shared libraries
+on your system to be able to run newly imported iBCS2 binaries without
+any extra work.
 
 .Ss Setting up shared libraries
 How to get to know which shared libraries iBCS2 binaries need, and
 where to get them? Depending on the file type of the executable, there
 are different possibilities (when following these instructions: you
-will need to be root on your OpenBSD system to do the necessary
-installation steps).
+will need to be root on your
+.Ox
+system to do the necessary installation steps).
 
 .Bl -tag -width 123 -compact
 .It 1. COFF binaries
diff --git a/share/man/man8/compat_linux.8 b/share/man/man8/compat_linux.8
index 3bb078a1ae8..bbf0bf3bbf6 100644
--- a/share/man/man8/compat_linux.8
+++ b/share/man/man8/compat_linux.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_linux.8,v 1.17 2001/08/03 15:21:17 mpech Exp $
+.\"	$OpenBSD: compat_linux.8,v 1.18 2001/08/17 11:13:58 mpech Exp $
 .\"	$NetBSD: compat_linux.8,v 1.2 1995/10/16 20:17:59 fvdl Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -37,12 +37,15 @@
 .Nm compat_linux
 .Nd setup procedure for running Linux binaries under emulation
 .Sh DESCRIPTION
-OpenBSD supports running Linux binaries. This only applies to i386 systems
+.Ox
+supports running Linux binaries. This only applies to i386 systems
 for now. Both the a.out and ELF binary formats are supported. Most programs
 should work, including the ones that use the Linux SVGAlib. Additionally,
 OSS audio is emulated, so Linux bins can access the native audio
 transparently. Programs that will not work include those that use the Linux
-/proc filesystem (which is different from the optional OpenBSD /proc
+/proc filesystem (which is different from the optional 
+.Ox
+/proc
 filesystem), and i386-specific calls, such as enabling virtual 8086 mode.
 .Pp
 The Linux compatibility feature is active
@@ -53,21 +56,31 @@ option enabled.
 A lot of programs are dynamically linked. This means, that you will
 also need the Linux shared libraries that the program depends on, and
 the runtime linker.  Also, you will need to create a "shadow root"
-directory for Linux binaries on your OpenBSD system. This directory
+directory for Linux binaries on your
+.Ox
+system. This directory
 is named /emul/linux. Any file operations done by Linux programs
-run under OpenBSD will look in this directory first. So, if a Linux
-program opens, for example, /etc/passwd, OpenBSD will
-first try to open /emul/linux/etc/passwd, and if that does not exist
+run under
+.Ox
+will look in this directory first. So, if a Linux
+program opens, for example, /etc/passwd,
+.Ox
+will first try to open /emul/linux/etc/passwd, and if that does not exist
 open the 'real' /etc/passwd file. It is recommended that you install
 Linux packages that include configuration files, etc under /emul/linux,
-to avoid naming conflicts with possible OpenBSD counterparts. Shared
-libraries should also be installed in the shadow tree.
+to avoid naming conflicts with possible
+.Ox
+counterparts.
+Shared libraries should also be installed in the shadow tree.
 .Pp
 Generally, you will need to look for the shared libraries that Linux
 binaries depend on only the first few times that you install a Linux
-program on your OpenBSD system. After a while, you will have a sufficient
-set of Linux shared libraries on your system to be able to run newly
-imported Linux binaries without any extra work.
+program on your
+.Ox
+system.
+After a while, you will have a sufficient set of Linux shared libraries
+on your system to be able to run newly imported Linux binaries without
+any extra work.
 
 .Ss Setting up shared libraries
 How to get to know which shared libraries Linux binaries need, and where
@@ -92,10 +105,12 @@ needed.
 .It 2.
 You have access to a Linux system. In this case you can
 temporarily install the binary there, see what shared libraries
-it needs, and copy them to your OpenBSD system. Example: you have
-just ftp-ed the Linux binary of Doom. Put it on the Linux
-system you have access to, and check which shared libraries it
-needs by running `ldd linuxxdoom':
+it needs, and copy them to your
+.Ox
+system.
+Example: you have just ftp-ed the Linux binary of Doom.
+Put it on the Linux system you have access to, and check which shared
+libraries it needs by running `ldd linuxxdoom':
 .Pp
 .Bl -tag -width 123 -compact -offset indent
 .It (me@linux) ldd linuxxdoom
@@ -109,7 +124,9 @@ libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29
 You would need go get all the files from the last column, and
 put them under /emul/linux, with the names in the first column
 as symbolic links pointing to them. This means you eventually have
-these files on your OpenBSD system:
+these files on your
+.Ox
+system:
 .Pp
 .nf
 /emul/linux/usr/X11/lib/libXt.so.3.1.0
@@ -153,9 +170,10 @@ you with:
 .Pp
 Please note that the symbolic link mechanism is
 .Nm only
-needed for Linux binaries, the OpenBSD runtime linker takes care of
-looking for matching major revision numbers itself, you
-don't need to worry about that.
+needed for Linux binaries, the
+.Ox
+runtime linker takes care of looking for matching major revision numbers
+itself, you don't need to worry about that.
 .Pp
 Finally, you must make sure that you have the Linux runtime linker
 and its config files on your system. You should copy these
@@ -187,9 +205,11 @@ any version mismatches), and install them under /emul/linux
 .Pp
 ldconfig and ldd don't necessarily need to be under /emul/linux,
 you can install them elsewhere in the system too. Just make sure
-they don't conflict with their OpenBSD counterparts. A good idea
-would be to install them in /usr/local/bin as ldconfig-linux and
-ldd-linux.
+they don't conflict with their
+.Ox
+counterparts.
+A good idea would be to install them in /usr/local/bin as ldconfig-linux
+and ldd-linux.
 .Pp
 Create the file /emul/linux/etc/ld.so.conf, containing the
 directories in which the Linux runtime linker should look
@@ -246,7 +266,8 @@ the information below is valid as of the time this
 document was written (March, 1995), but certain details
 such as names of ftp sites, directories and distribution names
 may have changed by the time you read this.  You can also
-save yourself a lot of headaches by using the OpenBSD
+save yourself a lot of headaches by using the
+.Ox
 .Xr ports 7
 system (possibility 3, above).
 .Pp
diff --git a/share/man/man8/compat_sunos.8 b/share/man/man8/compat_sunos.8
index 383db731977..d5069e7fc04 100644
--- a/share/man/man8/compat_sunos.8
+++ b/share/man/man8/compat_sunos.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_sunos.8,v 1.9 2001/08/03 15:21:17 mpech Exp $
+.\"	$OpenBSD: compat_sunos.8,v 1.10 2001/08/17 11:13:58 mpech Exp $
 .\"	$NetBSD: compat_sunos.8,v 1.6 1995/06/11 23:05:17 pk Exp $
 .\"
 .\" Copyright (c) 1994 Theo de Raadt
@@ -66,7 +66,9 @@ setup to allow dynamically linked executables to work.
 The files you need are on your SunOS machine.
 You need to worry about the legal issues of ensuring that you
 have a right to use the required files on your machine.
-On your OpenBSD machine, do the following:
+On your
+.Ox
+machine, do the following:
 .Pp
 .Bl -enum -inset -offset 123 -compact
 .It
@@ -91,7 +93,9 @@ If you ever expect to use YP, you will want to create a link:
 .Pp
 Alternatively, you can use an NFS mount to accomplish the same
 effect.
-On your OpenBSD machine, do the following:
+On your
+.Ox
+machine, do the following:
 .Pp
 .Bl -enum -inset -offset 123 -compact
 .Pp
@@ -103,8 +107,9 @@ On your OpenBSD machine, do the following:
 .fi
 .El
 .Pp
-This will place the SunOS libraries on your OpenBSD machine
-in a location where the SunOS compatibility code will look for
+This will place the SunOS libraries on your
+.Ox
+machine in a location where the SunOS compatibility code will look for
 first, where they do not conflict with the standard libraries.
 .Sh SEE ALSO
 .Xr compat_svr4 8
diff --git a/share/man/man8/compat_ultrix.8 b/share/man/man8/compat_ultrix.8
index 14152e023f9..452fb1f5fbc 100644
--- a/share/man/man8/compat_ultrix.8
+++ b/share/man/man8/compat_ultrix.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_ultrix.8,v 1.7 1999/09/23 04:12:06 alex Exp $
+.\"	$OpenBSD: compat_ultrix.8,v 1.8 2001/08/17 11:13:58 mpech Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
 .\" All rights reserved.
@@ -53,7 +53,9 @@ for Ultrix compatibility. However, Ultrix is based on a
 .Bx 4.3
 alpha
 release.  Ultrix commands and libraries are often much older than
-their OpenBSD or even SunOS 4.x equivalents, and may require incompatible
+their
+.Ox
+or even SunOS 4.x equivalents, and may require incompatible
 configuration files.
 .Sh SYSTEM CONFIGURATION FILES
 Set up resolv.conf and svc.conf as below:
@@ -88,14 +90,17 @@ lookups for all Ultrix name services.
 .Sh BUGS
 RISC Ultrix YP(NIS) is known to not work.  The Ultrix YP libraries have
 a consistent endian-ness bug. Ultrix YP client will not inter-operate
-with the OpenBSD
+with the
+.Ox
 .Xr ypbind 8
 process.  The only workaround is to use
 /etc/svc.conf to disable YP(NIS).
 .Pp
 The ndbm hashed-password file used by Ultrix are incompatible with the
-db hashed-password file used by OpenBSD. There is no good solution for
-this. (YP would be a good one, if Ultrix YP worked.)
+db hashed-password file used by
+.Ox .
+There is no good solution for this.
+(YP would be a good one, if Ultrix YP worked.)
 .Pp
 The API used by Xservers to talk to the kernel is currently compatible
 with Ultrix 4.1.  An implementation of the Ultrix 4.2 Xws interface
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 1f6b78cfdca..43dfb273a0a 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: diskless.8,v 1.13 2001/08/03 15:21:17 mpech Exp $
+.\"	$OpenBSD: diskless.8,v 1.14 2001/08/17 11:13:58 mpech Exp $
 .\"	$NetBSD: diskless.8,v 1.7.4.1 1996/05/30 18:58:10 cgd Exp $
 .\"
 .\"
@@ -192,7 +192,9 @@ manual page for more information.
 If booting a Sun or Motorola client, install a copy of the
 appropriate diskless boot loader (such as
 .Pa boot.net
-from the root directory of the OpenBSD sparc tree) in the
+from the root directory of the
+.Ox
+sparc tree) in the
 .Pa /tftpboot
 directory.
 Make a link such that the boot program is
@@ -246,7 +248,9 @@ This creates a 16 Megabyte swap file.
 Populate myclient's
 .Pa /
 filesystem on the server.  How this is done depends on the
-client architecture and the version of the OpenBSD distribution.
+client architecture and the version of the 
+.Ox
+distribution.
 It can be as simple as copying and modifying the server's root
 filesystem, or perhaps you need to get those files out of the
 standard binary distribution.
diff --git a/share/man/man8/ssl.8 b/share/man/man8/ssl.8
index a2be7d14ba7..2425deb7c82 100644
--- a/share/man/man8/ssl.8
+++ b/share/man/man8/ssl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssl.8,v 1.33 2001/08/03 15:21:17 mpech Exp $
+.\"	$OpenBSD: ssl.8,v 1.34 2001/08/17 11:13:58 mpech Exp $
 .\"
 .Dd March 15, 1999
 .Dt SSL 8
@@ -32,7 +32,8 @@ The libcrypto library is also used by various programs such as
 and
 .Xr isakmpd 8 .
 .Sh RANDOM DATA SOURCE
-OpenBSD uses the
+.Ox
+uses the
 .Xr arandom 4
 device as the default source for random data when needed by the routines in
 libcrypto and libssl.
@@ -216,7 +217,9 @@ were difficult to distribute and propagate.
 patent was probably more effective at preventing the late adoption of
 widespread international integrated crypto than the much maligned
 ITAR restrictions were).
-Prior to OpenBSD 2.8, these libraries shipped without the
+Prior to
+.Ox 2.8 ,
+these libraries shipped without the
 .Ar RSA
 algorithm -- all such functions
 were stubbed to fail.
@@ -269,7 +272,9 @@ The result of this was that while the
 protocol allowed for many cipher suites that did not require the use
 of patented algorithms, It was very difficult to use these with the
 popular commercially available software.
-Prior to version 2.8, OpenBSD allowed users to download
+Prior to version 2.8,
+.Ox
+allowed users to download
 .Ar RSA
 enabled versions of the shared libssl and libcrypto libraries
 which allowed users to enable full function without recompiling