some Bx/Ox conversion;

From: Jan Stary

8 files changed, 49 insertions, 31 deletions

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.