some Bx/Ox conversion;

From: Jan Stary

33 files changed, 274 insertions, 147 deletions

diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 98260fdb510..ff0acd1d727 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stty.1,v 1.38 2011/09/03 22:59:08 jmc Exp $
+.\"	$OpenBSD: stty.1,v 1.39 2013/08/14 08:39:33 jmc Exp $
 .\"	$NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)stty.1	8.5 (Berkeley) 6/1/94
 .\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt STTY 1
 .Os
 .Sh NAME
@@ -66,7 +66,7 @@ as per
 .It Fl e
 Display all the current settings for the terminal to standard output
 in the traditional
-.Tn BSD
+.Bx
 .Dq all
 and
 .Dq everything
diff --git a/lib/libc/gen/auth_subr.3 b/lib/libc/gen/auth_subr.3
index 3bdc69abb08..2b0d9f912ff 100644
--- a/lib/libc/gen/auth_subr.3
+++ b/lib/libc/gen/auth_subr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: auth_subr.3,v 1.20 2013/06/05 03:39:22 tedu Exp $
+.\"	$OpenBSD: auth_subr.3,v 1.21 2013/08/14 08:39:24 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI $From: auth_subr.3,v 2.5 2000/03/30 19:11:27 polk Exp $
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt BSD_AUTH 3
 .Os
 .Sh NAME
@@ -104,14 +104,19 @@
 .Ft void
 .Fn auth_setstate "auth_session_t *as" "int state"
 .Sh DESCRIPTION
-These functions provide the lower level interface to the BSD
+These functions provide the lower level interface to the
+.Bx
 Authentication system.
-They all operate on a BSD Authentication session pointer,
+They all operate on a
+.Bx
+Authentication session pointer,
 .Fa as ,
 which is returned by
 .Fn auth_open .
 The session pointer
-must be passed to all other BSD Authentication functions called.
+must be passed to all other
+.Bx
+Authentication functions called.
 The
 .Fn auth_open
 function returns
@@ -173,9 +178,13 @@ is called.
 .Pp
 The remaining functions are described in alphabetical order.
 .Pp
-The fundamental function for doing BSD Authentication is
+The fundamental function for doing
+.Bx
+Authentication is
 .Fn auth_call .
-In addition to the pointer to the BSD Authentication session, it takes
+In addition to the pointer to the
+.Bx
+Authentication session, it takes
 the following parameters:
 .Bl -tag -width indent
 .It Ar path
@@ -372,7 +381,9 @@ The latest challenge, if any, set for the session.
 The class of the user, as defined by the
 .Pa /etc/login.conf
 file.
-This value is not directly used by BSD Authentication, rather, it is
+This value is not directly used by
+.Bx
+Authentication, rather, it is
 passed to the login scripts for their possible use.
 .It Dv AUTH_INTERACTIVE
 If set to any value, then the session is tagged as interactive.
diff --git a/lib/libc/gen/authenticate.3 b/lib/libc/gen/authenticate.3
index 2ef92e6f9f8..3caa738002c 100644
--- a/lib/libc/gen/authenticate.3
+++ b/lib/libc/gen/authenticate.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: authenticate.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
+.\"	$OpenBSD: authenticate.3,v 1.15 2013/08/14 08:39:24 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI $From: authenticate.3,v 2.7 1998/09/03 20:27:20 prb Exp $
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt AUTHENTICATE 3
 .Os
 .Sh NAME
@@ -68,8 +68,9 @@
 .Ft auth_session_t *
 .Fn auth_verify "auth_session_t *as" "char *style" "char *name" "..."
 .Sh DESCRIPTION
-These functions provide a simplified interface to the BSD Authentication
-system
+These functions provide a simplified interface to the
+.Bx
+Authentication system
 .Pq see Xr bsd_auth 3 .
 The
 .Fn auth_userokay
@@ -130,9 +131,13 @@ The
 .Fn auth_usercheck
 function operates the same as the
 .Fn auth_userokay
-function except that it does not close the BSD Authentication session created.
+function except that it does not close the
+.Bx
+Authentication session created.
 Rather than returning the status of the session, it returns
-a pointer to the newly created BSD Authentication session.
+a pointer to the newly created
+.Bx
+Authentication session.
 .Pp
 The
 .Fn auth_userchallenge
@@ -146,7 +151,8 @@ However, rather than authenticating the user, it returns a possible
 challenge in the pointer pointed to by
 .Ar challengep .
 The return value of the function is a pointer to a newly created
-BSD Authentication session.
+.Bx
+Authentication session.
 This challenge, if not
 .Dv NULL ,
 should be displayed to the user.
@@ -167,7 +173,9 @@ If
 is zero then the session will be closed.
 The
 .Fn auth_userresponse
-function closes the BSD Authentication session and has the same
+function closes the
+.Bx
+Authentication session and has the same
 return value as
 .Fn auth_userokay .
 For security reasons, when a
@@ -250,14 +258,18 @@ The
 function is a front end to the
 .Xr auth_call 3
 function.
-It will open a BSD Authentication session, if needed, and will set
+It will open a
+.Bx
+Authentication session, if needed, and will set
 the style and user name based on the
 .Ar style
 and
 .Ar name
 arguments, if not
 .Dv NULL .
-Values for the style and user name in an existing BSD Authentication
+Values for the style and user name in an existing
+.Bx
+Authentication
 session will be replaced and the old values freed (if the calling program
 has obtained pointers to the style or user name via
 .Xr auth_getitem 3 ,
@@ -267,7 +279,9 @@ The variable arguments are passed to
 via the
 .Xr auth_set_va_list 3
 function.
-The, possibly created, BSD Authentication session is returned.
+The, possibly created,
+.Bx
+Authentication session is returned.
 The
 .Xr auth_getstate 3
 or
@@ -315,7 +329,9 @@ and
 .Fn auth_usercheck
 only, use the
 .Xr auth_setpwd 3
-function to copy the passwd struct into a BSD Authentication session structure
+function to copy the passwd struct into a
+.Bx
+Authentication session structure
 which can then be passed to
 .Fn auth_approval
 or
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index 2420dd3c6b5..f908fe13385 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sigreturn.2,v 1.9 2007/05/31 19:19:34 jmc Exp $
+.\"	$OpenBSD: sigreturn.2,v 1.10 2013/08/14 08:39:25 jmc Exp $
 .\"	$NetBSD: sigreturn.2,v 1.6 1995/02/27 12:37:40 cgd Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)sigreturn.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt SIGRETURN 2
 .Os
 .Sh NAME
@@ -56,8 +56,8 @@ when returning from a signal to the previously executing program.
 .Pp
 Note that sigcontext contains machine dependent information.
 .Sh NOTES
-This system call is not available in 4.2
-.Tn BSD
+This system call is not available in
+.Bx 4.2
 hence it should not be used if backward compatibility is needed.
 .Sh RETURN VALUES
 If successful, the system call does not return.
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index dfeffec876a..c101f72721b 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm.3,v 1.8 2011/08/18 13:01:26 jmc Exp $
+.\"	$OpenBSD: kvm.3,v 1.9 2013/08/14 08:39:25 jmc Exp $
 .\"	$NetBSD: kvm.3,v 1.2 1996/03/18 22:33:11 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)kvm.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: August 18 2011 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt KVM 3
 .Os
 .Sh NAME
@@ -81,7 +81,9 @@ Accordingly, the generic portion of the interface (i.e.,
 .Fn kvm_write ,
 and
 .Fn kvm_nlist )
-has been incorporated into the BSD interface.
+has been incorporated into the
+.Bx
+interface.
 Indeed, many kvm
 applications (i.e., debuggers and statistical monitors) use only
 this subset of the interface.
@@ -95,7 +97,9 @@ Finally, the Sun kvm error reporting semantics are poorly defined.
 The library can be configured either to print errors to stderr automatically,
 or to print no error messages at all.
 In the latter case, the nature of the error cannot be determined.
-To overcome this, the BSD interface includes a
+To overcome this, the
+.Bx
+interface includes a
 routine,
 .Xr kvm_geterr 3 ,
 to return (not print out) the error message
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index 0309847df4c..b597eca9849 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_open.3,v 1.15 2013/06/05 03:40:26 tedu Exp $
+.\"	$OpenBSD: kvm_open.3,v 1.16 2013/08/14 08:39:25 jmc Exp $
 .\"	$NetBSD: kvm_open.3,v 1.2 1996/03/18 22:33:52 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt KVM_OPEN 3
 .Os
 .Sh NAME
@@ -142,7 +142,9 @@ call.
 .Pp
 The
 .Fn kvm_openfiles
-function provides BSD style error reporting.
+function provides
+.Bx
+style error reporting.
 Here, error messages are not printed out by the library.
 Instead, the application obtains the error message
 corresponding to the most recent kvm library call using
@@ -195,4 +197,6 @@ function returns 0 on success and \-1 on failure.
 .Sh BUGS
 There should not be two open calls.
 The ill-defined error semantics of the Sun library and the desire to have
-a backward-compatible library for BSD left little choice.
+a backward-compatible library for
+.Bx
+left little choice.
diff --git a/lib/libutil/check_expire.3 b/lib/libutil/check_expire.3
index b033bb9a262..5405bac73e4 100644
--- a/lib/libutil/check_expire.3
+++ b/lib/libutil/check_expire.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: check_expire.3,v 1.8 2013/06/05 03:40:26 tedu Exp $
+.\"	$OpenBSD: check_expire.3,v 1.9 2013/08/14 08:39:26 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt CHECK_EXPIRE 3
 .Os
 .Sh NAME
@@ -28,7 +28,9 @@
 .Sh DESCRIPTION
 The
 .Fn login_check_expire
-function is called by a BSD authentication login script to
+function is called by a
+.Bx
+Authentication login script to
 check whether the user's password entry, as described by
 .Fa pwd ,
 has expired.
diff --git a/libexec/login_radius/login_radius.8 b/libexec/login_radius/login_radius.8
index 56450304ca3..dc6000ec003 100644
--- a/libexec/login_radius/login_radius.8
+++ b/libexec/login_radius/login_radius.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login_radius.8,v 1.11 2012/02/01 17:32:59 sobrado Exp $
+.\" $OpenBSD: login_radius.8,v 1.12 2013/08/14 08:39:31 jmc Exp $
 .\"
 .\" Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -32,7 +32,7 @@
 .\"
 .\"	BSDI $From: login_radius.8,v 1.2 1996/11/11 18:42:02 prb Exp $
 .\"
-.Dd $Mdocdate: February 1 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt LOGIN_RADIUS 8
 .Os
 .Sh NAME
@@ -68,8 +68,9 @@ The options are as follows:
 .Bl -tag -width indent
 .It Fl d
 Debug mode.
-Output is sent to the standard output instead of the BSD
-authentication backchannel.
+Output is sent to the standard output instead of the
+.Bx
+Authentication backchannel.
 .It Fl s Ar service
 Specify the service.
 Currently only
diff --git a/libexec/login_yubikey/login_yubikey.8 b/libexec/login_yubikey/login_yubikey.8
index d0f5f1deeaf..104ced0a81a 100644
--- a/libexec/login_yubikey/login_yubikey.8
+++ b/libexec/login_yubikey/login_yubikey.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login_yubikey.8,v 1.7 2012/02/24 18:03:14 sobrado Exp $
+.\" $OpenBSD: login_yubikey.8,v 1.8 2013/08/14 08:39:31 jmc Exp $
 .\"
 .\" Copyright (c) 2010 Daniel Hartmeier <daniel@benzedrine.cx>
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 24 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt LOGIN_YUBIKEY 8
 .Os
 .Sh NAME
@@ -54,8 +54,9 @@ The options are as follows:
 .Bl -tag -width indent
 .It Fl d
 Debug mode.
-Output is sent to the standard output instead of the BSD authentication
-backchannel.
+Output is sent to the standard output instead of the
+.Bx
+Authentication backchannel.
 .It Fl s Ar service
 Specify the service.
 Currently, only
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 4bebf36cd6f..ed0907f31ce 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.5,v 1.20 2011/06/05 11:57:17 krw Exp $
+.\"	$OpenBSD: disklabel.5,v 1.21 2013/08/14 08:39:30 jmc Exp $
 .\"	$NetBSD: disklabel.5,v 1.3 1995/03/18 14:54:36 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: June 5 2011 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt DISKLABEL 5
 .Os
 .Sh NAME
@@ -108,7 +108,9 @@ generation has changed (e.g. the fdisk partition table).
 All of these operations are normally done using
 .Xr disklabel 8 .
 .Pp
-Note that when a disk has no real BSD disklabel the kernel creates a
+Note that when a disk has no real
+.Bx
+disklabel the kernel creates a
 default label so that the disk can be used.
 This default label will include other partitions found on the disk if
 they are supported on your architecture.
@@ -118,7 +120,8 @@ partitions the default label will also include DOS and Linux partitions.
 However, these entries are not dynamic, they are fixed at the time
 .Xr disklabel 8
 is run.
-That means that subsequent changes that affect non-OpenBSD
+That means that subsequent changes that affect
+.Pf non- Ox
 partitions will not be present in the default label, though you
 may update them by hand.
 To see the default label, run
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 75b4839fa71..85c87b4c828 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.107 2012/01/02 04:38:00 krw Exp $
+.\"	$OpenBSD: disklabel.8,v 1.108 2013/08/14 08:39:30 jmc Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: January 2 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt DISKLABEL 8
 .Os
 .Sh NAME
@@ -397,7 +397,9 @@ If expert mode is enabled (see
 .Cm X
 below), then block fragment size, block size, and cylinders per group
 can also be modified.
-Note that not all parameters are configurable for non-BSD partitions.
+Note that not all parameters are configurable for
+.Pf non- Bx
+partitions.
 .It Cm n Op Ar part
 Name the mount point for an existing partition.
 If no partition is specified, the user will be prompted for one.
@@ -508,7 +510,9 @@ as described previously.
 The final two forms are analogous to the basic write and restore versions
 except that they will install bootstrap code in addition to a new label.
 .Pp
-Note that when a disk has no real BSD disklabel, the kernel creates a
+Note that when a disk has no real
+.Bx
+disklabel, the kernel creates a
 default label so that the disk can be used.
 This default label will include other partitions found on the disk if
 they are supported on your architecture.
@@ -518,7 +522,8 @@ partitions the default label will also include DOS and Linux partitions.
 However, these entries are not dynamic, they are fixed at the time
 .Nm
 is run.
-That means that subsequent changes that affect non-OpenBSD
+That means that subsequent changes that affect
+.Pf non- Ox
 partitions will not be present in the default label,
 though they may be updated by hand.
 To see the default label, run
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index c8bcc18dac5..4c44918924d 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping.8,v 1.47 2012/10/13 16:34:08 jmc Exp $
+.\"	$OpenBSD: ping.8,v 1.48 2013/08/14 08:39:30 jmc Exp $
 .\"	$NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: October 13 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt PING 8
 .Os
 .Sh NAME
@@ -311,7 +311,12 @@ the TTL field by exactly one.
 The TCP/IP specification states that the TTL field
 for TCP packets should be set to 60,
 but many systems use smaller values
-(4.3 BSD uses 30, 4.2 used 15).
+.Po
+.Bx 4.3
+uses 30,
+.Bx 4.2
+used 15
+.Pc .
 .Pp
 The maximum possible value of this field is 255, and most
 .Ux
@@ -336,7 +341,7 @@ with the TTL field in its response:
 Not change it; this is what Berkeley
 .Ux
 systems did before the
-.Bx 4.3 tahoe
+.Bx 4.3 Tahoe
 release.
 In this case the TTL value in the received packet will be
 255 minus the number of routers in the round trip path.
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 7e94bbd033c..61df6263b45 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.171 2013/06/09 12:54:38 tedu Exp $
+.\"	$OpenBSD: sysctl.8,v 1.172 2013/08/14 08:39:30 jmc Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sysctl.8	8.2 (Berkeley) 5/9/95
 .\"
-.Dd $Mdocdate: June 9 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -487,7 +487,9 @@ To retrieve information about the load average history:
 .Pp
 To make the
 .Xr chown 2
-system call use traditional BSD semantics (don't clear setuid/setgid bits):
+system call use traditional
+.Bx
+semantics (don't clear setuid/setgid bits):
 .Pp
 .Dl # sysctl fs.posix.setuid=0
 .Pp
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 7bd7afa98fc..d23d31c6b5f 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bpf.4,v 1.31 2010/04/09 16:25:21 jmc Exp $
+.\"	$OpenBSD: bpf.4,v 1.32 2013/08/14 08:39:29 jmc Exp $
 .\"     $NetBSD: bpf.4,v 1.7 1995/09/27 18:31:50 thorpej Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -23,7 +23,7 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.Dd $Mdocdate: April 9 2010 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt BPF 4
 .Os
 .Sh NAME
@@ -1033,7 +1033,9 @@ struct bpf_insn insns[] = {
 .Sh HISTORY
 The Enet packet filter was created in 1980 by Mike Accetta and Rick Rashid
 at Carnegie-Mellon University.
-Jeffrey Mogul, at Stanford, ported the code to BSD and continued its
+Jeffrey Mogul, at Stanford, ported the code to
+.Bx
+and continued its
 development from 1983 on.
 Since then, it has evolved into the Ultrix Packet Filter at DEC, a STREAMS
 NIT module under SunOS 4.1, and BPF.
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 0052270f01b..c2df79574c4 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.384 2013/08/10 10:17:36 miod Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.385 2013/08/14 08:39:28 jmc Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -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.
 .\"
-.Dd $Mdocdate: August 10 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -45,7 +45,9 @@ Those live under
 and they do have manpages under
 .Pa ${PORTSDIR}/infrastructure/man .
 .Pp
-Other BSD variants, as well as older versions of
+Other
+.Bx
+variants, as well as older versions of
 .Nm bsd.port.mk ,
 include other targets and variables.
 Conversion methods are outlined here.
@@ -4030,7 +4032,9 @@ Likewise, offensive to introspection too.
 .It Pa ${FILESDIR}/md5
 Renamed to
 .Pa distinfo
-to match other BSD, and save directories.
+to match other
+.Bx ,
+and save directories.
 .It Pa ${SCRIPTDIR}/{pre,do,post}-*
 Identical functionality can be obtained through a {pre,do,post}-* target,
 invoking the script manually if necessary.
@@ -4112,7 +4116,8 @@ inconsistencies.
 FLAVORS, MULTI_PACKAGES and FAKE are
 .Ox
 improvements.
-Most recent additions do not come from another BSD.
+Most recent additions do not come from another
+.Bx .
 .\" Voluntarily undocumented:
 .\" AUTOCONF_ENV: probably not needed anyway, should be internal.
 .Sh BUGS AND LIMITATIONS
diff --git a/share/man/man5/login.conf.5 b/share/man/man5/login.conf.5
index c40e68bc48c..afe70603341 100644
--- a/share/man/man5/login.conf.5
+++ b/share/man/man5/login.conf.5
@@ -30,10 +30,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: login.conf.5,v 1.50 2012/11/25 21:18:13 jmc Exp $
+.\" $OpenBSD: login.conf.5,v 1.51 2013/08/14 08:39:28 jmc Exp $
 .\" BSDI $From: login.conf.5,v 2.20 2000/06/26 14:50:38 prb Exp $
 .\"
-.Dd $Mdocdate: November 25 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt LOGIN.CONF 5
 .Os
 .Sh NAME
@@ -449,7 +449,9 @@ For example, to indicate 1 and 1/2 hours, the following string could be used:
 .\"
 .Sh AUTHENTICATION
 .Ox
-uses BSD Authentication, which is made up of a variety of
+uses
+.Bx
+Authentication, which is made up of a variety of
 authentication styles.
 The authentication styles currently provided are:
 .Bl -tag -width krb5-or-pwdxx
@@ -528,9 +530,12 @@ See
 .Pp
 Local authentication styles may be added by creating a login script
 for the style (see below).
-To prevent collisions with future official BSD
+To prevent collisions with future official
+.Bx
 Authentication style names, all local style names should start with a dash (-).
-Current plans are for all official BSD Authentication style names to begin
+Current plans are for all official
+.Bx
+Authentication style names to begin
 with a lower case alphabetic character.
 For example, if you have a new style you refer to as
 .Li slick
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index b6a148f8518..cc2fd4e3e43 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.108 2013/07/10 05:09:42 ajacoutot Exp $
+.\"	$OpenBSD: hier.7,v 1.109 2013/08/14 08:39:29 jmc Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: July 10 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -319,7 +319,9 @@ System daemons and utilities (executed by other programs).
 .Pp
 .Bl -tag -width "cvs/contrib/" -compact
 .It auth/
-Login scripts used to authenticate users (for BSD authentication).
+Login scripts used to authenticate users (for
+.Bx
+Authentication).
 .It cvs/contrib/
 User contributed
 .Xr cvs 1
@@ -496,7 +498,8 @@ Time zone configuration information (see
 .El
 .Pp
 .It src/
-BSD and/or local source files.
+.Bx
+and/or local source files.
 .Pp
 .Bl -tag -width "kerberosV/" -compact
 .It bin/
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index 8975134b9a5..f20bb2e0da1 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mailaddr.7,v 1.13 2012/09/26 17:34:38 jmc Exp $
+.\"	$OpenBSD: mailaddr.7,v 1.14 2013/08/14 08:39:29 jmc Exp $
 .\"	$NetBSD: mailaddr.7,v 1.3 1994/11/30 19:07:17 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mailaddr.7	8.1 (Berkeley) 6/16/93
 .\"
-.Dd $Mdocdate: September 26 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt MAILADDR 7
 .Os
 .Sh NAME
@@ -170,7 +170,8 @@ respectively.
 .Re
 .Sh HISTORY
 .Nm
-appeared in 4.2 BSD.
+appeared in
+.Bx 4.2 .
 .Sh BUGS
 The RFC 5322 group syntax
 .Pq Dq group:user1,user2,user3;
diff --git a/share/man/man7/man.7 b/share/man/man7/man.7
index a88223c8762..07cbac3f2e3 100644
--- a/share/man/man7/man.7
+++ b/share/man/man7/man.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.7,v 1.31 2013/07/13 19:44:14 schwarze Exp $
+.\"	$OpenBSD: man.7,v 1.32 2013/08/14 08:39:29 jmc Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 13 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt MAN 7
 .Os
 .Sh NAME
@@ -653,7 +653,8 @@ and
 .Sx \&PP .
 .Ss \&UC
 Sets the volume for the footer for compatibility with man pages from
-BSD releases.
+.Bx
+releases.
 The optional first argument specifies which release it is from.
 .Ss \&br
 Breaks the current line.
diff --git a/share/man/man9/fork1.9 b/share/man/man9/fork1.9
index e82ea905980..0d77b5f9ac0 100644
--- a/share/man/man9/fork1.9
+++ b/share/man/man9/fork1.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fork1.9,v 1.20 2013/06/04 19:27:06 schwarze Exp $
+.\"	$OpenBSD: fork1.9,v 1.21 2013/08/14 08:39:28 jmc Exp $
 .\"	$NetBSD: fork1.9,v 1.3 1999/03/16 00:40:47 garbled Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 4 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt FORK1 9
 .Os
 .Sh NAME
@@ -205,7 +205,9 @@ The
 .Nm
 function semantics are specific to
 .Ox .
-Other BSD systems have different semantics.
+Other
+.Bx
+systems have different semantics.
 .Pp
 The only use of a non-null
 .Fa stack
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 58a26a43840..5dd29f4a465 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.
 .\"
-.\"	$OpenBSD: style.9,v 1.55 2013/08/14 06:32:32 jmc Exp $
+.\"	$OpenBSD: style.9,v 1.56 2013/08/14 08:39:28 jmc Exp $
 .\"
 .Dd $Mdocdate: August 14 2013 $
 .Dt STYLE 9
@@ -636,10 +636,9 @@ Example license for new code.
 .Xr warn 3 ,
 .Xr mdoc 7
 .Sh HISTORY
-This man page is largely based on the src/admin/style/style file from
-the
-.Tn BSD
-4.4-Lite2 release, with updates to reflect the current practice and
+This man page is largely based on the src/admin/style/style file from the
+.Bx 4.4-Lite2
+release, with updates to reflect the current practice and
 desire of the
 .Ox
 project.
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index b5e464fb674..b844a2e52b4 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chpass.1,v 1.37 2012/06/20 21:32:27 schwarze Exp $
+.\"	$OpenBSD: chpass.1,v 1.38 2013/08/14 08:39:26 jmc Exp $
 .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
 .\"
 .\" Copyright (c) 1988, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: June 20 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt CHPASS 1
 .Os
 .Sh NAME
@@ -146,7 +146,9 @@ entries, and that one by random selection.
 The
 .Ar group
 field is the group that the user will be placed in at login.
-Since BSD supports multiple groups (see
+Since
+.Bx
+supports multiple groups (see
 .Xr groups 1 ) ,
 this field currently has little special meaning.
 This field may be filled in with either a number or a group name (see
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 2cd3d050234..23a7ecc37c3 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lock.1,v 1.16 2012/01/15 20:06:40 schwarze Exp $
+.\"	$OpenBSD: lock.1,v 1.17 2013/08/14 08:39:26 jmc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)lock.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 15 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt LOCK 1
 .Os
 .Sh NAME
@@ -52,7 +52,9 @@ with the appropriate privileges.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl a Ar style
-The specified BSD Authentication login
+The specified
+.Bx
+Authentication login
 .Ar style
 (as specified in
 .Pa /etc/login.conf )
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 0e5208a0934..02f39a0032d 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.105 2013/06/24 15:44:36 jmc Exp $
+.\"	$OpenBSD: make.1,v 1.106 2013/08/14 08:39:26 jmc Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: June 24 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -82,7 +82,9 @@ The handling of
 .Sq Pa BSDmakefile
 and
 .Sq Pa .depend
-are BSD extensions.
+are
+.Bx
+extensions.
 .Pp
 Standard options are as follows:
 .Bl -tag -width Ds
@@ -338,7 +340,9 @@ popularized by
 .Xr imake .
 The
 .Ic !\&
-operator is a BSD extension.
+operator is a
+.Bx
+extension.
 .Pp
 As an extension, targets and prerequisites may contain the shell wildcard
 expressions
@@ -521,13 +525,20 @@ to the variable (extension).
 .It Ic \&+=
 Append the value to the current value of the variable (extension).
 .It Ic \&?=
-Assign the value to the variable if it is not already defined (BSD
-extension).
+Assign the value to the variable if it is not already defined
+.Po
+.Bx
+extension
+.Pc .
 Normally, expansion is not done until the variable is referenced.
 .It Ic \&!=
 Expand the value and pass it to the shell for execution and assign
 the result to the variable.
-Any newlines in the result are replaced with spaces (BSD extension).
+Any newlines in the result are replaced with spaces
+.Po
+.Bx
+extension
+.Pc .
 .El
 .Pp
 Any whitespace before the assigned
@@ -970,7 +981,9 @@ may contain variable values, which will be expanded.
 To put an actual single dollar, just double it.
 .El
 .Pp
-All modifiers are BSD extensions, except for the standard
+All modifiers are
+.Bx
+extensions, except for the standard
 .At V
 style variable substitution.
 .Pp
@@ -1608,7 +1621,9 @@ For loops are expanded before tests, so a fragment such as:
 .Pp
 requires the quotes.
 .Pp
-When handling pre-BSD 4.4 archives,
+When handling
+.Pf pre- Bx 4.4
+archives,
 .Nm
 may erroneously mark archive members as out of date if the archive name
 was truncated.
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index c83012c9242..595db326019 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.59 2013/07/16 00:07:52 schwarze Exp $
+.\" $OpenBSD: scp.1,v 1.60 2013/08/14 08:39:27 jmc Exp $
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -232,8 +232,9 @@ debugging connection, authentication, and configuration problems.
 .Nm
 is based on the
 .Xr rcp 1
-program in BSD source code from the Regents of the University of
-California.
+program in
+.Bx
+source code from the Regents of the University of California.
 .Sh AUTHORS
 .An Timo Rinne Aq Mt tri@iki.fi
 .An Tatu Ylonen Aq Mt ylo@cs.hut.fi
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 62292cc09f9..09c9dbcbdad 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.334 2013/07/18 01:12:26 djm Exp $
-.Dd $Mdocdate: July 18 2013 $
+.\" $OpenBSD: ssh.1,v 1.335 2013/08/14 08:39:27 jmc Exp $
+.Dd $Mdocdate: August 14 2013 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -827,9 +827,12 @@ text, and prompts for a response.
 Protocol 2 allows multiple challenges and responses;
 protocol 1 is restricted to just one challenge/response.
 Examples of challenge-response authentication include
-BSD Authentication (see
+.Bx
+Authentication (see
 .Xr login.conf 5 )
-and PAM (some non-OpenBSD systems).
+and PAM (some
+.Pf non- Ox
+systems).
 .Pp
 Finally, if other authentication methods fail,
 .Nm
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 950c71ee508..1496937cc18 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tr.1,v 1.19 2011/09/03 22:59:07 jmc Exp $
+.\"	$OpenBSD: tr.1,v 1.20 2013/08/14 08:39:27 jmc Exp $
 .\"	$NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)tr.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt TR 1
 .Os
 .Sh NAME
@@ -289,7 +289,9 @@ System V has historically implemented character ranges using the syntax
 .Dq [c-c]
 instead of the
 .Dq c-c
-used by historic BSD implementations and
+used by historic
+.Bx
+implementations and
 standardized by POSIX.
 System V shell scripts should work under this implementation as long as
 the range is intended to map in another range, i.e., the command
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index 2e4ff93ec08..bbd1dd344cc 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: config.8,v 1.58 2013/03/28 20:08:10 jmc Exp $
+.\"	$OpenBSD: config.8,v 1.59 2013/08/14 08:39:32 jmc Exp $
 .\"	$NetBSD: config.8,v 1.10 1996/08/31 20:58:16 mycroft Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)config.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: March 28 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt CONFIG 8
 .Os
 .Sh NAME
@@ -502,8 +502,10 @@ The SYNOPSIS portion of each device in section 4 of the manual.
 .Sh HISTORY
 The
 .Nm
-program appeared in 4.1BSD and
-was completely revised in 4.4BSD.
+program appeared in
+.Bx 4.1
+and was completely revised in
+.Bx 4.4 .
 The
 .Fl e
 option appeared in
diff --git a/usr.sbin/cron/crontab.5 b/usr.sbin/cron/crontab.5
index e4917b2bcdf..b89982995b2 100644
--- a/usr.sbin/cron/crontab.5
+++ b/usr.sbin/cron/crontab.5
@@ -17,9 +17,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $OpenBSD: crontab.5,v 1.25 2013/07/16 11:13:33 schwarze Exp $
+.\" $OpenBSD: crontab.5,v 1.26 2013/08/14 08:39:32 jmc Exp $
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt CRONTAB 5
 .Os
 .Sh NAME
@@ -127,7 +127,9 @@ may be overridden by settings in the
 .Ev LOGNAME
 may not.
 .Pp
-Note: on BSD systems the
+Note: on
+.Bx
+systems the
 .Ev LOGNAME
 variable is sometimes called
 .Ev USER .
@@ -375,12 +377,18 @@ MAILTO=paul
 When specifying
 .Fa day\&-of\&-week ,
 both day 0 and day 7 will be considered Sunday.
-BSD and ATT seem to disagree about this.
+.Bx
+and
+.At
+seem to disagree about this.
 .Pp
 Lists and ranges are allowed to coexist in the same field.
 .Dq 1\&-3,7\&-9
 would
-be rejected by ATT or BSD
+be rejected by
+.At
+or
+.Bx
 .Xr cron
 \(em they want to see
 .Dq 1\&-3
@@ -398,10 +406,20 @@ is the same as
 Months or days of the week can be specified by name.
 .Pp
 Environment variables can be set in the crontab.
-In BSD or ATT, the
-environment handed to child processes is basically the one from /etc/rc.
-.Pp
-Command output is mailed to the crontab owner (BSD can't do this), can be
+In
+.Bx
+or
+.At ,
+the
+environment handed to child processes is basically the one from
+.Pa /etc/rc .
+.Pp
+Command output is mailed to the crontab owner
+.Po
+.Bx
+can't do this
+.Pc ,
+can be
 mailed to a person other than the crontab owner (SysV can't do this), or the
 feature can be turned off and no mail will be sent at all (SysV can't do this
 either).
diff --git a/usr.sbin/crunchgen/crunchgen.8 b/usr.sbin/crunchgen/crunchgen.8
index 8471a8dba17..f9518d4941a 100644
--- a/usr.sbin/crunchgen/crunchgen.8
+++ b/usr.sbin/crunchgen/crunchgen.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: crunchgen.8,v 1.6 2013/07/16 11:13:33 schwarze Exp $
+.\"	$OpenBSD: crunchgen.8,v 1.7 2013/08/14 08:39:33 jmc Exp $
 .\"
 .\"
 .\" Copyright (c) 1994 University of Maryland
@@ -25,7 +25,7 @@
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt CRUNCHGEN 8
 .Os
 .Sh NAME
@@ -179,7 +179,8 @@ commands are as follows:
 .It srcdirs Ar dirname ...
 A list of source trees in which the source directories of the
 component programs can be found.
-These dirs are searched using the BSD
+These dirs are searched using the
+.Bx
 .Dq <source-dir>/<progname>/
 convention.
 Multiple srcdirs lines can be specified.
@@ -313,7 +314,9 @@ Some shuffling in the order of libraries may be required,
 and in some rare cases two libraries may
 have an unresolvable conflict and thus cannot be crunched together.
 .Pp
-Some versions of the BSD build environment do not by default build the
+Some versions of the
+.Bx
+build environment do not by default build the
 intermediate object file for single-source file programs.
 The
 .Dq make objs
diff --git a/usr.sbin/ldapd/ldapd.8 b/usr.sbin/ldapd/ldapd.8
index 05719743807..755da50b629 100644
--- a/usr.sbin/ldapd/ldapd.8
+++ b/usr.sbin/ldapd/ldapd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldapd.8,v 1.10 2012/09/26 16:19:44 jmc Exp $
+.\"	$OpenBSD: ldapd.8,v 1.11 2013/08/14 08:39:31 jmc Exp $
 .\"
 .\" Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 26 2012 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt LDAPD 8
 .Os
 .Sh NAME
@@ -92,7 +92,9 @@ Verify the password against the
 .Xr crypt 3
 hash.
 .It Ic {BSDAUTH}username
-Use BSD Authentication with the given username and authentication style
+Use
+.Bx
+Authentication with the given username and authentication style
 .Dq auth-ldap .
 This is similar to using SASL PLAIN authentication with
 .Ar username
@@ -106,7 +108,9 @@ Without a prefix, the
 attribute is compared literally with the provided plain text password.
 .Pp
 When using SASL binds, the authentication ID should be a valid
-username for BSD Authentication.
+username for
+.Bx
+Authentication.
 .Pp
 For plain text passwords to be accepted, the connection must be
 considered secure, either by using an encrypted connection, or by
diff --git a/usr.sbin/mopd/mopd/mopd.8 b/usr.sbin/mopd/mopd/mopd.8
index 03cfee623e5..75100062250 100644
--- a/usr.sbin/mopd/mopd/mopd.8
+++ b/usr.sbin/mopd/mopd/mopd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopd.8,v 1.16 2013/07/16 11:13:33 schwarze Exp $
+.\"	$OpenBSD: mopd.8,v 1.17 2013/08/14 08:39:32 jmc Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -22,9 +22,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopd.8,v 1.16 2013/07/16 11:13:33 schwarze Exp $
+.\" @(#) $OpenBSD: mopd.8,v 1.17 2013/08/14 08:39:32 jmc Exp $
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt MOPD 8
 .Os
 .Sh NAME
@@ -119,4 +119,6 @@ Show version of
 .An Mats O Jansson Aq Mt moj@stacken.kth.se
 .Sh BUGS
 .Xr a.out 5
-isn't supported yet on non-BSD implementations (otherOS).
+isn't supported yet on
+.Pf non- Bx
+implementations (otherOS).
diff --git a/usr.sbin/wsfontload/wsfontload.8 b/usr.sbin/wsfontload/wsfontload.8
index 6ac415b5444..0596022156f 100644
--- a/usr.sbin/wsfontload/wsfontload.8
+++ b/usr.sbin/wsfontload/wsfontload.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wsfontload.8,v 1.17 2007/05/31 19:20:30 jmc Exp $
+.\"	$OpenBSD: wsfontload.8,v 1.18 2013/08/14 08:39:33 jmc Exp $
 .\"	$NetBSD: wsfontload.8,v 1.5 1999/04/06 04:54:22 cgd Exp $
 .\"
 .\" Copyright (c) 1999, 2001
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 14 2013 $
 .Dt WSFONTLOAD 8
 .Os
 .Sh NAME
@@ -74,7 +74,8 @@ for ISO 8859-1 encoding,
 .Dq ibm
 for IBM encoded fonts, and
 .Dq pcvt
-for the custom encoding of the supplemental fonts which came with the BSD
+for the custom encoding of the supplemental fonts which came with the
+.Bx
 PCVT console driver.
 Per default,
 .Dq iso