The diff below replaces the occurences of "BSD"
in the manpages with the .Bx macro where appropriate.
(Some might be overkill though.)

Specifically, it does not put .Bx inside .%T lines and the like,
e.g. ".%T Design and Implementation of 4.4 BSD",
as discussed off-list with jmc@

The following files

        /usr/src/lib/libc/sys/sigaction.2
        /usr/src/share/man/man4/multicast.4
        /usr/src/usr.bin/cvs/cvsintro.7

are left untouched because I am not sure
what would be the best way to markup "BSD-derived"
and similar.


It unifies "BSD Authentication" and "BSD authentication" to

        .Bx
        Authentication

- the capitalized form seemed to be in the majority (don't know why).


crontab(5) says

        (BSD can't do this)

which I rewrote as

        .Po
        .Bx
        can't do this
        .Pc

but I don't think it's true; surely BSD can mail
the result of a cronjob to the user. Also, it mentions
"ATT" which I assumed was meant to be AT&T UNIX
(and typed it as .At). Should factually .At also be
the one that "can't do this" above?


/usr/src/share/man/man7/mdoc.7 which describes .Bx and others
does not itself use .Bx and others - for example, it says

        .Ss \&Bx
        Format the BSD version provided as an argument ...

instead of

        .Ss \&Bx
        Format the
        .Bx
        version provided as an argument ...

Is this on purpose?


This replacement should probably be done for
other system names as well (occurences of
"BSD/OS" not done with .Bsx etc). Occasionaly,
SunOS is mentioned which does not have its own macro.
Would it make sense to have one?
Similarly for HP-UX, IRIX ...

        Jan



Index: bin/stty/stty.1
===================================================================
RCS file: /cvs/src/bin/stty/stty.1,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 stty.1
--- bin/stty/stty.1     3 Sep 2011 22:59:08 -0000       1.38
+++ bin/stty/stty.1     13 Aug 2013 21:21:59 -0000
@@ -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
Index: lib/libc/gen/auth_subr.3
===================================================================
RCS file: /cvs/src/lib/libc/gen/auth_subr.3,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 auth_subr.3
--- lib/libc/gen/auth_subr.3    5 Jun 2013 03:39:22 -0000       1.20
+++ lib/libc/gen/auth_subr.3    13 Aug 2013 21:22:19 -0000
@@ -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 th
 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.
Index: lib/libc/gen/authenticate.3
===================================================================
RCS file: /cvs/src/lib/libc/gen/authenticate.3,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 authenticate.3
--- lib/libc/gen/authenticate.3 5 Jun 2013 03:39:22 -0000       1.14
+++ lib/libc/gen/authenticate.3 13 Aug 2013 21:22:19 -0000
@@ -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 
 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
Index: lib/libc/sys/sigreturn.2
===================================================================
RCS file: /cvs/src/lib/libc/sys/sigreturn.2,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 sigreturn.2
--- lib/libc/sys/sigreturn.2    31 May 2007 19:19:34 -0000      1.9
+++ lib/libc/sys/sigreturn.2    13 Aug 2013 21:22:20 -0000
@@ -56,8 +56,8 @@ when returning from a signal to the prev
 .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.
Index: lib/libkvm/kvm.3
===================================================================
RCS file: /cvs/src/lib/libkvm/kvm.3,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 kvm.3
--- lib/libkvm/kvm.3    18 Aug 2011 13:01:26 -0000      1.8
+++ lib/libkvm/kvm.3    13 Aug 2013 21:22:20 -0000
@@ -81,7 +81,9 @@ Accordingly, the generic portion of the 
 .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 sem
 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
Index: lib/libkvm/kvm_open.3
===================================================================
RCS file: /cvs/src/lib/libkvm/kvm_open.3,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 kvm_open.3
--- lib/libkvm/kvm_open.3       5 Jun 2013 03:40:26 -0000       1.15
+++ lib/libkvm/kvm_open.3       13 Aug 2013 21:22:20 -0000
@@ -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
 .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.
Index: lib/libutil/check_expire.3
===================================================================
RCS file: /cvs/src/lib/libutil/check_expire.3,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 check_expire.3
--- lib/libutil/check_expire.3  5 Jun 2013 03:40:26 -0000       1.8
+++ lib/libutil/check_expire.3  13 Aug 2013 21:22:23 -0000
@@ -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.
Index: libexec/login_radius/login_radius.8
===================================================================
RCS file: /cvs/src/libexec/login_radius/login_radius.8,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 login_radius.8
--- libexec/login_radius/login_radius.8 1 Feb 2012 17:32:59 -0000       1.11
+++ libexec/login_radius/login_radius.8 13 Aug 2013 21:22:23 -0000
@@ -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
Index: libexec/login_yubikey/login_yubikey.8
===================================================================
RCS file: /cvs/src/libexec/login_yubikey/login_yubikey.8,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 login_yubikey.8
--- libexec/login_yubikey/login_yubikey.8       24 Feb 2012 18:03:14 -0000      
1.7
+++ libexec/login_yubikey/login_yubikey.8       13 Aug 2013 21:22:23 -0000
@@ -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
Index: sbin/disklabel/disklabel.5
===================================================================
RCS file: /cvs/src/sbin/disklabel/disklabel.5,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 disklabel.5
--- sbin/disklabel/disklabel.5  5 Jun 2011 11:57:17 -0000       1.20
+++ sbin/disklabel/disklabel.5  13 Aug 2013 21:22:26 -0000
@@ -108,7 +108,9 @@ generation has changed (e.g. the fdisk p
 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 i
 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
Index: sbin/disklabel/disklabel.8
===================================================================
RCS file: /cvs/src/sbin/disklabel/disklabel.8,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 disklabel.8
--- sbin/disklabel/disklabel.8  2 Jan 2012 04:38:00 -0000       1.107
+++ sbin/disklabel/disklabel.8  13 Aug 2013 21:22:26 -0000
@@ -397,7 +395,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 +507,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 +519,8 @@ partitions the default label will also i
 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
Index: sbin/ping/ping.8
===================================================================
RCS file: /cvs/src/sbin/ping/ping.8,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 ping.8
--- sbin/ping/ping.8    13 Oct 2012 16:34:08 -0000      1.47
+++ sbin/ping/ping.8    13 Aug 2013 21:22:27 -0000
@@ -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.
Index: sbin/sysctl/sysctl.8
===================================================================
RCS file: /cvs/src/sbin/sysctl/sysctl.8,v
retrieving revision 1.171
diff -u -p -u -p -r1.171 sysctl.8
--- sbin/sysctl/sysctl.8        9 Jun 2013 12:54:38 -0000       1.171
+++ sbin/sysctl/sysctl.8        13 Aug 2013 21:22:27 -0000
@@ -487,7 +487,9 @@ To retrieve information about the load a
 .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
Index: share/man/man4/bpf.4
===================================================================
RCS file: /cvs/src/share/man/man4/bpf.4,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 bpf.4
--- share/man/man4/bpf.4        9 Apr 2010 16:25:21 -0000       1.31
+++ share/man/man4/bpf.4        13 Aug 2013 21:22:28 -0000
@@ -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.
Index: share/man/man5/bsd.port.mk.5
===================================================================
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.384
diff -u -p -u -p -r1.384 bsd.port.mk.5
--- share/man/man5/bsd.port.mk.5        10 Aug 2013 10:17:36 -0000      1.384
+++ share/man/man5/bsd.port.mk.5        13 Aug 2013 21:22:28 -0000
@@ -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
Index: share/man/man5/login.conf.5
===================================================================
RCS file: /cvs/src/share/man/man5/login.conf.5,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 login.conf.5
--- share/man/man5/login.conf.5 25 Nov 2012 21:18:13 -0000      1.50
+++ share/man/man5/login.conf.5 13 Aug 2013 21:22:29 -0000
@@ -449,7 +449,9 @@ For example, to indicate 1 and 1/2 hours
 .\"
 .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
Index: share/man/man7/hier.7
===================================================================
RCS file: /cvs/src/share/man/man7/hier.7,v
retrieving revision 1.108
diff -u -p -u -p -r1.108 hier.7
--- share/man/man7/hier.7       10 Jul 2013 05:09:42 -0000      1.108
+++ share/man/man7/hier.7       13 Aug 2013 21:22:29 -0000
@@ -319,7 +319,9 @@ System daemons and utilities (executed b
 .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/
Index: share/man/man7/mailaddr.7
===================================================================
RCS file: /cvs/src/share/man/man7/mailaddr.7,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 mailaddr.7
--- share/man/man7/mailaddr.7   26 Sep 2012 17:34:38 -0000      1.13
+++ share/man/man7/mailaddr.7   13 Aug 2013 21:22:29 -0000
@@ -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;
Index: share/man/man7/man.7
===================================================================
RCS file: /cvs/src/share/man/man7/man.7,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 man.7
--- share/man/man7/man.7        13 Jul 2013 19:44:14 -0000      1.31
+++ share/man/man7/man.7        13 Aug 2013 21:22:29 -0000
@@ -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.
Index: share/man/man9/fork1.9
===================================================================
RCS file: /cvs/src/share/man/man9/fork1.9,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 fork1.9
--- share/man/man9/fork1.9      4 Jun 2013 19:27:06 -0000       1.20
+++ share/man/man9/fork1.9      13 Aug 2013 21:22:29 -0000
@@ -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
Index: share/man/man9/style.9
===================================================================
RCS file: /cvs/src/share/man/man9/style.9,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 style.9
--- share/man/man9/style.9      2 Nov 2012 16:35:21 -0000       1.54
+++ share/man/man9/style.9      13 Aug 2013 21:22:29 -0000
@@ -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.
Index: usr.bin/chpass/chpass.1
===================================================================
RCS file: /cvs/src/usr.bin/chpass/chpass.1,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 chpass.1
--- usr.bin/chpass/chpass.1     20 Jun 2012 21:32:27 -0000      1.37
+++ usr.bin/chpass/chpass.1     13 Aug 2013 21:22:35 -0000
@@ -146,7 +146,9 @@ entries, and that one by random selectio
 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
Index: usr.bin/lock/lock.1
===================================================================
RCS file: /cvs/src/usr.bin/lock/lock.1,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 lock.1
--- usr.bin/lock/lock.1 15 Jan 2012 20:06:40 -0000      1.16
+++ usr.bin/lock/lock.1 13 Aug 2013 21:22:35 -0000
@@ -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 )
Index: usr.bin/make/make.1
===================================================================
RCS file: /cvs/src/usr.bin/make/make.1,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 make.1
--- usr.bin/make/make.1 24 Jun 2013 15:44:36 -0000      1.105
+++ usr.bin/make/make.1 13 Aug 2013 21:22:35 -0000
@@ -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 
 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 
 .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.
Index: usr.bin/ssh/scp.1
===================================================================
RCS file: /cvs/src/usr.bin/ssh/scp.1,v
retrieving revision 1.59
diff -u -p -u -p -r1.59 scp.1
--- usr.bin/ssh/scp.1   16 Jul 2013 00:07:52 -0000      1.59
+++ usr.bin/ssh/scp.1   13 Aug 2013 21:22:36 -0000
@@ -232,8 +232,9 @@ debugging connection, authentication, an
 .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 [email protected]
 .An Tatu Ylonen Aq Mt [email protected]
Index: usr.bin/ssh/ssh.1
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh.1,v
retrieving revision 1.334
diff -u -p -u -p -r1.334 ssh.1
--- usr.bin/ssh/ssh.1   18 Jul 2013 01:12:26 -0000      1.334
+++ usr.bin/ssh/ssh.1   13 Aug 2013 21:22:36 -0000
@@ -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
Index: usr.bin/tr/tr.1
===================================================================
RCS file: /cvs/src/usr.bin/tr/tr.1,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 tr.1
--- usr.bin/tr/tr.1     3 Sep 2011 22:59:07 -0000       1.19
+++ usr.bin/tr/tr.1     13 Aug 2013 21:22:36 -0000
@@ -289,7 +289,9 @@ System V has historically implemented ch
 .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
Index: usr.sbin/config/config.8
===================================================================
RCS file: /cvs/src/usr.sbin/config/config.8,v
retrieving revision 1.58
diff -u -p -u -p -r1.58 config.8
--- usr.sbin/config/config.8    28 Mar 2013 20:08:10 -0000      1.58
+++ usr.sbin/config/config.8    13 Aug 2013 21:22:38 -0000
@@ -502,8 +502,10 @@ The SYNOPSIS portion of each device in s
 .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
Index: usr.sbin/cron/crontab.5
===================================================================
RCS file: /cvs/src/usr.sbin/cron/crontab.5,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 crontab.5
--- usr.sbin/cron/crontab.5     16 Jul 2013 11:13:33 -0000      1.25
+++ usr.sbin/cron/crontab.5     13 Aug 2013 21:22:38 -0000
@@ -36,10 +36,10 @@ at these times on these dates run this c
 .Dc .
 There may be a system
 .Nm
-.Pf ( Pa /etc/crontab )
+.Pq Pa /etc/crontab
 and each user may have their own
 .Nm
-.Pf ( Pa /var/cron/tabs/<user> ) .
+.Pq Pa /var/cron/tabs/<user> .
 Commands in any given
 .Nm
 will be
@@ -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).
Index: usr.sbin/crunchgen/crunchgen.8
===================================================================
RCS file: /cvs/src/usr.sbin/crunchgen/crunchgen.8,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 crunchgen.8
--- usr.sbin/crunchgen/crunchgen.8      16 Jul 2013 11:13:33 -0000      1.6
+++ usr.sbin/crunchgen/crunchgen.8      13 Aug 2013 21:22:39 -0000
@@ -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
 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
Index: usr.sbin/ldapd/ldapd.8
===================================================================
RCS file: /cvs/src/usr.sbin/ldapd/ldapd.8,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 ldapd.8
--- usr.sbin/ldapd/ldapd.8      26 Sep 2012 16:19:44 -0000      1.10
+++ usr.sbin/ldapd/ldapd.8      13 Aug 2013 21:22:39 -0000
@@ -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
Index: usr.sbin/mopd/mopd/mopd.8
===================================================================
RCS file: /cvs/src/usr.sbin/mopd/mopd/mopd.8,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 mopd.8
--- usr.sbin/mopd/mopd/mopd.8   16 Jul 2013 11:13:33 -0000      1.16
+++ usr.sbin/mopd/mopd/mopd.8   13 Aug 2013 21:22:40 -0000
@@ -119,4 +119,6 @@ Show version of
 .An Mats O Jansson Aq Mt [email protected]
 .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).
Index: usr.sbin/wsfontload/wsfontload.8
===================================================================
RCS file: /cvs/src/usr.sbin/wsfontload/wsfontload.8,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 wsfontload.8
--- usr.sbin/wsfontload/wsfontload.8    31 May 2007 19:20:30 -0000      1.17
+++ usr.sbin/wsfontload/wsfontload.8    13 Aug 2013 21:22:41 -0000
@@ -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

Reply via email to