From b5ac91c1330c6b5cef4923a181679828e9ec4550 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sat, 12 May 2007 21:22:11 +0000
Subject: [PATCH] Use .At, .Bsx, .Fx, .Nx and .Ox

---
 bin/cpdup/cpdup.1               |  8 +++++---
 bin/ed/ed.1                     |  4 ++--
 lib/libc/net/if_indextoname.3   |  5 +++--
 lib/libc/stdlib/getopt_long.3   | 13 +++++++++----
 lib/libc/sys/listen.2           |  7 ++++---
 lib/libposix1e/posix1e.3        |  6 ++++--
 share/man/man4/crypto.4         |  8 +++++---
 share/man/man4/fast_ipsec.4     |  6 ++++--
 share/man/man4/hifn.4           |  8 +++++---
 share/man/man4/man4.i386/sbni.4 |  6 ++++--
 share/man/man4/ubsec.4          |  8 +++++---
 share/man/man4/uvisor.4         |  7 ++++---
 usr.sbin/clog/clog.8            |  6 ++++--
 usr.sbin/lpr/lpd/lpd.8          |  5 +++--
 usr.sbin/pfctl/pf.conf.5        | 14 ++++++++++----
 usr.sbin/pfctl/pf.os.5          |  6 ++++--
 16 files changed, 75 insertions(+), 42 deletions(-)

diff --git a/bin/cpdup/cpdup.1 b/bin/cpdup/cpdup.1
index 24479cd020..a9a12823fa 100644
--- a/bin/cpdup/cpdup.1
+++ b/bin/cpdup/cpdup.1
@@ -3,7 +3,7 @@
 .\"    USE WITH EXTREME CAUTION.
 .\"
 .\"
-.\" $DragonFly: src/bin/cpdup/cpdup.1,v 1.22 2007/04/25 09:35:31 swildner Exp $
+.\" $DragonFly: src/bin/cpdup/cpdup.1,v 1.23 2007/05/12 21:22:10 swildner Exp $
 .Dd October 28, 1999
 .Dt CPDUP 1
 .Os
@@ -215,8 +215,10 @@ utility exits 0 if no error occured and >0 if an error occured.
 The
 .Nm
 command was originally created to update servers at BEST Internet circa 1997
-and was placed under the FreeBSD copyright for inclusion in the ports area
-in 1999.  The program was written by Matthew Dillon and Dima Ruban.
+and was placed under the
+.Fx
+copyright for inclusion in the ports area in 1999.
+The program was written by Matthew Dillon and Dima Ruban.
 .Sh BUGS
 UFS has a hardlink limit of 32767.  Many programs, in particular CVS
 with regards to its CVS/Root file, will generate a lot of hard links.
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 307c06a7a4..a21b6ceab3 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/bin/ed/ed.1,v 1.35 2005/01/16 16:41:56 ru Exp $
-.\" $DragonFly: src/bin/ed/ed.1,v 1.4 2007/04/06 23:42:15 pavalos Exp $
+.\" $DragonFly: src/bin/ed/ed.1,v 1.5 2007/05/12 21:22:10 swildner Exp $
 .Dd July 3, 2004
 .Dt ED 1
 .Os
@@ -999,7 +999,7 @@ per line overhead: 4 ints
 An
 .Nm
 command appeared in
-Version 1 AT&T UNIX.
+.At v1 .
 .Sh BUGS
 The
 .Nm
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index 6820624fe9..aa4219d69f 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$FreeBSD: src/lib/libc/net/if_indextoname.3,v 1.2.2.6 2002/07/29 18:33:18 ume Exp $
-.\"	$DragonFly: src/lib/libc/net/if_indextoname.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
+.\"	$DragonFly: src/lib/libc/net/if_indextoname.3,v 1.4 2007/05/12 21:22:10 swildner Exp $
 .\"
 .Dd "July 11, 1997"
 .Dt IF_NAMETOINDEX 3
@@ -133,4 +133,5 @@ and
 .Fn if_freenameindex
 functions conform to RFC 2553.
 .Sh HISTORY
-The implementation first appeared in BSDI BSD/OS.
+The implementation first appeared in BSDI
+.Bsx .
diff --git a/lib/libc/stdlib/getopt_long.3 b/lib/libc/stdlib/getopt_long.3
index f9b1b593cf..757d916f11 100644
--- a/lib/libc/stdlib/getopt_long.3
+++ b/lib/libc/stdlib/getopt_long.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: getopt_long.3,v 1.14 2003/08/07 16:43:40 agc Exp $
-.\"	$DragonFly: src/lib/libc/stdlib/getopt_long.3,v 1.5 2007/03/14 14:50:07 swildner Exp $
+.\"	$DragonFly: src/lib/libc/stdlib/getopt_long.3,v 1.6 2007/05/12 21:22:10 swildner Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -191,7 +191,9 @@ honors POSIXLY_CORRECT and stops at the first non-option.
 handling of :: in options string in presence of POSIXLY_CORRECT:
 .Bl -tag -width "NetBSD"
 .It Li Both
-GNU and NetBSD ignore POSIXLY_CORRECT here and take :: to
+GNU and
+.Nx
+ignore POSIXLY_CORRECT here and take :: to
 mean the preceding option takes an optional argument.
 .El
 .It Li o
@@ -201,7 +203,9 @@ return value in case of missing argument if first character
 .It Li GNU
 returns '?'
 .It NetBSD
-returns ':' (since NetBSD's getopt does).
+returns ':' (since
+.Nx Ap s
+getopt does).
 .El
 .It Li o
 handling of --a in getopt:
@@ -258,7 +262,8 @@ optopt set to 0 and optarg set to
 .It Li o
 The error messages are different.
 .It Li o
-NetBSD does not permute the argument vector at the same points in
+.Nx
+does not permute the argument vector at the same points in
 the calling sequence as GNU does.
 The aspects normally used by the caller
 (ordering after \-1 is returned, value of optind relative
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index 5f48388166..0230b22ed5 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -31,7 +31,7 @@
 .\"
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/lib/libc/sys/listen.2,v 1.12.2.9 2002/05/09 02:24:40 silby Exp $
-.\" $DragonFly: src/lib/libc/sys/listen.2,v 1.4 2006/03/21 04:24:28 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/listen.2,v 1.5 2007/05/12 21:22:10 swildner Exp $
 .\"
 .Dd November 3, 1995
 .Dt LISTEN 2
@@ -74,8 +74,9 @@ receive an error with an indication of
 or, in the case of TCP, the connection will be
 silently dropped.
 .Pp
-Note that before FreeBSD 4.5 and the introduction of the syncache,
-the
+Note that before
+.Fx 4.5
+and the introduction of the syncache, the
 .Fa backlog
 parameter also determined the length of the incomplete
 connection queue, which held TCP sockets in the process
diff --git a/lib/libposix1e/posix1e.3 b/lib/libposix1e/posix1e.3
index 878795198b..0bc1d438c6 100644
--- a/lib/libposix1e/posix1e.3
+++ b/lib/libposix1e/posix1e.3
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libposix1e/posix1e.3,v 1.3.2.6 2001/12/20 16:27:06 ru Exp $
-.\" $DragonFly: src/lib/libposix1e/posix1e.3,v 1.4 2006/07/04 18:02:11 swildner Exp $
+.\" $DragonFly: src/lib/libposix1e/posix1e.3,v 1.5 2007/05/12 21:22:10 swildner Exp $
 .\"
 .Dd January 17, 2000
 .Dt POSIX1E 3
@@ -69,7 +69,9 @@ Available API calls relating to ACLs are described in detail in
 .Pp
 The patches supporting other POSIX.1e features are not available in the
 base operating system at this time--however, more information on them
-may be found on the FreeBSD POSIX.1e implementation web page:
+may be found on the
+.Fx
+POSIX.1e implementation web page:
 .Pp
 http://www.watson.org/fbsd-hardening/posix1e/
 .Sh IMPLEMENTATION NOTES
diff --git a/share/man/man4/crypto.4 b/share/man/man4/crypto.4
index df16e07bbb..45160825ae 100644
--- a/share/man/man4/crypto.4
+++ b/share/man/man4/crypto.4
@@ -1,6 +1,6 @@
 .\"	$OpenBSD: crypto.4,v 1.4 2002/09/12 07:15:03 deraadt Exp $
 .\"	$FreeBSD: src/share/man/man4/crypto.4,v 1.1.2.2 2002/12/29 16:35:38 schweikh Exp $
-.\"	$DragonFly: src/share/man/man4/crypto.4,v 1.4 2007/04/22 20:40:20 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/crypto.4,v 1.5 2007/05/12 21:22:10 swildner Exp $
 .\"
 .\" Copyright (c) 2001 Theo de Raadt
 .\" All rights reserved.
@@ -106,7 +106,9 @@ crypto access device
 The
 .Nm
 driver first appeared in
-OpenBSD 3.0.
+.Ox 3.0 .
 The
 .Nm
-driver was imported to FreeBSD in 5.0.
+driver was imported to
+.Fx
+in 5.0.
diff --git a/share/man/man4/fast_ipsec.4 b/share/man/man4/fast_ipsec.4
index 4a9f7f94a6..2cd037c86f 100644
--- a/share/man/man4/fast_ipsec.4
+++ b/share/man/man4/fast_ipsec.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/fast_ipsec.4,v 1.1.2.1 2003/01/24 05:12:59 sam Exp $
-.\" $DragonFly: src/share/man/man4/fast_ipsec.4,v 1.4 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/fast_ipsec.4,v 1.5 2007/05/12 21:22:10 swildner Exp $
 .\"
 .Dd January 20, 2003
 .Dt FAST_IPSEC 4
@@ -86,7 +86,9 @@ To be added.
 .Xr setkey 8 ,
 .Xr sysctl 8
 .Sh HISTORY
-The protocols draw heavily on the OpenBSD implementation of the
+The protocols draw heavily on the
+.Ox
+implementation of the
 .Tn IPsec
 protocols.
 The policy management code is derived from the KAME implementation found
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index 2e4b2e43ac..5ee72fbd60 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -1,6 +1,6 @@
 .\"	$OpenBSD: hifn.4,v 1.32 2002/09/26 07:55:40 miod Exp $
 .\"	$FreeBSD: src/share/man/man4/hifn.4,v 1.1.2.1 2002/11/21 23:57:24 sam Exp $
-.\"	$DragonFly: src/share/man/man4/hifn.4,v 1.4 2007/04/22 20:40:20 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/hifn.4,v 1.5 2007/05/12 21:22:10 swildner Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt
 .\" All rights reserved.
@@ -99,10 +99,12 @@ compression, the 9751-based cards are not useful.
 The
 .Nm
 device driver appeared in
-OpenBSD 2.7.
+.Ox 2.7 .
 The
 .Nm
-device driver was imported to FreeBSD in 5.0.
+device driver was imported to
+.Fx
+in 5.0.
 .Sh BUGS
 The 7751 chip starts out at initialization by only supporting compression.
 A proprietary algorithm, which has been reverse engineered, is required to
diff --git a/share/man/man4/man4.i386/sbni.4 b/share/man/man4/man4.i386/sbni.4
index 67edf70077..8bf3996862 100644
--- a/share/man/man4/man4.i386/sbni.4
+++ b/share/man/man4/man4.i386/sbni.4
@@ -22,7 +22,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/sbni.4,v 1.1.2.1 2003/04/15 17:23:32 fjoe Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/sbni.4,v 1.7 2007/04/21 15:34:26 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/sbni.4,v 1.8 2007/05/12 21:22:10 swildner Exp $
 .\"
 .Dd January 8, 2002
 .Dt SBNI 4 i386
@@ -103,7 +103,9 @@ device driver first appeared in
 .Sh AUTHORS
 The
 .Nm sbni
-device driver for FreeBSD 4.x was written by Denis I. Timofeev, partially
+device driver for
+.Fx
+4.x was written by Denis I. Timofeev, partially
 based on David Greenman's
 .Nm ed
 driver. Earlier versions (available on ftp.granch.com) were written by
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 021794596b..d32aa1659e 100644
--- a/share/man/man4/ubsec.4
+++ b/share/man/man4/ubsec.4
@@ -1,6 +1,6 @@
 .\"	$OpenBSD: ubsec.4,v 1.18 2002/09/26 07:55:41 miod Exp $
 .\"	$FreeBSD: src/share/man/man4/ubsec.4,v 1.1.2.1 2002/11/21 23:57:24 sam Exp $
-.\"	$DragonFly: src/share/man/man4/ubsec.4,v 1.3 2007/04/22 20:40:20 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/ubsec.4,v 1.4 2007/05/12 21:22:10 swildner Exp $
 .\"
 .\" Copyright (c) 2000 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -92,9 +92,11 @@ subsystem.
 The
 .Nm
 device driver appeared in
-OpenBSD 2.8.
+.Ox 2.8 .
 The
 .Nm
-device driver was imported to FreeBSD in 5.0.
+device driver was imported to
+.Fx
+in 5.0.
 .Sh BUGS
 The BCM5801 and BCM5802 have not actually been tested.
diff --git a/share/man/man4/uvisor.4 b/share/man/man4/uvisor.4
index 92f4ce398b..69d218d3f3 100644
--- a/share/man/man4/uvisor.4
+++ b/share/man/man4/uvisor.4
@@ -1,6 +1,6 @@
 .\" $NetBSD: uvisor.4,v 1.3 2001/01/23 21:31:10 augustss Exp $
 .\" $FreeBSD: src/share/man/man4/uvisor.4,v 1.2.2.2 2002/08/22 15:13:11 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/uvisor.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/uvisor.4,v 1.4 2007/05/12 21:22:10 swildner Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -77,5 +77,6 @@ by
 at that time.
 .Sh BUGS
 The code to provide multiple ucom instances has not yet been ported
-from NetBSD. It's unclear whether this driver works in its
-current state.
+from
+.Nx .
+It's unclear whether this driver works in its current state.
diff --git a/usr.sbin/clog/clog.8 b/usr.sbin/clog/clog.8
index 7fd37afd91..4350aad105 100644
--- a/usr.sbin/clog/clog.8
+++ b/usr.sbin/clog/clog.8
@@ -24,7 +24,7 @@
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $Id: clog.8,v 1.2 2001/10/02 04:41:21 jdw Exp $
-.\" $DragonFly: src/usr.sbin/clog/clog.8,v 1.5 2006/05/06 17:39:29 swildner Exp $
+.\" $DragonFly: src/usr.sbin/clog/clog.8,v 1.6 2007/05/12 21:22:10 swildner Exp $
 .\"
 .Dd May 6, 2006
 .Dt CLOG 8
@@ -95,5 +95,7 @@ but soon lose relevance, such as messages logged at debug priority.
 .Sh HISTORY
 The
 .Nm
-command was written for FreeBSD 4.3 and was imported into
+command was written for
+.Fx 4.3
+and was imported into
 .Dx 1.1 .
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index 86572e58da..8d46d3a68f 100644
--- a/usr.sbin/lpr/lpd/lpd.8
+++ b/usr.sbin/lpr/lpd/lpd.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.14.2.13 2002/12/29 16:35:42 schweikh Exp $
-.\" $DragonFly: src/usr.sbin/lpr/lpd/lpd.8,v 1.4 2007/04/04 18:36:55 swildner Exp $
+.\" $DragonFly: src/usr.sbin/lpr/lpd/lpd.8,v 1.5 2007/05/12 21:22:10 swildner Exp $
 .\"
 .Dd June 6, 2001
 .Dt LPD 8
@@ -319,4 +319,5 @@ but not under same administrative control.
 .Sh HISTORY
 An
 .Nm
-daemon appeared in Version 6 AT&T UNIX.
+daemon appeared in
+.At v6 .
diff --git a/usr.sbin/pfctl/pf.conf.5 b/usr.sbin/pfctl/pf.conf.5
index b9319f8671..9415588ee6 100644
--- a/usr.sbin/pfctl/pf.conf.5
+++ b/usr.sbin/pfctl/pf.conf.5
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: pf.conf.5,v 1.291 2004/02/04 19:38:30 jmc Exp $
-.\"	$DragonFly: src/usr.sbin/pfctl/pf.conf.5,v 1.6 2006/08/18 01:42:58 swildner Exp $
+.\"	$DragonFly: src/usr.sbin/pfctl/pf.conf.5,v 1.7 2007/05/12 21:22:11 swildner Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
 .\" All rights reserved.
@@ -1893,17 +1893,23 @@ upon.
 The fingerprints may be specified by operating system class, by
 version, or by subtype/patchlevel.
 The class of an operating system is typically the vendor or genre
-and would be OpenBSD for the
+and would be
+.Ox
+for the
 .Xr pf 4
 firewall itself.
-The version of the oldest available OpenBSD release on the main ftp site
+The version of the oldest available
+.Ox
+release on the main ftp site
 would be 2.6 and the fingerprint would be written
 .Pp
 .Dl \&"OpenBSD 2.6\&"
 .Pp
 The subtype of an operating system is typically used to describe the
 patchlevel if that patch led to changes in the TCP stack behavior.
-In the case of OpenBSD, the only subtype is for a fingerprint that was
+In the case of
+.Ox ,
+the only subtype is for a fingerprint that was
 normalized by the
 .Ar no-df
 scrub option and would be specified as
diff --git a/usr.sbin/pfctl/pf.os.5 b/usr.sbin/pfctl/pf.os.5
index 720cd87bc2..8db55ee72a 100644
--- a/usr.sbin/pfctl/pf.os.5
+++ b/usr.sbin/pfctl/pf.os.5
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: pf.os.5,v 1.4 2003/08/28 09:41:23 jmc Exp $
-.\"	$DragonFly: src/usr.sbin/pfctl/pf.os.5,v 1.3 2005/08/05 15:35:52 swildner Exp $
+.\"	$DragonFly: src/usr.sbin/pfctl/pf.os.5,v 1.4 2007/05/12 21:22:11 swildner Exp $
 .\"
 .\" Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
 .\"
@@ -130,7 +130,9 @@ value.
 No TCP options in the fingerprint may be given with a single dot
 .Sq \&. .
 .Pp
-An example of OpenBSD's TCP options are:
+An example of
+.Ox Ap s
+TCP options are:
 .Pp
 .Dl M*,N,N,S,N,W0,N,N,T
 .Pp
-- 
2.41.0