From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Fri, 26 May 2006 19:39:41 +0000 (+0000)
Subject: - Uniformly use .In for header file references.
X-Git-Tag: v2.0.1~4873
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/44cb301e8903dd832ef88b01db3694023ab5e3a7

- Uniformly use .In for header file references.

- Fix numerous wrong directory names.
---

diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 7de635e159..e877ec41bf 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -34,7 +34,7 @@
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD: src/bin/sh/sh.1,v 1.39.2.25 2003/02/13 19:28:08 fanf Exp $
-.\" $DragonFly: src/bin/sh/sh.1,v 1.3 2006/04/11 11:57:00 reed Exp $
+.\" $DragonFly: src/bin/sh/sh.1,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd May 5, 1995
 .Dt SH 1
@@ -585,7 +585,7 @@ an executed shell function.
 .Pp
 If a command is terminated by a signal, its exit status is 128 plus
 the signal number.  Signal numbers are defined in the header file
-.Aq Pa sys/signal.h .
+.In sys/signal.h .
 .Ss Complex Commands
 Complex commands are combinations of simple commands
 with control operators or reserved words, together creating a larger complex
diff --git a/lib/libalias/libalias.3 b/lib/libalias/libalias.3
index 44b1949d66..e87da96fe8 100644
--- a/lib/libalias/libalias.3
+++ b/lib/libalias/libalias.3
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libalias/libalias.3,v 1.23.2.11 2001/12/17 10:08:22 ru Exp $
-.\" $DragonFly: src/lib/libalias/libalias.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libalias/libalias.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd April 13, 2000
 .Dt LIBALIAS 3
@@ -159,7 +159,7 @@ Only bits marked in
 .Fa mask
 are affected.
 The following mode bits are defined in
-.Aq Pa alias.h :
+.In alias.h :
 .Bl -tag -width indent
 .It Dv PKT_ALIAS_LOG
 Enables logging into
@@ -375,7 +375,7 @@ can be either
 or
 .Dv IPPROTO_UDP ,
 as defined in
-.Aq Pa netinet/in.h .
+.In netinet/in.h .
 .Pp
 If
 .Fa local_addr
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index 02ba217e92..75f429ec10 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)sigvec.2	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/lib/libc/compat-43/sigvec.2,v 1.9.2.8 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/compat-43/sigvec.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/compat-43/sigvec.2,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd April 19, 1994
 .Dt SIGVEC 2
@@ -140,7 +140,7 @@ is returned to the user.
 .Pp
 The following is a list of all signals
 with names as in the include file
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
 .It Sy "NAME	Default Action	Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
@@ -292,7 +292,7 @@ argument
 is a pointer to the
 .Fa sigcontext
 structure (defined in
-.Aq Pa signal.h ) ,
+.In signal.h ) ,
 used to restore the context from before the signal.
 .Sh ERRORS
 The
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 6c6cee3104..5a6159f17e 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -27,7 +27,7 @@
 .\"
 .\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
 .\" $FreeBSD: src/lib/libc/db/man/btree.3,v 1.3.2.3 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/db/man/btree.3,v 1.3 2005/09/19 09:20:37 asmodai Exp $
+.\" $DragonFly: src/lib/libc/db/man/btree.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd August 18, 1994
 .Dt BTREE 3
@@ -61,7 +61,7 @@ The
 access method specific data structure provided to
 .Fn dbopen
 is defined in the
-.Aq Pa db.h
+.In db.h
 include file as follows:
 .Bd -literal
 typedef struct {
diff --git a/lib/libc/db/man/dbm.3 b/lib/libc/db/man/dbm.3
index d1f8ec8be2..1f816112f0 100644
--- a/lib/libc/db/man/dbm.3
+++ b/lib/libc/db/man/dbm.3
@@ -14,7 +14,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/db/man/dbm.3,v 1.2.2.5 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/db/man/dbm.3,v 1.2 2003/06/17 04:26:41 dillon Exp $
+.\" $DragonFly: src/lib/libc/db/man/dbm.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
@@ -66,7 +66,7 @@ database.
 .Pp
 .Vt datum
 is declared in
-.Aq Pa ndbm.h :
+.In ndbm.h :
 .Bd -literal
 typedef struct {
 	char *dptr;
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index 54fd3e2719..9d753e17a2 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -27,7 +27,7 @@
 .\"
 .\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
 .\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.3.2.3 2003/02/23 19:45:52 trhodes Exp $
-.\" $DragonFly: src/lib/libc/db/man/dbopen.3,v 1.3 2005/09/19 09:04:17 asmodai Exp $
+.\" $DragonFly: src/lib/libc/db/man/dbopen.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd September 19, 2005
 .Dt DBOPEN 3
@@ -116,7 +116,7 @@ The
 argument is of type
 .Ft DBTYPE
 (as defined in the
-.Aq Pa db.h
+.In db.h
 include file) and
 may be set to
 .Dv DB_BTREE , DB_HASH
@@ -145,7 +145,7 @@ on error.
 The
 .Ft DB
 structure is defined in the
-.Aq Pa db.h
+.In db.h
 include file, and contains at
 least the following fields:
 .Bd -literal
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index bb2f0f8b19..c42a8409ba 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -27,7 +27,7 @@
 .\"
 .\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
 .\" $FreeBSD: src/lib/libc/db/man/hash.3,v 1.4.2.3 2003/02/23 19:45:52 trhodes Exp $
-.\" $DragonFly: src/lib/libc/db/man/hash.3,v 1.3 2005/09/19 09:20:37 asmodai Exp $
+.\" $DragonFly: src/lib/libc/db/man/hash.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd August 18, 1994
 .Dt HASH 3
@@ -58,7 +58,7 @@ data structure is an extensible, dynamic hashing scheme.
 The access method specific data structure provided to
 .Fn dbopen
 is defined in the
-.Aq Pa db.h
+.In db.h
 include file as follows:
 .Bd -literal
 typedef struct {
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index e091b4ae94..25e28ebba4 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -27,7 +27,7 @@
 .\"
 .\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
 .\" $FreeBSD: src/lib/libc/db/man/recno.3,v 1.4.2.2 2001/12/14 18:33:49 ru Exp $
-.\" $DragonFly: src/lib/libc/db/man/recno.3,v 1.3 2005/09/19 09:20:37 asmodai Exp $
+.\" $DragonFly: src/lib/libc/db/man/recno.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd August 18, 1994
 .Dt RECNO 3
@@ -63,7 +63,7 @@ The
 access method specific data structure provided to
 .Fn dbopen
 is defined in the
-.Aq Pa db.h
+.In db.h
 include file as follows:
 .Bd -literal
 typedef struct {
@@ -176,7 +176,7 @@ The
 field of the key should be a pointer to a memory location of type
 .Ft recno_t ,
 as defined in the
-.Aq Pa db.h
+.In db.h
 include file.
 This type is normally the largest unsigned integral type available to
 the implementation.
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index c1ea65acf4..c6bea6b7e5 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)confstr.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/gen/confstr.3,v 1.5.2.5 2001/12/14 18:33:50 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/confstr.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/confstr.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt CONFSTR 3
@@ -60,7 +60,7 @@ The
 .Fa name
 argument specifies the system variable to be queried.
 Symbolic constants for each name value are found in the include file
-.Aq Pa unistd.h .
+.In unistd.h .
 The
 .Fa len
 argument specifies the size of the buffer referenced by the
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
index 11130aec08..5608c7f39b 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ctermid.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/gen/ctermid.3,v 1.5.2.4 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/ctermid.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/ctermid.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt CTERMID 3
@@ -66,7 +66,7 @@ is assumed to be at least
 .Dv L_ctermid
 (as defined in the include
 file
-.Aq Pa stdio.h )
+.In stdio.h )
 bytes long.
 .Pp
 The
diff --git a/lib/libc/gen/ctype.3 b/lib/libc/gen/ctype.3
index 1e8b5ee8c0..1cbc251715 100644
--- a/lib/libc/gen/ctype.3
+++ b/lib/libc/gen/ctype.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ctype.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/locale/ctype.3,v 1.6.2.3 2001/12/14 18:33:54 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/ctype.3,v 1.2 2003/06/17 04:26:43 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/ctype.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt CTYPE 3
@@ -110,7 +110,7 @@
 The above functions perform character tests and conversions on the integer
 .Ar c .
 They are available as macros, defined in the include file
-.Aq Pa ctype.h ,
+.In ctype.h ,
 or as true functions in the C library.
 See the specific manual pages for more information.
 .Sh SEE ALSO
diff --git a/lib/libc/gen/dlinfo.3 b/lib/libc/gen/dlinfo.3
index 28fa28c17e..0b01e56dfa 100644
--- a/lib/libc/gen/dlinfo.3
+++ b/lib/libc/gen/dlinfo.3
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.3.2.1 2003/02/20 20:42:45 kan Exp $
-.\" $DragonFly: src/lib/libc/gen/dlinfo.3,v 1.5 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/dlinfo.3,v 1.6 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd February 14, 2003
 .Os
@@ -98,7 +98,9 @@ See
 .Pp
 The
 .Ft Link_map
-structure is defined in <link.h> and have following members:
+structure is defined in
+.In link.h
+and has the following members:
 .Pp
 .Bd -literal
   caddr_t         l_addr;    /* Base Address of library */
@@ -149,7 +151,9 @@ The corresponding
 .Dv dlp_info
 field contains one of more flags indicating the origin of the path (see the
 .Dv LA_SER_*
-flags defined in <link.h> header file.)
+flags defined in the
+.In link.h
+header file.)
 See
 .Sx EXAMPLES
 (Example 2) for usage example.
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index c7e553453e..29f55b31e6 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)exec.3	8.3 (Berkeley) 1/24/94
 .\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.7.2.8 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/exec.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/exec.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd January 24, 1994
 .Dt EXEC 3
@@ -149,7 +149,7 @@ If this variable isn't specified,
 the default path is set according to the
 .Dv _PATH_DEFPATH
 definition in
-.Aq paths.h ,
+.In paths.h ,
 which is set to
 .Dq Ev /usr/bin:/bin .
 In addition, certain errors are treated specially.
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index 120ccfce0c..45e7a4b87c 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
 .\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.9.2.4 2003/03/13 18:05:37 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/fnmatch.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/fnmatch.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd April 28, 1995
 .Dt FNMATCH 3
@@ -70,7 +70,7 @@ is the bitwise inclusive
 .Tn OR
 of any of the following
 constants, which are defined in the include file
-.Pa fnmatch.h .
+.In fnmatch.h .
 .Bl -tag -width FNM_PATHNAME
 .It Dv FNM_NOESCAPE
 Normally, every occurrence of a backslash
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index b6892ece47..c7af445ed5 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.7.2.6 2003/03/13 18:05:37 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/fts.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/fts.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd September 15, 2002
 .Dt FTS 3
@@ -88,7 +88,7 @@ or physically (visiting symbolic links), order the walk of the hierarchy or
 prune and/or re-visit portions of the hierarchy.
 .Pp
 Two structures are defined (and typedef'd) in the include file
-.Aq Pa fts.h .
+.In fts.h .
 The first is
 .Fa FTS ,
 the structure that represents the file hierarchy itself.
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index d21ee4d22b..6d0e427390 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)getcwd.3	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/lib/libc/gen/getcwd.3,v 1.7.2.6 2001/12/14 18:33:51 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/getcwd.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/getcwd.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd November 24, 1997
 .Dt GETCWD 3
@@ -79,7 +79,7 @@ argument and a size of
 .Dv MAXPATHLEN
 (as defined in the include
 file
-.Aq Pa sys/param.h ) .
+.In sys/param.h ) .
 Obviously,
 .Fa buf
 should be at least
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index fcab6ce127..edbeab6a1b 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/gen/getdomainname.3,v 1.9.2.5 2001/12/14 18:33:51 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/getdomainname.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/getdomainname.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd May 6, 1994
 .Dt GETDOMAINNAME 3
@@ -95,5 +95,5 @@ function call appeared in
 Domain names are limited to
 .Dv MAXHOSTNAMELEN
 (from
-.Ao Pa sys/param.h Ac )
+.In sys/param.h )
 characters, currently 256.
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index b29cd68400..6d9517cdc4 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)getfsent.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.5.2.4 2001/12/14 18:33:51 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/getfsent.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/getfsent.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETFSENT 3
@@ -67,7 +67,7 @@ functions
 each return a pointer to an object with the following structure
 containing the broken-out fields of a line in the file system
 description file,
-.Aq Pa fstab.h .
+.In fstab.h .
 .Bd -literal -offset indent
 struct fstab {
 	char	*fs_spec;	/* block special device name */
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index aa784c642b..7ed37a419e 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)getgrent.3	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.12.2.4 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/getgrent.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/getgrent.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd September 29, 1994
 .Dt GETGRENT 3
@@ -74,7 +74,7 @@ Each line of the database is defined by the structure
 .Vt group
 found in the include
 file
-.Aq Pa grp.h :
+.In grp.h :
 .Bd -literal -offset indent
 struct group {
 	char	*gr_name;	/* group name */
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 936e481749..7b3a4ba932 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/gen/gethostname.3,v 1.5.2.6 2003/03/13 18:05:37 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/gethostname.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/gethostname.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETHOSTNAME 3
@@ -99,7 +99,7 @@ function appeared in
 Host names are limited to
 .Dv MAXHOSTNAMELEN
 (from
-.Ao Pa sys/param.h Ac )
+.In sys/param.h )
 characters, currently 256.
 This includes the trailing
 .Dv NUL .
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index df97b7fb27..170aee35b4 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)getpwent.3	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.11.2.5 2002/02/01 15:51:16 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/getpwent.3,v 1.4 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/getpwent.3,v 1.5 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd September 20, 1994
 .Dt GETPWENT 3
@@ -71,7 +71,7 @@ Each entry in the database is defined by the structure
 .Ar passwd
 found in the include
 file
-.Aq Pa pwd.h :
+.In pwd.h :
 .Bd -literal -offset indent
 struct passwd {
 	char	*pw_name;	/* user name */
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index f8ff79a94e..27cad2b4fd 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)glob.3	8.3 (Berkeley) 4/16/94
 .\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.7.2.11 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/glob.3,v 1.3 2005/12/07 02:28:15 corecode Exp $
+.\" $DragonFly: src/lib/libc/gen/glob.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd December 6, 2005
 .Dt GLOB 3
@@ -58,7 +58,7 @@ is a pathname generator that implements the rules for file name pattern
 matching used by the shell.
 .Pp
 The include file
-.Pa glob.h
+.In glob.h
 defines the structure type
 .Fa glob_t ,
 which contains at least the following fields:
@@ -122,7 +122,7 @@ is the bitwise inclusive
 .Tn OR
 of any of the following
 values defined in
-.Pa glob.h :
+.In glob.h :
 .Bl -tag -width GLOB_ALTDIRFUNC
 .It Dv GLOB_APPEND
 Append pathnames generated to the ones from a previous call (or calls)
@@ -379,7 +379,7 @@ If
 terminates due to an error, it sets errno and returns one of the
 following non-zero constants, which are defined in the include
 file
-.Aq Pa glob.h :
+.In glob.h :
 .Bl -tag -width GLOB_NOCHECK
 .It Dv GLOB_NOSPACE
 An attempt to allocate memory failed, or if
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index c98a913a9d..42d60e1584 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.8.2.7 2003/03/13 18:05:37 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/msgctl.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/msgctl.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"/
 .Dd November 24, 1997
 .Dt MSGCTL 3
@@ -59,7 +59,7 @@ may be altered by
 and parts of which determine the actions of
 .Fn msgctl .
 The data structure is defined in
-.Aq Pa sys/msg.h
+.In sys/msg.h
 and contains (amongst others) the following members:
 .Bd -literal
 struct msqid_ds {
@@ -86,7 +86,7 @@ The
 structure used inside the
 .Vt shmid_ds
 structure is defined in
-.Aq Pa sys/ipc.h
+.In sys/ipc.h
 and looks like this:
 .Bd -literal
 struct ipc_perm {
@@ -134,7 +134,7 @@ can only be increased by the super-user.
 Values for
 .Va msg_qbytes
 that exceed the system limit (MSGMNB from
-.Aq Pa sys/msg.h )
+.In sys/msg.h )
 are silently truncated to that limit.
 .It Dv IPC_RMID
 Remove the message queue specified by
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index d0b5e241f5..15a48a543d 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)signal.3	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD: src/lib/libc/gen/signal.3,v 1.17.2.9 2003/03/13 18:05:37 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/signal.3,v 1.4 2004/03/11 12:28:50 hmp Exp $
+.\" $DragonFly: src/lib/libc/gen/signal.3,v 1.5 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd April 19, 1994
 .Dt SIGNAL 3
@@ -90,7 +90,7 @@ signals, the
 function allows for a signal to be caught, to be ignored, or to generate
 an interrupt.
 These signals are defined in the file
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
 .It Sy "Name	Default Action	Description"
 .It Dv SIGHUP Ta "terminate process" Ta "terminal line hangup"
diff --git a/lib/libc/gen/sigsetops.3 b/lib/libc/gen/sigsetops.3
index e77499a51b..67cf999c6c 100644
--- a/lib/libc/gen/sigsetops.3
+++ b/lib/libc/gen/sigsetops.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)sigsetops.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.4.2.3 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/sigsetops.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/sigsetops.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGSETOPS 3
@@ -95,7 +95,8 @@ function returns whether a specified signal
 is contained in the signal set.
 .Pp
 These functions
-are provided as macros in the include file <signal.h>.
+are provided as macros in the include file
+.In signal.h .
 Actual functions are available
 if their names are undefined (with
 .Ic #undef Ar name ) .
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 3f195ba1e5..f3268155af 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD: src/lib/libc/gen/sysconf.3,v 1.8.2.6 2001/12/14 18:33:51 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/sysconf.3,v 1.4 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/sysconf.3,v 1.5 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd April 19, 1994
 .Dt SYSCONF 3
@@ -59,7 +59,7 @@ The
 .Fa name
 argument specifies the system variable to be queried.
 Symbolic constants for each name value are found in the include file
-.Aq Pa unistd.h .
+.In unistd.h .
 .Pp
 The available values are as follows:
 .Pp
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 1647c5d9ef..4f6304c4d4 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
 .\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.33.2.13 2002/04/07 04:57:14 dd Exp $
-.\" $DragonFly: src/lib/libc/gen/sysctl.3,v 1.4 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/sysctl.3,v 1.5 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd January 23, 2001
 .Dt SYSCTL 3
@@ -181,7 +181,7 @@ for (i = 0; i < 100; i++) {
 .Ed
 .Pp
 The top level names are defined with a CTL_ prefix in
-.Aq Pa sys/sysctl.h ,
+.In sys/sysctl.h ,
 and are as follows.
 The next and subsequent levels down are found in the include files
 listed here, and described in separate sections below.
@@ -745,24 +745,24 @@ pageout daemon will enter "memory conserving mode" to avoid deadlock.
 .Sh RETURN VALUES
 .Rv -std
 .Sh FILES
-.Bl -tag -width <netinet/icmpXvar.h> -compact
-.It Aq Pa sys/sysctl.h
+.Bl -tag -width ".In netinet/icmp_var.h" -compact
+.It In sys/sysctl.h
 definitions for top level identifiers, second level kernel and hardware
 identifiers, and user level identifiers
-.It Aq Pa sys/socket.h
+.It In sys/socket.h
 definitions for second level network identifiers
-.It Aq Pa sys/gmon.h
+.It In sys/gmon.h
 definitions for third level profiling identifiers
-.It Aq Pa vm/vm_param.h
+.It In vm/vm_param.h
 definitions for second level virtual memory identifiers
-.It Aq Pa netinet/in.h
+.It In netinet/in.h
 definitions for third level IPv4/IPv6 identifiers and
 fourth level IPv4/v6 identifiers
-.It Aq Pa netinet/icmp_var.h
+.It In netinet/icmp_var.h
 definitions for fourth level ICMP identifiers
-.It Aq Pa netinet/icmp6.h
+.It In netinet/icmp6.h
 definitions for fourth level ICMPv6 identifiers
-.It Aq Pa netinet/udp_var.h
+.It In netinet/udp_var.h
 definitions for fourth level UDP identifiers
 .El
 .Sh ERRORS
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index 2a9448a949..2761163469 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)tcsetattr.3	8.3 (Berkeley) 1/2/94
 .\" $FreeBSD: src/lib/libc/gen/tcsetattr.3,v 1.6.2.4 2002/12/29 16:35:34 schweikh Exp $
-.\" $DragonFly: src/lib/libc/gen/tcsetattr.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/tcsetattr.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd January 2, 1994
 .Dt TCSETATTR 3
@@ -98,7 +98,7 @@ The input and output baud rates are found in the termios structure.
 The unsigned integer
 .Li speed_t
 is typedef'd in the include file
-.Aq Pa termios.h .
+.In termios.h .
 The value of the integer corresponds directly to the baud rate being
 represented, however, the following symbolic values are defined.
 .Bd -literal
@@ -219,7 +219,7 @@ The
 field is created by
 .Em or Ns 'ing
 the following values, as specified in the include file
-.Aq Pa termios.h .
+.In termios.h .
 .Bl -tag -width "TCSADRAIN"
 .It Fa TCSANOW
 The change occurs immediately.
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 5ce7138583..f53c8bb8ed 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)uname.3	8.1 (Berkeley) 1/4/94
 .\" $FreeBSD: src/lib/libc/gen/uname.3,v 1.6.2.4 2001/12/14 18:33:51 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/uname.3,v 1.2 2003/06/17 04:26:42 dillon Exp $
+.\" $DragonFly: src/lib/libc/gen/uname.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
 .\"
 .Dd January 4, 1994
 .Dt UNAME 3
@@ -55,7 +55,7 @@ the current system into the structure referenced by
 The
 .Vt utsname
 structure is defined in the
-.Aq Pa sys/utsname.h
+.In sys/utsname.h
 header file, and contains the following members:
 .Bl -tag -width nodenameXXXX -offset indent
 .It sysname
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index 02d18840de..7dad6526bd 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -31,7 +31,7 @@
 .\"
 .\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
 .\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.6.2.7 2001/12/14 18:33:54 ru Exp $
-.\" $DragonFly: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.4 2006/03/26 22:56:56 swildner Exp $
+.\" $DragonFly: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.5 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd September 20, 1993
 .Dt I386_GET_LDT 2
@@ -67,7 +67,7 @@ and the number of entries to set or return
 The argument
 .Fa descs
 can be either segment_descriptor or gate_descriptor and are defined in
-.Aq Pa i386/segments.h .
+.In machine/segments.h .
 These structures are defined by the architecture
 as disjoint bit-fields, so care must be taken in constructing them.
 .Sh RETURN VALUES
diff --git a/lib/libc/locale/nl_langinfo.3 b/lib/libc/locale/nl_langinfo.3
index 242eb9f0f4..d5b939484f 100644
--- a/lib/libc/locale/nl_langinfo.3
+++ b/lib/libc/locale/nl_langinfo.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: src/lib/libc/locale/nl_langinfo.3,v 1.13 2004/01/24 16:58:54 wiz Exp $
-.\"	$DragonFly: src/lib/libc/locale/nl_langinfo.3,v 1.4 2005/12/10 00:22:28 swildner Exp $
+.\"	$DragonFly: src/lib/libc/locale/nl_langinfo.3,v 1.5 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\" Written by J.T. Conklin <jtc@NetBSD.org>.
 .\" Public domain.
@@ -25,7 +25,7 @@ set by the program's locale.
 The names and values of
 .Fa item
 are defined in
-.Aq Pa langinfo.h .
+.In langinfo.h .
 The entries under Category indicate in which
 .Xr setlocale 3
 category each item is defined.
diff --git a/lib/libc/net/addr2ascii.3 b/lib/libc/net/addr2ascii.3
index f756b904f1..054ae56f7a 100644
--- a/lib/libc/net/addr2ascii.3
+++ b/lib/libc/net/addr2ascii.3
@@ -28,7 +28,7 @@
 .\"
 .\"	$ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $
 .\" $FreeBSD: src/lib/libc/net/addr2ascii.3,v 1.7.2.5 2001/12/14 18:33:55 ru Exp $
-.\" $DragonFly: src/lib/libc/net/addr2ascii.3,v 1.2 2003/06/17 04:26:44 dillon Exp $
+.\" $DragonFly: src/lib/libc/net/addr2ascii.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 13, 1996
 .Dt ADDR2ASCII 3
@@ -107,15 +107,15 @@ addresses in the specified family:
 .It Dv AF_INET
 .Li struct in_addr
 (in
-.Aq Pa netinet/in.h )
+.In netinet/in.h )
 .It Dv AF_LINK
 .Li struct sockaddr_dl
 (in
-.Aq Pa net/if_dl.h )
+.In net/if_dl.h )
 .\" .It Dv AF_INET6
 .\" .Li struct in6_addr
 .\" (in
-.\" .Aq Pa netinet6/in6.h )
+.\" .In netinet6/in6.h )
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index 0334971e01..5a0f98f7d5 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.10.2.11 2002/02/01 15:51:17 ru Exp $
-.\" $DragonFly: src/lib/libc/net/ethers.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/net/ethers.3,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 3
@@ -62,7 +62,7 @@
 These functions operate on ethernet addresses using an
 .Ar ether_addr
 structure, which is defined in the header file
-.Aq Pa netinet/if_ether.h :
+.In netinet/if_ether.h :
 .Bd -literal -offset indent
 /*
  * The number of bytes in an ethernet (MAC) address.
diff --git a/lib/libc/net/eui64.3 b/lib/libc/net/eui64.3
index 405bd702f4..77c4956883 100644
--- a/lib/libc/net/eui64.3
+++ b/lib/libc/net/eui64.3
@@ -55,7 +55,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/net/eui64.3,v 1.3 2004/07/07 20:15:31 ru Exp $
-.\" $DragonFly: src/lib/libc/net/eui64.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/net/eui64.3,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd March 4, 2004
 .Dt EUI64 3
@@ -87,7 +87,7 @@
 These functions operate on IEEE EUI-64s using an
 .Vt eui64
 structure, which is defined in the header file
-.Aq Pa sys/eui64.h :
+.In sys/eui64.h :
 .Bd -literal -offset indent
 /*
  * The number of bytes in an EUI-64.
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index e0f5c4c6b5..049ee9e0ed 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -1,7 +1,7 @@
 .\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"	$OpenBSD: getaddrinfo.3,v 1.35 2004/12/21 03:40:31 jaredy Exp $
 .\"	$FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.29 2005/01/23 16:02:48 gnn Exp $
-.\"	$DragonFly: src/lib/libc/net/getaddrinfo.3,v 1.3 2005/01/23 17:03:13 hrs Exp $
+.\"	$DragonFly: src/lib/libc/net/getaddrinfo.3,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000, 2001  Internet Software Consortium.
@@ -26,9 +26,9 @@
 .Nm freeaddrinfo
 .Nd socket address structure to host and service name
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netdb.h>
+.In sys/types.h
+.In sys/socket.h
+.In netdb.h
 .Ft int
 .Fn getaddrinfo "const char *hostname" "const char *servname" \
     "const struct addrinfo *hints" "struct addrinfo **res"
@@ -72,7 +72,7 @@ must be non-null.
 is an optional pointer to a
 .Li struct addrinfo ,
 as defined by
-.Aq Pa netdb.h :
+.In netdb.h :
 .Bd -literal
 struct addrinfo {
 	int ai_flags;		/* input flags */
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index d6e3460170..ec210ffc65 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/lib/libc/net/getifaddrs.3,v 1.1.2.5 2001/12/14 18:33:55 ru Exp $
-.\"	$DragonFly: src/lib/libc/net/getifaddrs.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\"	$DragonFly: src/lib/libc/net/getifaddrs.3,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"	$KAME: getifaddrs.3,v 1.4 2000/05/17 14:13:14 itojun Exp $
 .\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
 .\"
@@ -46,7 +46,7 @@ on the local machine in the memory referenced by
 The list consists of
 .Nm ifaddrs
 structures, as defined in the include file
-.Aq Pa ifaddrs.h .
+.In ifaddrs.h .
 The
 .Nm ifaddrs
 structure contains at least the following entries:
@@ -116,12 +116,12 @@ field references address family specific data.  For
 addresses it contains a pointer to the
 .Fa struct if_data
 (as defined in include file
-.Aq Pa net/if.h )
+.In net/if.h )
 which contains various interface attributes and statistics.
 For all other address families, it contains a pointer to the
 .Fa struct ifa_data
 (as defined in include file
-.Aq Pa net/if.h )
+.In net/if.h )
 which contains per-address interface statistics.
 .Pp
 The data returned by
@@ -155,11 +155,11 @@ implementation first appeared in BSDi
 .Bsx .
 .Sh BUGS
 If both
-.Aq Pa net/if.h
+.In net/if.h
 and
-.Aq Pa ifaddrs.h
+.In ifaddrs.h
 are being included,
-.Aq Pa net/if.h
+.In net/if.h
 .Em must
 be included before
-.Aq Pa ifaddrs.h .
+.In ifaddrs.h .
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 55f00bc8a6..3e8e9d5eb6 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -1,7 +1,7 @@
 .\"	$KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
 .\"	$OpenBSD: getnameinfo.3,v 1.36 2004/12/21 09:48:20 jmc Exp $
 .\"	$FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.21 2005/01/23 16:02:48 gnn Exp $
-.\"	$DragonFly: src/lib/libc/net/getnameinfo.3,v 1.3 2005/01/23 17:03:13 hrs Exp $
+.\"	$DragonFly: src/lib/libc/net/getnameinfo.3,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000, 2001  Internet Software Consortium.
@@ -25,9 +25,9 @@
 .Nm getnameinfo
 .Nd socket address structure to hostname and service name
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netdb.h>
+.In sys/types.h
+.In sys/socket.h
+.In netdb.h
 .Ft int
 .Fn getnameinfo "const struct sockaddr *sa" "socklen_t salen" "char *host" \
     "size_t hostlen" "char *serv" "size_t servlen" "int flags"
@@ -77,7 +77,7 @@ the maximum value for
 is
 .Dv NI_MAXSERV ,
 as defined by
-.Aq Pa netdb.h .
+.In netdb.h .
 If a length parameter is zero, no string will be stored.
 Otherwise, enough space must be provided to store the
 host name or service string plus a byte for the NUL terminator.
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index bc510b398c..6820624fe9 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.2 2003/06/17 04:26:44 dillon Exp $
+.\"	$DragonFly: src/lib/libc/net/if_indextoname.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd "July 11, 1997"
 .Dt IF_NAMETOINDEX 3
@@ -70,7 +70,7 @@ function returns an array of
 .Nm if_nameindex
 structures, one structure per interface, as
 defined in the include file
-.Aq Pa net/if.h .
+.In net/if.h .
 The
 .Nm if_nameindex
 structure contains at least the following entries:
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index c221dfdc17..e5f437f10a 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.11.2.7 2001/12/14 18:33:55 ru Exp $
-.\" $DragonFly: src/lib/libc/net/resolver.3,v 1.2 2003/06/17 04:26:44 dillon Exp $
+.\" $DragonFly: src/lib/libc/net/resolver.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt RESOLVER 3
@@ -116,7 +116,7 @@ Options
 stored in
 .Em _res.options
 are defined in
-.Pa resolv.h
+.In resolv.h
 and are as follows.
 Options are stored as a simple bit mask containing the bitwise ``or''
 of the options enabled.
@@ -274,7 +274,7 @@ The query type
 is usually
 .Dv QUERY ,
 but can be any of the query types defined in
-.Aq Pa arpa/nameser.h .
+.In arpa/nameser.h .
 The domain name for the query is given by
 .Fa dname .
 .Fa Newrr
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 26fe57ea21..ca7e3daf7d 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
 .\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.4.2.4 2001/12/14 18:33:56 ru Exp $
-.\" $DragonFly: src/lib/libc/regex/regex.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/regex/regex.3,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd March 20, 1994
 .Dt REGEX 3
@@ -84,7 +84,7 @@ frees any dynamically-allocated storage used by the internal form
 of an RE.
 .Pp
 The header
-.Aq Pa regex.h
+.In regex.h
 declares two structure types,
 .Ft regex_t
 and
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index fcb9d18a48..7bcc2ddb02 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)funopen.3	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: src/lib/libc/stdio/funopen.3,v 1.7.2.4 2001/12/14 18:33:57 ru Exp $
-.\" $DragonFly: src/lib/libc/stdio/funopen.3,v 1.2 2003/06/17 04:26:46 dillon Exp $
+.\" $DragonFly: src/lib/libc/stdio/funopen.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 9, 1993
 .Dt FUNOPEN 3
@@ -118,7 +118,7 @@ An error on
 does not keep the stream open.
 .Pp
 As a convenience, the include file
-.Aq Pa stdio.h
+.In stdio.h
 defines the macros
 .Fn fropen
 and
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index 85464c069d..4dc6eb3dcc 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)tmpnam.3	8.2 (Berkeley) 11/17/93
 .\" $FreeBSD: src/lib/libc/stdio/tmpnam.3,v 1.5.2.5 2001/12/14 18:33:57 ru Exp $
-.\" $DragonFly: src/lib/libc/stdio/tmpnam.3,v 1.2 2003/06/17 04:26:46 dillon Exp $
+.\" $DragonFly: src/lib/libc/stdio/tmpnam.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd November 17, 1993
 .Dt TMPFILE 3
@@ -86,7 +86,7 @@ did not reference an existing file at some indeterminate point in the
 past.
 .Dv P_tmpdir
 is defined in the include file
-.Aq Pa stdio.h .
+.In stdio.h .
 If the argument
 .Fa str
 is
@@ -104,7 +104,7 @@ is expected to be at least
 bytes in length.
 .Dv L_tmpnam
 is defined in the include file
-.Aq Pa stdio.h .
+.In stdio.h .
 .Pp
 The
 .Fn tempnam
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index 4696484e46..975da052b2 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
 .\" $FreeBSD: src/lib/libc/stdlib/getopt.3,v 1.11.2.8 2001/12/14 18:33:58 ru Exp $
-.\" $DragonFly: src/lib/libc/stdlib/getopt.3,v 1.4 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/stdlib/getopt.3,v 1.5 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd April 27, 1995
 .Dt GETOPT 3
@@ -210,7 +210,7 @@ This was changed by
 to decouple
 .Fn getopt
 from
-.Pa <stdio.h> .
+.In stdio.h .
 .Pp
 A single dash
 .Dq Li -
diff --git a/lib/libc/stdlib/hcreate.3 b/lib/libc/stdlib/hcreate.3
index 5c250dcc16..5d3126951b 100644
--- a/lib/libc/stdlib/hcreate.3
+++ b/lib/libc/stdlib/hcreate.3
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.2.2.2 2003/04/05 13:53:05 dwmalone Exp $
-.\" $DragonFly: src/lib/libc/stdlib/hcreate.3,v 1.4 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/stdlib/hcreate.3,v 1.5 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd May 8, 2001
 .Os
@@ -64,7 +64,7 @@ The
 argument is a structure of type
 .Vt ENTRY
 (defined in the
-.Aq Pa search.h
+.In search.h
 header) containing two pointers:
 .Fa item.key
 points to the comparison key (a
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
index 5acc126364..8627fe4479 100644
--- a/lib/libc/stdlib/rand.3
+++ b/lib/libc/stdlib/rand.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)rand.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/stdlib/rand.3,v 1.14 2003/09/08 19:57:15 ru Exp $
-.\" $DragonFly: src/lib/libc/stdlib/rand.3,v 1.4 2004/12/26 12:37:08 swildner Exp $
+.\" $DragonFly: src/lib/libc/stdlib/rand.3,v 1.5 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd May 25, 1999
 .Dt RAND 3
@@ -70,7 +70,7 @@ function computes a sequence of pseudo-random integers in the range
 of 0 to
 .Dv RAND_MAX
 (as defined by the header file
-.Aq Pa stdlib.h ) .
+.In stdlib.h ) .
 .Pp
 The
 .Fn srand
diff --git a/lib/libc/stdlib/strtonum.3 b/lib/libc/stdlib/strtonum.3
index 0a24120a30..5154ceb312 100644
--- a/lib/libc/stdlib/strtonum.3
+++ b/lib/libc/stdlib/strtonum.3
@@ -1,5 +1,5 @@
 .\" $OpenBSD: strtonum.3,v 1.5 2004/05/06 06:19:01 tedu Exp $
-.\" $DragonFly: src/lib/libc/stdlib/strtonum.3,v 1.3 2005/08/01 01:49:16 swildner Exp $
+.\" $DragonFly: src/lib/libc/stdlib/strtonum.3,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\" Copyright (c) 2004 Ted Unangst
 .\"
@@ -22,8 +22,8 @@
 .Nm strtonum
 .Nd "reliably convert string value to an integer"
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
-.Fd #include <limits.h>
+.In stdlib.h
+.In limits.h
 .Ft unsigned long long
 .Fo strtonum
 .Fa "const char *nptr"
diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3
index df0e1cd2ed..9e1abed3e4 100644
--- a/lib/libc/stdtime/ctime.3
+++ b/lib/libc/stdtime/ctime.3
@@ -33,7 +33,7 @@
 .\"
 .\"     From: @(#)ctime.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/stdtime/ctime.3,v 1.11.2.7 2003/05/23 23:53:40 keramida Exp $
-.\" $DragonFly: src/lib/libc/stdtime/ctime.3,v 1.2 2003/06/17 04:26:46 dillon Exp $
+.\" $DragonFly: src/lib/libc/stdtime/ctime.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd January 2, 1999
 .Dt CTIME 3
@@ -267,7 +267,7 @@ returns the difference between two calendar times,
 expressed in seconds.
 .Pp
 External declarations as well as the tm structure definition are in the
-.Aq Pa time.h
+.In time.h
 include file.
 The tm structure includes at least the following fields:
 .Bd -literal -offset indent
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index 1063e10d81..ca8e5819d9 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)acct.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/acct.2,v 1.6.2.5 2004/04/17 10:04:10 brueffer Exp $
-.\" $DragonFly: src/lib/libc/sys/acct.2,v 1.3 2004/04/19 18:41:35 justin Exp $
+.\" $DragonFly: src/lib/libc/sys/acct.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd April 17, 2004
 .Dt ACCT 2
@@ -70,7 +70,7 @@ produced by
 For more information on the record structure used by
 .Fn acct ,
 see
-.Pa /usr/include/sys/acct.h
+.In sys/acct.h
 and
 .Xr acct 5 .
 .Pp
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index e336ae96d7..cff67f65f4 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/chmod.2,v 1.16.2.7 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/chmod.2,v 1.3 2004/03/11 12:28:51 hmp Exp $
+.\" $DragonFly: src/lib/libc/sys/chmod.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt CHMOD 2
@@ -82,7 +82,7 @@ A mode is created from
 .Em or'd
 permission bit masks
 defined in
-.Aq Pa sys/stat.h :
+.In sys/stat.h :
 .Pp
 .Bd -literal -offset indent -compact
 #define S_IRWXU 0000700    /* RWX mask for owner */
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 67ee0ec16b..279889f6bd 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -1,6 +1,6 @@
 .\"	$OpenBSD: clock_gettime.2,v 1.4 1997/05/08 20:21:16 kstailey Exp $
 .\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.3.2.8 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/clock_gettime.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/clock_gettime.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -70,7 +70,7 @@ kernel mode.
 The structure pointed to by
 .Fa tp
 is defined in
-.Ao Pa sys/time.h Ac
+.In sys/time.h
 as:
 .Pp
 .Bd -literal
diff --git a/lib/libc/sys/closefrom.2 b/lib/libc/sys/closefrom.2
index bcd59eb80a..97ffdbe2cc 100644
--- a/lib/libc/sys/closefrom.2
+++ b/lib/libc/sys/closefrom.2
@@ -31,7 +31,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $DragonFly: src/lib/libc/sys/closefrom.2,v 1.1 2005/04/09 23:41:26 hmp Exp $
+.\" $DragonFly: src/lib/libc/sys/closefrom.2,v 1.2 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\"	$OpenBSD: closefrom.2,v 1.2 2004/01/12 20:52:09 jmc Exp $
 .\"
@@ -64,7 +64,7 @@
 .Nm closefrom
 .Nd delete many descriptors
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn closefrom "int fd"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index 0a4e545603..4d6eae2f62 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)getdirentries.2	8.2 (Berkeley) 5/3/95
 .\" $FreeBSD: src/lib/libc/sys/getdirentries.2,v 1.12.2.6 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/getdirentries.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/getdirentries.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd May 3, 1995
 .Dt GETDIRENTRIES 2
@@ -98,7 +98,7 @@ The
 .Fa d_type
 entry is the type of the file pointed to by the directory record.
 The file type values are defined in
-.Fa <sys/dirent.h> .
+.In sys/dirent.h .
 The
 .Fa d_name
 entry contains a null terminated file name.
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index 6bb4bcedd8..6357b7290b 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)getitimer.2	8.3 (Berkeley) 5/16/95
 .\" $FreeBSD: src/lib/libc/sys/getitimer.2,v 1.10.2.6 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/getitimer.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/getitimer.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd May 16, 1995
 .Dt GETITIMER 2
@@ -54,7 +54,7 @@
 .Sh DESCRIPTION
 The system provides each process with three interval timers,
 defined in
-.Ao Pa sys/time.h Ac .
+.In sys/time.h .
 The
 .Fn getitimer
 call returns the current value for the timer specified in
@@ -140,7 +140,7 @@ in
 is 100000000.
 .Sh NOTES
 Three macros for manipulating time values are defined in
-.Ao Pa sys/time.h Ac .
+.In sys/time.h .
 .Fa Timerclear
 sets a time value to zero,
 .Fa timerisset
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index 938631c7e0..ad162174bb 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: src/lib/libc/sys/getlogin.2,v 1.14.2.6 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/getlogin.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/getlogin.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETLOGIN 2
@@ -157,7 +157,7 @@ pointed to a string that was too long.
 Login names are limited to
 .Dv MAXLOGNAME
 (from
-.Ao Pa sys/param.h Ac )
+.In sys/param.h )
 characters, currently 17 including null.
 .It Bq Er EPERM
 The caller tried to set the login name and was not the super-user.
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 77eb7e6ca3..2cbe3d7023 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
 .\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.12.2.11 2002/01/09 17:44:15 yar Exp $
-.\" $DragonFly: src/lib/libc/sys/getsockopt.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/getsockopt.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd May 2, 1995
 .Dt GETSOCKOPT 2
@@ -103,7 +103,7 @@ may be NULL.
 and any specified options are passed uninterpreted to the appropriate
 protocol module for interpretation.
 The include file
-.Ao Pa sys/socket.h Ac
+.In sys/socket.h
 contains definitions for
 socket level options, described below.
 Options at other protocol levels vary in format and
@@ -123,7 +123,7 @@ or zero if the option is to be disabled.
 uses a
 .Fa struct linger
 parameter, defined in
-.Ao Pa sys/socket.h Ac ,
+.In sys/socket.h ,
 which specifies the desired state of the option and the
 linger interval (see below).
 .Dv SO_SNDTIMEO
@@ -132,7 +132,7 @@ and
 use a
 .Fa struct timeval
 parameter, defined in
-.Ao Pa sys/time.h Ac .
+.In sys/time.h .
 .Pp
 The following options are recognized at the socket level.
 Except as noted, each may be examined with
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index 533b24115d..405f694a9c 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
 .\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.9.2.9 2003/02/11 06:05:00 nsayer Exp $
-.\" $DragonFly: src/lib/libc/sys/gettimeofday.2,v 1.3 2006/02/28 02:25:10 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/gettimeofday.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd May 26, 1995
 .Dt GETTIMEOFDAY 2
@@ -76,7 +76,7 @@ The structures pointed to by
 and
 .Fa tzp
 are defined in
-.Ao Pa sys/time.h Ac
+.In sys/time.h
 as:
 .Pp
 .Bd -literal
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index d6c315f904..b14240310a 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
 .\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.21.2.7 2003/02/24 01:01:48 trhodes Exp $
-.\" $DragonFly: src/lib/libc/sys/intro.2,v 1.3 2005/07/03 14:43:27 corecode Exp $
+.\" $DragonFly: src/lib/libc/sys/intro.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd February 27, 1995
 .Dt INTRO 2
@@ -55,7 +55,7 @@ Nearly all of the system calls provide an error number referenced via
 the external identifier
 .Va errno.
 This identifier is defined in
-.Aq Pa errno.h
+.In errno.h
 as
 .Pp
 .Dl extern __thread int      errno;
@@ -99,7 +99,7 @@ to the type and circumstances of the call.
 .Pp
 The following is a complete list of the errors and their
 names as given in
-.Aq Pa sys/errno.h .
+.In sys/errno.h .
 .Bl -hang -width Ds
 .It Er 0 Em "Undefined error: 0" .
 Not used.
@@ -139,7 +139,7 @@ list of the new process exceeded the current limit
 of 65536 bytes
 .Pf ( Dv NCARGS
 in
-.Aq Pa sys/param.h ) .
+.In sys/param.h ) .
 .It Er 8 ENOEXEC Em "Exec format error" .
 A request was made to execute a file
 that, although it has the appropriate permissions,
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index a0d46feb7e..4def87b7d0 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -32,7 +32,7 @@
 .\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
 .\"
 .\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.7.2.7 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/ioctl.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/ioctl.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd December 11, 1993
 .Dt IOCTL 2
@@ -85,7 +85,7 @@ in bytes.
 Macros and defines used in specifying an ioctl
 .Fa request
 are located in the file
-.Ao Pa sys/ioctl.h Ac .
+.In sys/ioctl.h .
 .Sh RETURN VALUES
 If an error has occurred, a value of -1 is returned and
 .Va errno
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index a4a914fbb3..00766bccad 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.1.2.16 2002/07/02 21:05:08 mp Exp $
-.\" $DragonFly: src/lib/libc/sys/kqueue.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/kqueue.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd April 14, 2000
 .Dt KQUEUE 2
@@ -88,7 +88,7 @@ events to the user.
 is a pointer to an array of
 .Va kevent
 structures, as defined in
-.Aq Pa sys/event.h .
+.In sys/event.h .
 All changes contained in the
 .Fa changelist
 are applied before any pending events are read from the queue.
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index d1991964c4..abb07afd78 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/ktrace.2,v 1.9.2.7 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/ktrace.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/ktrace.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt KTRACE 2
@@ -133,7 +133,7 @@ bytes of a
 .Va ktr_type
 record.
 The type specific records are defined in the
-.Aq Pa sys/ktrace.h
+.In sys/ktrace.h
 include file.
 .Sh RETURN VALUES
 .Rv -std ktrace
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index f277ef4dde..2ad0c35179 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/pathconf.2,v 1.4.2.6 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/pathconf.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/pathconf.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt PATHCONF 2
@@ -71,7 +71,7 @@ The
 .Fa name
 argument specifies the system variable to be queried.
 Symbolic constants for each name value are found in the include file
-.Li <unistd.h> .
+.In unistd.h .
 .Pp
 The available values are as follows:
 .Pp
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index 69f779ab2c..bf469aed51 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -1,6 +1,6 @@
 .\"	$NetBSD: poll.2,v 1.3 1996/09/07 21:53:08 mycroft Exp $
 .\" $FreeBSD: src/lib/libc/sys/poll.2,v 1.4.2.3 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/poll.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/poll.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\" Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
 .\"
@@ -49,7 +49,7 @@ I/O.
 The
 .Fa fds
 argument is a pointer to an array of pollfd structures as defined in
-.Aq Pa poll.h
+.In poll.h
 (shown below).  The
 .Fa nfds
 argument determines the size of the
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 058c745903..a3dd60075e 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.12.2.12 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/ptrace.2,v 1.3 2004/03/11 12:28:51 hmp Exp $
+.\" $DragonFly: src/lib/libc/sys/ptrace.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"	$NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
 .\"
 .\" This file is in the public domain.
@@ -143,7 +143,7 @@ This request reads the traced process' machine registers into the
 .Vt "struct reg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_SETREGS
@@ -154,7 +154,7 @@ it loads the traced process' machine registers from the
 .Vt "struct reg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_GETFPREGS
@@ -164,7 +164,7 @@ the
 .Vt "struct fpreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_SETFPREGS
@@ -175,7 +175,7 @@ it loads the traced process' floating-point registers from the
 .Vt "struct fpreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_GETDBREGS
@@ -185,7 +185,7 @@ the
 .Vt "struct dbreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_SETDBREGS
@@ -196,7 +196,7 @@ it loads the traced process' debug registers from the
 .Vt "struct dbreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .El
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index 1f1215a446..cf5fbe04d4 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
 .\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.12.2.7 2002/05/20 09:06:37 roam Exp $
-.\" $DragonFly: src/lib/libc/sys/quotactl.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/quotactl.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd March 5, 1999
 .Dt QUOTACTL 2
@@ -62,7 +62,7 @@ operates on the given filename
 for the given user
 .Fa id .
 (NOTE: One should use the QCMD macro defined in
-.Ao Pa ufs/ufs/quota.h Ac
+.In ufs/ufs/quota.h
 to formulate the value for
 .Fa cmd . )
 The address of an optional command specific data structure,
@@ -117,7 +117,7 @@ Get disk quota limits and current usage for the user or group
 is a pointer to a
 .Fa struct dqblk
 structure (defined in
-.Ao Pa ufs/ufs/quota.h Ac ) .
+.In ufs/ufs/quota.h ) .
 .It Dv Q_SETQUOTA
 Set disk quota limits for the user or group
 (as determined by the command type) with identifier
@@ -126,7 +126,7 @@ Set disk quota limits for the user or group
 is a pointer to a
 .Fa struct dqblk
 structure (defined in
-.Ao Pa ufs/ufs/quota.h Ac ) .
+.In ufs/ufs/quota.h ) .
 The usage fields of the
 .Fa dqblk
 structure are ignored.
@@ -139,7 +139,7 @@ Set disk usage limits for the user or group
 is a pointer to a
 .Fa struct dqblk
 structure (defined in
-.Ao Pa ufs/ufs/quota.h Ac ) .
+.In ufs/ufs/quota.h ) .
 Only the usage fields are used.
 This call is restricted to the super-user.
 .It Dv Q_SYNC
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index e7195abdaf..7044f9f9ce 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)reboot.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/reboot.2,v 1.9.2.4 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/reboot.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/reboot.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt REBOOT 2
@@ -56,7 +56,7 @@ automatically in the event of unrecoverable system failures.
 .Fa Howto
 is a mask of options; the system call interface allows the following
 options, defined in the include file
-.Aq Pa sys/reboot.h ,
+.In sys/reboot.h ,
 to be passed
 to the new kernel or the new bootstrap and init programs.
 .Bl -tag -width RB_INITNAMEA
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 47f5d52efc..7691c61b34 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
 .\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.8.2.8 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/recv.2,v 1.4 2006/03/27 07:35:45 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/recv.2,v 1.5 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd February 21, 1994
 .Dt RECV 2
@@ -147,7 +147,7 @@ call uses a
 .Fa msghdr
 structure to minimize the number of directly supplied parameters.
 This structure has the following form, as defined in
-.Ao Pa sys/socket.h Ac :
+.In sys/socket.h :
 .Pp
 .Bd -literal
 struct msghdr {
@@ -217,7 +217,7 @@ In this case,
 should be a structure of type
 .Fa cmsgcred ,
 which is defined in
-.Ao Pa sys/socket.h Ac
+.In sys/socket.h
 as follows:
 .Pp
 .Bd -literal
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libc/sys/sched_get_priority_max.2
index a101b89073..b4fbc8237c 100644
--- a/lib/libc/sys/sched_get_priority_max.2
+++ b/lib/libc/sys/sched_get_priority_max.2
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/lib/libc/sys/sched_get_priority_max.2,v 1.3.2.9 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/sched_get_priority_max.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/sched_get_priority_max.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
@@ -67,7 +67,7 @@ returned.
 The value of
 .Fa policy
 should be one of the scheduling policy values defined in
-.Fa <sched.h> :
+.In sched.h :
 .Bl -tag -width [SCHED_OTHER]
 .It Bq Er SCHED_FIFO
 First-in-first-out fixed priority scheduling with no round robin scheduling;
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libc/sys/sched_setscheduler.2
index fa2cae89c9..c63538dc8d 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/lib/libc/sys/sched_setscheduler.2,v 1.3.2.9 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/sched_setscheduler.2,v 1.3 2006/04/08 07:23:35 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/sched_setscheduler.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
@@ -82,7 +82,7 @@ the scheduling parameters of another process is specified in
 as a write-style operation.
 .Pp
 The scheduling policies are in
-.Fa <sched.h> :
+.In sched.h :
 .Bl -tag -width [SCHED_OTHER]
 .It Bq Er SCHED_FIFO
 First-in-first-out fixed priority scheduling with no round robin scheduling;
@@ -95,7 +95,7 @@ Round-robin scheduling across same priority processes.
 The
 .Fa sched_param
 structure is defined in
-.Fa <sched.h> :
+.In sched.h :
 .Pp
 .Bd -literal -offset indent
 struct sched_param {
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index 72a0fe4944..d4011401cc 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)select.2	8.2 (Berkeley) 3/25/94
 .\" $FreeBSD: src/lib/libc/sys/select.2,v 1.14.2.5 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/select.2,v 1.6 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/select.2,v 1.7 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd March 25, 1994
 .Dt SELECT 2
@@ -183,7 +183,7 @@ it is possible
 to increase this size by having the program define
 .Dv FD_SETSIZE
 before the inclusion of any header which includes
-.Aq Pa sys/types.h .
+.In sys/types.h .
 .Pp
 If
 .Fa nfds
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index 40f3678166..b797672d31 100644
--- a/lib/libc/sys/setgroups.2
+++ b/lib/libc/sys/setgroups.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)setgroups.2	8.2 (Berkeley) 4/16/94
 .\" $FreeBSD: src/lib/libc/sys/setgroups.2,v 1.4.2.4 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/setgroups.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/setgroups.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd April 16, 1994
 .Dt SETGROUPS 2
@@ -57,7 +57,7 @@ indicates the number of entries in the array and must be no
 more than
 .Dv NGROUPS ,
 as defined in
-.Ao Pa sys/param.h Ac .
+.In sys/param.h .
 .Pp
 Only the super-user may set new groups.
 .Sh RETURN VALUES
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index e2277cd1b0..128456a00f 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -31,7 +31,7 @@
 .\"
 .\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
 .\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.22.2.10 2002/12/29 16:35:34 schweikh Exp $
-.\" $DragonFly: src/lib/libc/sys/sigaction.2,v 1.6 2006/04/08 08:17:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/sigaction.2,v 1.7 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd April 3, 1994
 .Dt SIGACTION 2
@@ -269,7 +269,7 @@ signals that restart pending system calls continue to do so.
 .Pp
 The following is a list of all signals
 with names as in the include file
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
 .It Sy "NAME	Default Action	Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
@@ -480,7 +480,7 @@ The
 .Fa sig
 argument is the signal number, one of the
 .Dv SIG...
-values from <signal.h>.
+.In signal.h .
 .Pp
 The
 .Fa code
@@ -494,7 +494,8 @@ argument to a SA_SIGINFO handler contain a numeric code explaining the
 cause of the signal, usually one of the
 .Dv SI_...
 values from
-<sys/signal.h> or codes specific to a signal, i.e. one of the
+.In sys/signal.h
+or codes specific to a signal, i.e. one of the
 .Dv FPE_...
 values for SIGFPE.
 .Pp
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index ff67f33857..21db3a2f25 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)sigprocmask.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/sigprocmask.2,v 1.8.2.5 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/sigprocmask.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/sigprocmask.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGPROCMASK 2
@@ -64,7 +64,7 @@ and the current mask.
 The function is specified by
 .Fa how
 using one of the following values from
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -tag -width SIG_UNBLOCK
 .It Dv SIG_BLOCK
 The new mask is the union of the current mask and the specified
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 5904c0a8bc..ed184d0062 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.12.2.11 2002/12/29 16:35:34 schweikh Exp $
-.\" $DragonFly: src/lib/libc/sys/socket.2,v 1.3 2005/01/26 21:52:36 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/socket.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd November 24, 1997
 .Dt SOCKET 2
@@ -56,7 +56,7 @@ parameter specifies a communications domain within which
 communication will take place; this selects the protocol family
 which should be used.
 These families are defined in the include file
-.Ao Pa sys/socket.h Ac .
+.In sys/socket.h .
 The currently understood formats are:
 .Pp
 .Bd -literal -offset indent -compact
@@ -242,7 +242,7 @@ via
 The operation of sockets is controlled by socket level
 .Em options .
 These options are defined in the file
-.Ao Pa sys/socket.h Ac .
+.In sys/socket.h .
 .Xr Setsockopt 2
 and
 .Xr getsockopt 2
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 2ba7d59449..1000e1173f 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
 .\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.16.2.7 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/stat.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/stat.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd May 1, 1995
 .Dt STAT 2
@@ -84,7 +84,7 @@ argument is a pointer to a
 .Fn stat
 structure
 as defined by
-.Aq Pa sys/stat.h
+.In sys/stat.h
 (shown below)
 and into which information is placed concerning the file.
 .Bd -literal
@@ -196,7 +196,7 @@ has the following bits:
 .Ed
 .Pp
 For a list of access modes, see
-.Aq Pa sys/stat.h ,
+.In sys/stat.h ,
 .Xr access 2
 and
 .Xr chmod 2 .
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
index 35580e0051..5be4518073 100644
--- a/lib/libc/sys/sysarch.2
+++ b/lib/libc/sys/sysarch.2
@@ -1,6 +1,6 @@
 .\"	$NetBSD: sysarch.2,v 1.6 1998/02/25 21:24:57 perry Exp $
 .\" $FreeBSD: src/lib/libc/sys/sysarch.2,v 1.2.2.3 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/sysarch.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/sysarch.2,v 1.3 2006/05/26 19:39:37 swildner Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -61,7 +61,7 @@ arguments of the function.
 Symbolic constants and argument structures
 for the architecture-dependent
 functions can be found in the header file
-.Ao Pa machine/sysarch.h Ac .
+.In machine/sysarch.h .
 .Pp
 The
 .Fn sysarch
diff --git a/lib/libc/sys/syscall.2 b/lib/libc/sys/syscall.2
index ac7898b452..41d2856a4e 100644
--- a/lib/libc/sys/syscall.2
+++ b/lib/libc/sys/syscall.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)syscall.2	8.1 (Berkeley) 6/16/93
 .\" $FreeBSD: src/lib/libc/sys/syscall.2,v 1.5.2.3 2001/12/14 18:34:02 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/syscall.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/syscall.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
 .\"
 .Dd June 16, 1993
 .Dt SYSCALL 2
@@ -56,7 +56,7 @@ interface has the specified
 .Fa number
 with the specified arguments.
 Symbolic constants for system calls can be found in the header file
-.Ao Pa sys/syscall.h Ac .
+.In sys/syscall.h .
 The
 .Fn __syscall
 form should be used when one or more of the parameters is a
diff --git a/lib/libc_r/man/pthread_once.3 b/lib/libc_r/man/pthread_once.3
index 269a3f917b..6d1533e6ff 100644
--- a/lib/libc_r/man/pthread_once.3
+++ b/lib/libc_r/man/pthread_once.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc_r/man/pthread_once.3,v 1.6.2.7 2001/12/17 10:08:26 ru Exp $
-.\" $DragonFly: src/lib/libc_r/man/pthread_once.3,v 1.2 2003/06/17 04:26:48 dillon Exp $
+.\" $DragonFly: src/lib/libc_r/man/pthread_once.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_ONCE 3
@@ -84,7 +84,7 @@ was never called.
 The constant
 .Fa PTHREAD_ONCE_INIT
 is defined by header
-.Aq Pa pthread.h .
+.In pthread.h .
 .Pp
 The behavior of
 .Fn pthread_once
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 6a9ae0aa45..178ad4e0e8 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libcalendar/calendar.3,v 1.6.2.5 2001/12/17 10:08:28 ru Exp $
-.\" $DragonFly: src/lib/libcalendar/calendar.3,v 1.2 2003/06/17 04:26:48 dillon Exp $
+.\" $DragonFly: src/lib/libcalendar/calendar.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd November 29, 1997
 .Dt CALENDAR 3
@@ -175,7 +175,7 @@ returns the weekday (Mo = 0 .. Su = 6) of the day numbered
 The structure
 .Fa date
 is defined in
-.Aq Pa calendar.h .
+.In calendar.h .
 It contains these fields:
 .Bd -literal -offset indent
 int y;          /\(** year (0000 - ????) \(**/
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index b0bf5a556c..f3e215fb85 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libcam/cam_cdbparse.3,v 1.3.2.11 2002/12/29 16:35:35 schweikh Exp $
-.\" $DragonFly: src/lib/libcam/cam_cdbparse.3,v 1.2 2003/06/17 04:26:48 dillon Exp $
+.\" $DragonFly: src/lib/libcam/cam_cdbparse.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .\" This man page borrows heavily from the old scsi(3) man page, which had
 .\" the following copyright:
@@ -205,7 +205,7 @@ long.
 .Pp
 .Fa flags
 are the flags defined in
-.Aq Pa cam/cam_ccb.h :
+.In bus/cam/cam_ccb.h :
 .Bd -literal
 /* Common CCB header */
 /* CAM CCB flags */
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
index 41f5cdbe20..b9fde95a4e 100644
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libcompat/4.1/ftime.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ftime.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libcompat/4.1/ftime.3,v 1.6.2.4 2001/12/17 10:08:28 ru Exp $
-.\" $DragonFly: src/lib/libcompat/4.1/ftime.3,v 1.2 2003/06/17 04:26:48 dillon Exp $
+.\" $DragonFly: src/lib/libcompat/4.1/ftime.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt FTIME 3
@@ -56,7 +56,7 @@ The
 .Fn ftime
 routine fills in a structure pointed to by its argument,
 as defined by
-.Aq Pa sys/timeb.h :
+.In sys/timeb.h :
 .Bd -literal -offset indent
 /*
  * Structure returned by ftime system call
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 0e902e2656..13f13e7d62 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libcompat/4.4/cuserid.3,v 1.8.2.6 2001/12/17 10:08:29 ru Exp $
-.\" $DragonFly: src/lib/libcompat/4.4/cuserid.3,v 1.2 2003/06/17 04:26:49 dillon Exp $
+.\" $DragonFly: src/lib/libcompat/4.4/cuserid.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd April 10, 1995
 .Os
@@ -63,7 +63,7 @@ for at least
 .Em L_cuserid
 characters.
 The L_cuserid constant is defined in
-.Aq Pa stdio.h .
+.In stdio.h .
 .Pp
 If
 .Fa s
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index addbcdabec..7cc7edfa45 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.7.2.8 2001/12/17 10:08:29 ru Exp $
-.\" $DragonFly: src/lib/libdevstat/devstat.3,v 1.4 2005/01/08 19:19:26 joerg Exp $
+.\" $DragonFly: src/lib/libdevstat/devstat.3,v 1.5 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd May 21, 1998
 .Dt DEVSTAT 3
@@ -136,7 +136,7 @@ structure.
 The
 .Va statinfo
 structure can be found in
-.Aq Pa devstat.h :
+.In devstat.h :
 .Bd -literal -offset indent
 struct statinfo {
 	struct kinfo_cputime	cp_time;
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 6dd2fe562e..22e497e5f4 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.11.2.29 2003/06/13 14:36:58 trhodes Exp $
-.\" $DragonFly: src/lib/libfetch/fetch.3,v 1.2 2003/06/17 04:26:49 dillon Exp $
+.\" $DragonFly: src/lib/libfetch/fetch.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd July 1, 1998
 .Dt FETCH 3
@@ -150,7 +150,7 @@ and
 return a pointer to a
 .Vt url
 structure, which is defined as follows in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bd -literal
 #define URL_SCHEMELEN 16
 #define URL_USERLEN 256
@@ -205,7 +205,7 @@ structure pointed to by its second argument.
 The
 .Vt url_stat
 structure is defined as follows in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bd -literal
 struct url_stat {
     off_t	 size;
@@ -233,7 +233,7 @@ structures.
 The
 .Vt url_ent
 structure is defined as follows in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bd -literal
 struct url_ent {
     char         name[MAXPATHLEN];
@@ -402,7 +402,7 @@ All other functions return a stream pointer which may be used to
 access the requested document, or NULL if an error occurred.
 .Pp
 The following error codes are defined in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bl -tag -width 18n
 .It Bq Er FETCH_ABORT
 Operation aborted
diff --git a/lib/libipsec/ipsec_strerror.3 b/lib/libipsec/ipsec_strerror.3
index 131322c13f..271fb6cd84 100644
--- a/lib/libipsec/ipsec_strerror.3
+++ b/lib/libipsec/ipsec_strerror.3
@@ -1,6 +1,6 @@
 .\"	$KAME: ipsec_strerror.3,v 1.9 2001/08/17 07:21:36 itojun Exp $
 .\"	$FreeBSD: src/lib/libipsec/ipsec_strerror.3,v 1.2.2.7 2002/04/28 05:40:25 suz Exp $
-.\"	$DragonFly: src/lib/libipsec/ipsec_strerror.3,v 1.2 2003/06/17 04:26:49 dillon Exp $
+.\"	$DragonFly: src/lib/libipsec/ipsec_strerror.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
 .\" All rights reserved.
@@ -43,7 +43,7 @@
 .Fn ipsec_strerror
 .\"
 .Sh DESCRIPTION
-.Pa netinet6/ipsec.h
+.In netinet6/ipsec.h
 declares
 .Pp
 .Dl extern int ipsec_errcode;
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index 5db722a852..e96237d5c2 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD: src/lib/libkvm/kvm_open.3,v 1.5.2.6 2001/12/17 10:08:30 ru Exp $
-.\" $DragonFly: src/lib/libkvm/kvm_open.3,v 1.3 2006/02/17 19:35:07 swildner Exp $
+.\" $DragonFly: src/lib/libkvm/kvm_open.3,v 1.4 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd April 19, 1994
 .Dt KVM_OPEN 3
@@ -86,13 +86,17 @@ is
 .Dv NULL ,
 the default indicated by
 .Dv _PATH_MEM
-from <paths.h> is used.
+from
+.In paths.h
+is used.
 .Pp
 .Fa swapfile
 should indicate the swap device.  If
 .Dv NULL ,
 .Dv _PATH_DRUM
-from <paths.h> is used.
+from
+.In paths.h
+is used.
 .Pp
 The
 .Fa flags
@@ -155,7 +159,7 @@ Thus,
 will place any error message in the
 .Fa errbuf
 argument.  This buffer should be _POSIX2_LINE_MAX characters large (from
-<limits.h>).
+.In limits.h ) .
 .Sh RETURN VALUES
 The
 .Fn kvm_open
diff --git a/lib/libposix1e/acl.3 b/lib/libposix1e/acl.3
index 3c2a457774..04ac8a1283 100644
--- a/lib/libposix1e/acl.3
+++ b/lib/libposix1e/acl.3
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libposix1e/acl.3,v 1.2.2.5 2001/12/20 16:27:06 ru Exp $
-.\" $DragonFly: src/lib/libposix1e/acl.3,v 1.4 2005/08/01 01:49:16 swildner Exp $
+.\" $DragonFly: src/lib/libposix1e/acl.3,v 1.5 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL 3
@@ -61,7 +61,9 @@ a third party library was under development at the time this document
 was written.  There is a general consensus that the POSIX.1e manipulation
 routines are ambiguously defined in the specification, and don't meet the
 needs of most applications.  For the time being, applications may
-directly manipulate the ACL structures, defined in acl.h, although the
+directly manipulate the ACL structures, defined in
+.In sys/acl.h ,
+although the
 recommended usage is to only ever handle text-form ACLs in applications,
 generated and maintained using
 .Fn acl_from_text
diff --git a/lib/libskey/skey.3 b/lib/libskey/skey.3
index a24f74e433..67853a1b8a 100644
--- a/lib/libskey/skey.3
+++ b/lib/libskey/skey.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libskey/skey.3,v 1.10.2.1 2000/04/22 16:36:00 phantom Exp $
-.\" $DragonFly: src/lib/libskey/skey.3,v 1.4 2006/02/17 19:35:07 swildner Exp $
+.\" $DragonFly: src/lib/libskey/skey.3,v 1.5 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd December 22, 1996
 .Dt SKEY 3
@@ -40,8 +40,8 @@
 .Sh LIBRARY
 .Lb libskey
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
-.Fd #include <skey.h>
+.In stdio.h
+.In skey.h
 .Ft int
 .Fn skeylookup "struct skey *mp" "const char *name"
 .Ft int
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index 6cfc4f10e8..2301ee4750 100644
--- a/lib/libtacplus/libtacplus.3
+++ b/lib/libtacplus/libtacplus.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libtacplus/libtacplus.3,v 1.3.2.7 2002/10/09 08:50:42 pst Exp $
-.\" $DragonFly: src/lib/libtacplus/libtacplus.3,v 1.3 2005/08/01 01:49:16 swildner Exp $
+.\" $DragonFly: src/lib/libtacplus/libtacplus.3,v 1.4 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd September 2, 1998
 .Dt LIBTACPLUS 3
@@ -169,7 +169,7 @@ and
 .Va service
 arguments must be set to appropriate values as defined in the
 TACACS+ protocol specification.  The
-.Aq taclib.h
+.In taclib.h
 header file contains symbolic constants for these values.
 .Sh CREATING A TACACS+ AUTHORIZATION REQUEST
 To begin constructing a new authorization request, call
@@ -181,7 +181,7 @@ and
 .Va service
 arguments must be set to appropriate values as defined in the
 TACACS+ protocol specification.  The
-.Aq taclib.h
+.In taclib.h
 header file contains symbolic constants for these values.
 .Sh SETTING OPTIONAL PARAMETERS ON A REQUEST
 After creating a request,
@@ -223,7 +223,7 @@ packed into an integer value.  The status can be extracted using the
 macro
 .Fn TAC_AUTHEN_STATUS .
 Possible status codes, defined in
-.Aq taclib.h ,
+.In taclib.h ,
 include:
 .Pp
 .Bl -item -compact -offset indent
@@ -313,7 +313,7 @@ number of attribute value (AV) pairs received packed into an
 integer value.  The status can be extracted using the macro
 .Fn TAC_AUTHOR_STATUS .
 Possible status codes, defined in
-.Aq taclib.h ,
+.In taclib.h ,
 include:
 .Pp
 .Bl -item -compact -offset indent
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index 7c1d77491e..26d6fa75ec 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -1,6 +1,6 @@
 .\"	$NetBSD: usb.3,v 1.13 2000/09/24 02:17:52 augustss Exp $
 .\"	$FreeBSD: src/lib/libusbhid/usbhid.3,v 1.11.2.1 2002/04/03 15:54:00 joe Exp $
-.\"	$DragonFly: src/lib/libusbhid/usbhid.3,v 1.4 2006/03/26 22:56:56 swildner Exp $
+.\"	$DragonFly: src/lib/libusbhid/usbhid.3,v 1.5 2006/05/26 19:39:38 swildner Exp $
 .\"
 .\" Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
 .\" All rights reserved.
@@ -143,7 +143,7 @@ will be filled with the relevant data for the item.
 The definition of
 .Fa hid_item_t
 can be found in
-.Pa <libusbhid.h>
+.In libusbhid.h
 and the meaning of the components in the USB HID documentation.
 .Pp
 Data should be read/written to the device in the size of
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 2bab07e7e6..3d027d2d42 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -18,7 +18,7 @@
 .\"    conditions are met.
 .\"
 .\" $FreeBSD: src/lib/libutil/login_cap.3,v 1.17.2.8 2002/12/29 16:35:36 schweikh Exp $
-.\" $DragonFly: src/lib/libutil/login_cap.3,v 1.3 2004/03/11 12:28:53 hmp Exp $
+.\" $DragonFly: src/lib/libutil/login_cap.3,v 1.4 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd December 27, 1996
 .Os
@@ -122,7 +122,9 @@ Once the login_cap_t is of no further use, the
 .Fn login_close
 function should be called to free all resources used.
 .Pp
-The structure of login_cap_t is defined in login_cap.h, as:
+The structure of login_cap_t is defined in
+.In login_cap.h ,
+as:
 .Bd -literal -offset indent
 typedef struct {
 	char *lc_class;
diff --git a/lib/libutil/realhostname.3 b/lib/libutil/realhostname.3
index ed5244c719..9008aea558 100644
--- a/lib/libutil/realhostname.3
+++ b/lib/libutil/realhostname.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libutil/realhostname.3,v 1.4.2.2 2001/12/17 10:08:32 ru Exp $
-.\" $DragonFly: src/lib/libutil/realhostname.3,v 1.2 2003/06/17 04:26:52 dillon Exp $
+.\" $DragonFly: src/lib/libutil/realhostname.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd April 6, 1999
 .Os
@@ -74,7 +74,7 @@ will not be NUL terminated.
 .Sh RETURN VALUES
 .Fn realhostname
 will return one of the following constants which are defined in
-.Pa libutil.h :
+.In libutil.h :
 .Pp
 .Bl -tag -width XXX -offset XXX
 .It Li HOSTNAME_FOUND
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index 6e05580d1d..d821c1ad92 100644
--- a/lib/libutil/realhostname_sa.3
+++ b/lib/libutil/realhostname_sa.3
@@ -50,7 +50,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libutil/realhostname_sa.3,v 1.2.2.3 2001/12/17 10:08:32 ru Exp $
-.\" $DragonFly: src/lib/libutil/realhostname_sa.3,v 1.2 2003/06/17 04:26:52 dillon Exp $
+.\" $DragonFly: src/lib/libutil/realhostname_sa.3,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd January 11, 2000
 .Os
@@ -101,7 +101,7 @@ will not be NUL terminated.
 .Sh RETURN VALUES
 .Fn realhostname_sa
 will return one of the following constants which are defined in
-.Pa libutil.h :
+.In libutil.h :
 .Pp
 .Bl -tag -width XXX -offset XXX
 .It Li HOSTNAME_FOUND
diff --git a/libexec/ftp-proxy/ftp-proxy.8 b/libexec/ftp-proxy/ftp-proxy.8
index 3c369d57ef..14b4c86d30 100644
--- a/libexec/ftp-proxy/ftp-proxy.8
+++ b/libexec/ftp-proxy/ftp-proxy.8
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: ftp-proxy.8,v 1.41 2004/07/06 19:49:11 dhartmei Exp $
-.\"	$DragonFly: src/libexec/ftp-proxy/ftp-proxy.8,v 1.3 2006/04/08 21:57:05 swildner Exp $
+.\"	$DragonFly: src/libexec/ftp-proxy/ftp-proxy.8,v 1.4 2006/05/26 19:39:38 swildner Exp $
 .\"
 .\" Copyright (c) 1996-2001
 .\"	Obtuse Systems Corporation, All rights reserved.
@@ -112,7 +112,7 @@ data connections it establishes.
 The default is
 .Dv IPPORT_HILASTAUTO
 defined in
-.Aq Pa netinet/in.h
+.In netinet/in.h
 as 65535.
 .It Fl m Ar minport
 Specify the lower end of the port range the proxy will use for all
@@ -120,7 +120,7 @@ data connections it establishes.
 The default is
 .Dv IPPORT_HIFIRSTAUTO
 defined in
-.Aq Pa netinet/in.h
+.In netinet/in.h
 as 49152.
 .It Fl n
 Activate network address translation
diff --git a/libexec/talkd/talkd.8 b/libexec/talkd/talkd.8
index 02d19dd383..f30c7f0156 100644
--- a/libexec/talkd/talkd.8
+++ b/libexec/talkd/talkd.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)talkd.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/libexec/talkd/talkd.8,v 1.3.2.2 2001/08/16 10:44:21 ru Exp $
-.\" $DragonFly: src/libexec/talkd/talkd.8,v 1.2 2003/06/17 04:27:08 dillon Exp $
+.\" $DragonFly: src/libexec/talkd/talkd.8,v 1.3 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd December 11, 1993
 .Dt TALKD 8
@@ -54,7 +54,7 @@ to the server of
 type
 .Tn LOOK_UP
 (see
-.Aq Pa protocols/talkd.h ) .
+.In protocols/talkd.h ) .
 This causes the server to search its invitation
 tables to check if an invitation currently exists for the caller
 (to speak to the callee specified in the message).
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 5d6544fb92..75748f9768 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.7.2.4 2002/08/21 18:58:16 trhodes Exp $
-.\" $DragonFly: src/sbin/disklabel/disklabel.5,v 1.4 2005/03/05 15:52:25 hmp Exp $
+.\" $DragonFly: src/sbin/disklabel/disklabel.5,v 1.5 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
@@ -104,7 +104,7 @@ All of these operations are normally done using
 .Xr disklabel 8 .
 .Pp
 The format of the disk label is specified in
-.Pa <sys/disklabel.h> .
+.In sys/disklabel.h .
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr disklabel 8
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index aca99cb7b2..475041ecfd 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15.2.22 2003/04/17 17:56:34 trhodes Exp $
-.\" $DragonFly: src/sbin/disklabel/disklabel.8,v 1.8 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/sbin/disklabel/disklabel.8,v 1.9 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd July 30, 1999
 .Dt DISKLABEL 8
@@ -678,7 +678,7 @@ none of which are in current use.
 (See the definitions starting with
 .Dv FS_UNUSED
 in
-.Aq Pa sys/disklabel.h
+.In sys/disklabel.h
 for more details).
 .It Ar fsize
 For
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index 033ea16c00..74e7712cfd 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -1,6 +1,6 @@
 .\"
 .\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.3.2.12 2003/02/23 20:17:15 trhodes Exp $
-.\" $DragonFly: src/sbin/ip6fw/ip6fw.8,v 1.4 2006/02/17 19:33:32 swildner Exp $
+.\" $DragonFly: src/sbin/ip6fw/ip6fw.8,v 1.5 2006/05/26 19:39:38 swildner Exp $
 .\"
 .\"	$KAME$
 .\"
@@ -329,7 +329,7 @@ A range may only be specified as the first value,
 and the length of the port list is limited to
 .Dv IPV6_FW_MAX_PORTS
 (as defined in
-.Pa /usr/src/sys/net/ip6fw/ip6_fw.h )
+.In net/ip6fw/ip6_fw.h )
 ports.
 .Pp
 Fragmented packets which have a non-zero offset (i.e. not the first
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 517f13cd8d..755b600bd5 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
 .\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.26.2.15 2003/05/13 12:16:08 joerg Exp $
-.\" $DragonFly: src/sbin/newfs/newfs.8,v 1.4 2004/05/19 22:52:34 dillon Exp $
+.\" $DragonFly: src/sbin/newfs/newfs.8,v 1.5 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd May 13, 2003
 .Dt NEWFS 8
@@ -231,7 +231,7 @@ The default value used is
 defined by
 .Dv MINFREE
 from
-.Aq Pa ufs/ffs/fs.h ,
+.In ufs/ffs/fs.h ,
 currently 8%.
 See
 .Xr tunefs 8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index a91b27420f..4d2e5f0b23 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/sbin/ping/ping.8,v 1.25.2.11 2003/02/23 21:03:24 trhodes Exp $
-.\" $DragonFly: src/sbin/ping/ping.8,v 1.3 2006/03/01 08:08:44 swildner Exp $
+.\" $DragonFly: src/sbin/ping/ping.8,v 1.4 2006/05/26 19:39:38 swildner Exp $
 .\"
 .Dd September 25, 2001
 .Dt PING 8
@@ -450,7 +450,7 @@ heard from the specified
 a status of two if the transmission was successful but no responses
 were received; or another value
 (from
-.Aq Pa sysexits.h )
+.In sysexits.h )
 if an error occurred.
 .Sh SEE ALSO
 .Xr netstat 1 ,
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 6975d53e20..6ac7c60728 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -31,7 +31,7 @@
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.23.2.17 2003/05/19 07:49:34 brueffer Exp $
-.\" $DragonFly: src/sbin/sysctl/sysctl.8,v 1.4 2006/02/17 19:33:33 swildner Exp $
+.\" $DragonFly: src/sbin/sysctl/sysctl.8,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd March 10, 2002
 .Dt SYSCTL 8
@@ -228,22 +228,22 @@ denote
 .It "user.tzname_max	integer	no
 .El
 .Sh FILES
-.Bl -tag -width ".Aq Pa netinet/icmp_var.h" -compact
-.It Aq Pa sys/sysctl.h
+.Bl -tag -width ".In netinet/icmp_var.h" -compact
+.It In sys/sysctl.h
 definitions for top level identifiers, second level kernel and hardware
 identifiers, and user level identifiers
-.It Aq Pa sys/socket.h
+.It In sys/socket.h
 definitions for second level network identifiers
-.It Aq Pa sys/gmon.h
+.It In sys/gmon.h
 definitions for third level profiling identifiers
-.It Aq Pa vm/vm_param.h
+.It In vm/vm_param.h
 definitions for second level virtual memory identifiers
-.It Aq Pa netinet/in.h
+.It In netinet/in.h
 definitions for third level Internet identifiers and
 fourth level IP identifiers
-.It Aq Pa netinet/icmp_var.h
+.It In netinet/icmp_var.h
 definitions for fourth level ICMP identifiers
-.It Aq Pa netinet/udp_var.h
+.It In netinet/udp_var.h
 definitions for fourth level UDP identifiers
 .El
 .Sh EXAMPLES
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index 91eb33a9de..7066180136 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -36,7 +36,7 @@
 .\"
 .\" $Id: vinum.8,v 1.48 2001/01/15 22:15:05 grog Exp $
 .\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.33.2.10 2002/12/29 16:35:38 schweikh Exp $
-.\" $DragonFly: src/sbin/vinum/vinum.8,v 1.4 2006/02/17 19:33:33 swildner Exp $
+.\" $DragonFly: src/sbin/vinum/vinum.8,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd December 20, 2000
 .Dt VINUM 8
@@ -548,7 +548,7 @@ reboot in order to leave the debugger.
 .It Ic debug Ar flags
 Set a bit mask of internal debugging flags.  These will change without warning
 as the product matures; to be certain, read the header file
-.Aq Pa sys/dev/vinumvar.h .
+.Pa /sys/dev/raid/vinum/vinumvar.h .
 The bit mask is composed of the following values:
 .Bl -tag -width indent
 .It Dv DEBUG_ADDRESSES Pq No 1
@@ -1106,7 +1106,7 @@ have an existing configuration which you never want to see again.
 .Xc
 .Nm
 maintains a number of statistical counters for each object.  See the header file
-.Aq Pa sys/dev/vinumvar.h
+.Pa /sys/dev/raid/vinum/vinumvar.h
 for more information.
 .\" XXX put it in here when it's finalized
 Use the
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index be5b8711cc..f46b2eb9c9 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/examples/mdoc/example.3,v 1.12.2.7 2001/08/17 13:08:35 ru Exp $
-.\" $DragonFly: src/share/examples/mdoc/example.3,v 1.2 2003/06/17 04:36:57 dillon Exp $
+.\" $DragonFly: src/share/examples/mdoc/example.3,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
@@ -66,7 +66,7 @@ Second example.
 .El
 .Pp
 The above values are defined in
-.Aq Pa example.h
+.In example.h
 as follows:
 .Bd -literal
 #define EXAMPLE_ONE  1
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index f9bb429635..f8a13a7f71 100644
--- a/share/man/man3/sysexits.3
+++ b/share/man/man3/sysexits.3
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.5.2.3 2001/12/17 11:30:11 ru Exp $
-.\" $DragonFly: src/share/man/man3/sysexits.3,v 1.2 2003/06/17 04:36:58 dillon Exp $
+.\" $DragonFly: src/share/man/man3/sysexits.3,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .\" "
 .Dd March 31, 1996
@@ -128,6 +128,6 @@ file appeared somewhere after
 This man page has been written by
 .An J\(:org Wunsch
 after the comments in
-.Pa <sysexits.h> .
+.In sysexits.h .
 .Sh BUGS
 The choice of an appropriate exit value is often ambiguous.
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 2a284cb884..67c3ba9b81 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -21,7 +21,7 @@
 .\" distributed with 4.3BSD Unix.
 .\"
 .\" $FreeBSD: src/share/man/man4/bpf.4,v 1.21.2.11 2002/04/07 04:57:13 dd Exp $
-.\" $DragonFly: src/share/man/man4/bpf.4,v 1.4 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/bpf.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd January 16, 1996
 .Dt BPF 4
@@ -98,7 +98,7 @@ links are supported.
 The
 .Xr ioctl 2
 command codes below are defined in
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 All commands require
 these includes:
 .Bd -literal
@@ -113,9 +113,9 @@ Additionally,
 and
 .Dv BIOCSETIF
 require
-.Aq Pa sys/socket.h
+.In sys/socket.h
 and
-.Aq Pa net/if.h .
+.In net/if.h .
 .Pp
 In addition to
 .Dv FIONREAD
@@ -153,7 +153,7 @@ is returned if no interface has been specified.
 The device types, prefixed with
 .Dq Li DLT_ ,
 are defined in
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 .It Dv BIOCPROMISC
 Forces the interface into promiscuous mode.
 All packets, not just those destined for the local host, are processed.
@@ -271,7 +271,7 @@ The current version numbers are given by
 and
 .Dv BPF_MINOR_VERSION
 from
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 An incompatible filter
 may result in undefined behavior (most likely, an error returned by
 .Fn ioctl
@@ -349,7 +349,7 @@ has some knowledge of how to get from packet to packet.
 The macro
 .Dv BPF_WORDALIGN
 is defined in
-.Aq Pa net/bpf.h
+.In net/bpf.h
 to facilitate
 this process.  It rounds up its argument
 to the nearest word aligned value (where a word is
@@ -412,7 +412,7 @@ and
 Various other mode and
 operator bits are or'd into the class to give the actual instructions.
 The classes and modes are defined in
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 .Pp
 Below are the semantics for each defined
 .Nm
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index 2689f6bd8e..393e5ba7fe 100644
--- a/share/man/man4/bt.4
+++ b/share/man/man4/bt.4
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/bt.4,v 1.10.4.6 2001/10/01 13:07:23 dd Exp $
-.\" $DragonFly: src/share/man/man4/bt.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/bt.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd October 16, 1998
 .Dt BT 4
@@ -100,15 +100,15 @@ a problem with your adapter, contact Mylex technical support and ensure you
 have the latest firmware for your controller.
 .Sh FILES
 .Bl -tag -width /usr/share/man0/template.doc -compact
-.It Pa sys/dev/buslogic/bt.c
+.It Pa /sys/dev/disk/buslogic/bt.c
 Core Driver Implementation
-.It Pa sys/dev/buslogic/btreg.h
+.It Pa /sys/dev/disk/buslogic/btreg.h
 MultiMaster Register Set and Core Driver Data Structures
-.It Pa sys/pci/bt_pci.c
+.It Pa /sys/dev/disk/buslogic/bt_pci.c
 PCI Bus Driver Attachment
-.It Pa sys/i386/eisa/bt_eisa.c
+.It Pa /sys/dev/disk/buslogic/bt_eisa.c
 EISA Bus Driver Attachment
-.It Pa sys/i386/isa/bt_isa.c
+.It Pa /sys/dev/disk/buslogic/bt_isa.c
 ISA/VL Bus Driver Attachment
 .El
 .Sh SEE ALSO
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 37aad8a497..6b5be21233 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/cd.4,v 1.17.2.8 2003/06/03 14:32:09 hmp Exp $
-.\" $DragonFly: src/share/man/man4/cd.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/cd.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd October 10, 1998
 .Dt CD 4
@@ -114,9 +114,9 @@ calls which apply to
 .Tn CD-ROM
 drives are defined
 in the header files
-.Aq Pa sys/cdio.h
+.In sys/cdio.h
 and
-.Aq Pa sys/disklabel.h .
+.In sys/disklabel.h .
 .Pp
 .Bl -tag -width CDIOCREADSUBCHANNEL
 .It Dv DIOCGDINFO
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 41693426b9..8eebb4ce85 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/share/man/man4/ch.4,v 1.18.2.7 2001/08/17 13:08:37 ru Exp $
-.\" $DragonFly: src/share/man/man4/ch.4,v 1.6 2006/04/17 18:01:37 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ch.4,v 1.7 2006/05/26 19:39:39 swildner Exp $
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
@@ -92,7 +92,7 @@ The following
 calls apply to the changer.
 They are defined
 in the header file
-.Aq Pa sys/chio.h .
+.In sys/chio.h .
 .Pp
 .Bl -tag -width CHIOEXCHANGE
 .It Dv CHIOMOVE
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 58d51cacd1..249e44d1c6 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/da.4,v 1.22.2.7 2001/10/01 13:07:23 dd Exp $
-.\" $DragonFly: src/share/man/man4/da.4,v 1.3 2004/03/11 12:28:55 hmp Exp $
+.\" $DragonFly: src/share/man/man4/da.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd October 15, 1998
 .Dt DA 4
@@ -155,7 +155,7 @@ The following
 calls apply to
 .Tn SCSI
 disks as well as to other disks.  They are defined in the header file
-.Aq Pa sys/disklabel.h .
+.In sys/disklabel.h .
 .Pp
 .Bl -tag -width DIOCSDINFO
 .It Dv DIOCSBAD
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index a379df07e1..bc443f99a4 100644
--- a/share/man/man4/dpt.4
+++ b/share/man/man4/dpt.4
@@ -22,7 +22,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/dpt.4,v 1.5.4.8 2002/01/12 04:08:50 bmah Exp $
-.\" $DragonFly: src/share/man/man4/dpt.4,v 1.4 2006/05/11 08:23:19 swildner Exp $
+.\" $DragonFly: src/share/man/man4/dpt.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd May 11, 2006
 .Dt DPT 4
@@ -45,13 +45,13 @@ driver provides support for the DPT Smart Cache Plus, Smart Cache III,
 Smart Raid III, Smart Cache IV, and Smart RAID IV families of procucts.
 .Sh FILES
 .Bl -tag -width /usr/share/man0/template.doc -compact
-.It Pa sys/dev/dpt/dpt_scsi.c
+.It Pa /sys/dev/raid/dpt/dpt_scsi.c
 Core Driver Implementation
-.It Pa sys/dev/dpt/dpt.h
+.It Pa /sys/dev/raid/dpt/dpt.h
 Register Set and Core Driver Data Structures
-.It Pa sys/dev/dpt/dpt_pci.c
+.It Pa /sys/dev/raid/dpt/dpt_pci.c
 PCI Bus Driver Attachment
-.It Pa sys/dev/dpt/dpt_eisa.c
+.It Pa /sys/dev/raid/dpt/dpt_eisa.c
 EISA Bus Driver Attachment
 .El
 .Sh SEE ALSO
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 7cdad83fdd..0efbd605dc 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -1,7 +1,7 @@
 .\"	$KAME: icmp6.4,v 1.6 2004/12/27 05:30:56 itojun Exp $
 .\"	$OpenBSD: icmp6.4,v 1.19 2004/12/23 20:33:03 jaredy Exp $
 .\"	$FreeBSD: src/share/man/man4/icmp6.4,v 1.16 2005/01/23 16:02:48 gnn Exp $
-.\"	$DragonFly: src/share/man/man4/icmp6.4,v 1.3 2005/01/23 17:03:13 hrs Exp $
+.\"	$DragonFly: src/share/man/man4/icmp6.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -162,7 +162,7 @@ struct icmp6_hdr {
 .Va icmp6_type
 describes the type of the message.
 Suitable values are defined in
-.Aq Pa netinet/icmp6.h .
+.In netinet/icmp6.h .
 .Va icmp6_code
 describes the sub-type of the message and depends on
 .Va icmp6_type .
diff --git a/share/man/man4/ieee80211.4 b/share/man/man4/ieee80211.4
index c4621041fe..50e32e75e7 100644
--- a/share/man/man4/ieee80211.4
+++ b/share/man/man4/ieee80211.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ieee80211.4,v 1.1.2.3 2001/07/13 09:56:16 ru Exp $
-.\" $DragonFly: src/share/man/man4/ieee80211.4,v 1.3 2004/07/27 14:34:30 joerg Exp $
+.\" $DragonFly: src/share/man/man4/ieee80211.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd February 23, 2001
 .Dt IEEE80211 4
@@ -35,8 +35,8 @@
 .Nm ieee80211
 .Nd standard interface to IEEE 802.11 devices
 .Sh SYNOPSIS
-.In netproto/ieee80211.h
-.In netproto/ieee80211_ioctl.h
+.In netproto/802_11/ieee80211.h
+.In netproto/802_11/ieee80211_ioctl.h
 .Sh DESCRIPTION
 This section describes the interface standard interface to configuration
 and status information on IEEE 802.11 devices.
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index f2a793f912..009c67aece 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ifmib.4,v 1.8.2.6 2002/10/10 18:21:41 johan Exp $
-.\" $DragonFly: src/share/man/man4/ifmib.4,v 1.4 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ifmib.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd November 15, 1996
 .Dt IFMIB 4
@@ -79,7 +79,7 @@ The manifest constants for each level in the
 .Xr sysctl 3
 .Ar name
 are defined in
-.Aq Pa net/if_mib.h .
+.In net/if_mib.h .
 A count of interfaces (and thus rows in the table) is given by
 .Dq Li net.link.generic.system.ifcount
 (or, using the manifest constants,
@@ -127,7 +127,7 @@ the number of promiscuous listeners
 .It Li ifmd_flags
 .Pq Li int
 the interface's flags (defined in
-.Aq Pa net/if.h )
+.In net/if.h )
 .It Li ifmd_snd_len
 .Pq Li int
 the current instantaneous length of the send queue
@@ -138,7 +138,7 @@ was full
 .It Li ifmd_data
 .Pq Li struct if_data
 more information from a structure defined in
-.Aq Pa net/if.h
+.In net/if.h
 (see
 .Xr if_data 9 )
 .El
@@ -156,7 +156,7 @@ and
 interfaces, the structure is called
 .Dq Li struct ifmib_iso_8802_3
 (defined in
-.Aq Pa net/if_mib.h ) ,
+.In net/if_mib.h ) ,
 and implements a superset of the
 .Tn "RFC 1650"
 MIB for Ethernet-like networks.
@@ -165,7 +165,7 @@ For
 .Dv IFT_SLIP ,
 the structure is a
 .Dq Li struct sl_softc
-.Pq Aq Pa net/if_slvar.h .
+.Pq In net/sl/if_slvar.h .
 .Sh SEE ALSO
 .Xr sysctl 3 ,
 .Xr intro 4 ,
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index cf69fabf60..f783e41831 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)inet.4	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man4/inet.4,v 1.11.2.6 2001/12/17 11:30:12 ru Exp $
-.\" $DragonFly: src/share/man/man4/inet.4,v 1.3 2006/02/28 02:25:10 swildner Exp $
+.\" $DragonFly: src/share/man/man4/inet.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd February 14, 1995
 .Dt INET 4
@@ -63,7 +63,7 @@ network standard format (on the
 .Tn VAX
 these are word and byte
 reversed).  The include file
-.Aq Pa netinet/in.h
+.In netinet/in.h
 defines this address
 as a discriminated union.
 .Pp
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 96e426ad2a..553273545a 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/share/man/man4/inet6.4,v 1.4.2.9 2002/05/15 16:45:30 ume Exp $
-.\"	$DragonFly: src/share/man/man4/inet6.4,v 1.3 2006/02/28 02:25:10 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/inet6.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"	$KAME: inet6.4,v 1.21 2001/04/05 01:00:18 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -69,7 +69,7 @@ protocol.
 .Sh ADDRESSING
 IPv6 addresses are 16 byte quantities, stored in network standard byteorder.
 The include file
-.Aq Pa netinet/in.h
+.In netinet/in.h
 defines this address
 as a discriminated union.
 .Pp
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index afb734e749..acfe827fb6 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/kld.4,v 1.5.2.6 2001/08/17 13:08:38 ru Exp $
-.\" $DragonFly: src/share/man/man4/kld.4,v 1.5 2006/05/22 06:26:29 swildner Exp $
+.\" $DragonFly: src/share/man/man4/kld.4,v 1.6 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd May 21, 2006
 .Dt KLD 4
@@ -108,10 +108,10 @@ which should run the appropriate program to create the devices when the
 driver has been successfully loaded.
 .El
 .Sh FILES
-.Bl -tag -width /usr/include/sys/module.h -compact
+.Bl -tag -width ".In sys/module.h" -compact
 .It Pa /modules
 directory containing module binaries shipped with the system
-.It Pa /usr/include/sys/module.h
+.It In sys/module.h
 file containing definitions required to compile a
 .Nm
 module
diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4
index 07f33d037f..b3c44447b2 100644
--- a/share/man/man4/ktr.4
+++ b/share/man/man4/ktr.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ktr.4,v 1.9 2003/09/08 19:57:19 ru Exp $
-.\" $DragonFly: src/share/man/man4/ktr.4,v 1.2 2004/12/26 12:37:08 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ktr.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd February 16, 2001
 .Dt KTR 4
@@ -81,7 +81,7 @@ By default the run time mask is set to log only
 .Dv KTR_GEN
 events.
 The definitions of the event mask bits can be found in
-.Aq Pa sys/ktr.h .
+.In sys/ktr.h .
 .Pp
 Furthermore, there is a CPU event mask whose default value can be changed via
 the
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index 6d45dcf1b3..193f870a63 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -10,7 +10,7 @@
 .\" use.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/apm.4,v 1.13.2.5 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/apm.4,v 1.3 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/apm.4,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd November 1, 1994
 .Dt APM 4 i386
@@ -49,7 +49,7 @@ exports an application interface as a character device.  Applications
 can control APM, or retrieve APM status information via this interface.
 .Nm
 exports the following interfaces.  These symbols are defined in
-.Dq Pa /usr/include/machine/apm_bios.h .
+.In machine/apm_bios.h .
 .Bl -tag -width 4n -offset indent
 .It Sy APMIO_SUSPEND
 Suspend system.
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index a2df429710..1b546d46e4 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/ar.4,v 1.17.2.4 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/ar.4,v 1.4 2006/04/02 16:50:05 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/ar.4,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
@@ -84,11 +84,11 @@ prepended, e.g.,
 .Dv sync_ar0 .
 .Sh FILES
 .Bl -tag -width /sys/i386/isa/ic/hd64570.h -compact
+.It Pa /sys/dev/netif/ar/if_ar.c
+.It Pa /sys/dev/netif/ar/if_ar.h
+.It Pa /sys/dev/netif/ar/if_ar_pci.c
+.It Pa /sys/dev/netif/ar/if_arregs.h
 .It Pa /sys/i386/isa/ic/hd64570.h
-.It Pa /sys/i386/isa/if_arregs.h
-.It Pa /sys/i386/isa/if_ar.c
-.It Pa /sys/i386/isa/if_ar.h
-.It Pa /sys/pci/if_ar_p.c
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/man4.i386/labpc.4 b/share/man/man4/man4.i386/labpc.4
index ccf895efbe..e5a73997de 100644
--- a/share/man/man4/man4.i386/labpc.4
+++ b/share/man/man4/man4.i386/labpc.4
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/labpc.4,v 1.8.2.2 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/labpc.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/labpc.4,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd April 26, 1995
 .Dt LABPC 4 i386
@@ -82,7 +82,9 @@ User's Manual\fP and the source code if this doesn't make sense to
 you.
 .Pp
 The driver supports several general analog I/O ioctl calls.  These
-are defined in sys/dataacq.h and are intended to be implemented in
+are defined in
+.In sys/dataacq.h
+and are intended to be implemented in
 other data acquisition board device drivers.
 .Pp
 AD_MICRO_PERIOD_SET takes a pointer to a long argument specifying
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 41dfd0afbf..05b3a22721 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/mcd.4,v 1.10.2.3 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/Attic/mcd.4,v 1.3 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/Attic/mcd.4,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd December 8, 1994
 .Dt MCD 4 i386
@@ -144,7 +144,7 @@ Until the DMA features are
 supported, the only interrupts that the board generates are those that
 aren't supported by the driver anyway.
 .Sh SEE ALSO
-.Pa /usr/include/sys/cdio.h
+.In sys/cdio.h
 .Sh HISTORY
 An
 .Nm
diff --git a/share/man/man4/man4.i386/meteor.4 b/share/man/man4/man4.i386/meteor.4
index 795aa820dc..f4510717e7 100644
--- a/share/man/man4/man4.i386/meteor.4
+++ b/share/man/man4/man4.i386/meteor.4
@@ -1,6 +1,6 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/meteor.4,v 1.10.2.4 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/meteor.4,v 1.6 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/meteor.4,v 1.7 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd August 15, 1995
 .Dt METEOR 4 i386
@@ -34,7 +34,7 @@ card are:
 .It
 .Pa /sys/dev/video/meteor/meteor.c
 .It
-.Pa /sys/i386/include/ioctl_meteor.h
+.Pa /sys/dev/video/meteor/ioctl_meteor.h
 .El
 .Pp
 For
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 376dc3aa61..e11cc05a8e 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -11,7 +11,7 @@
 .\" without express or implied warranty.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/mse.4,v 1.10.2.4 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/mse.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/mse.4,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd December 3, 1997
 .Dt MSE 4 i386
@@ -155,7 +155,7 @@ There are a few
 .Xr ioctl 2
 commands for mouse drivers.
 These commands and related structures and constants are defined in
-.Ao Pa machine/mouse.h Ac .
+.In machine/mouse.h .
 General description of the commands is given in
 .Xr mouse 4 .
 This section explains the features specific to the
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index f483f54564..2b46595d3c 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/perfmon.4,v 1.8.2.5 2001/08/17 13:08:46 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/perfmon.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/perfmon.4,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .Dd March 26, 1996
 .Dt PERFMON 4 i386
 .Os
@@ -60,7 +60,7 @@ the special device file
 This device supports a number of
 .Xr ioctl 2
 requests, defined in
-.Aq Pa machine/perfmon.h
+.In machine/perfmon.h
 along with the definitions of the various counters for both
 .Tn Pentium
 and
@@ -88,7 +88,7 @@ the number of the counter in question; must be less than
 (currently 2).
 .It Li "u_char pmc_event"
 the particular event number to be monitored, as defined in
-.Aq Pa machine/perfmon.h .
+.In machine/perfmon.h .
 .It Li "u_char pmc_unit"
 the unit mask value, specific to the event type (see the
 .Tn Intel
@@ -175,7 +175,7 @@ clock ticks.
 .Bl -tag -compact -width "/usr/include/machine/perfmon.h"
 .It Pa /dev/perfmon
 character device interface to counters
-.It Pa /usr/include/machine/perfmon.h
+.It In machine/perfmon.h
 include file with definitions of structures and event types
 .It Pa /usr/share/examples/perfmon
 sample source code demonstrating use of all the
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index 4d825bf686..3831e65222 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -29,7 +29,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/pnp.4,v 1.5.2.7 2001/09/25 23:40:30 yokota Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/pnp.4,v 1.3 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/pnp.4,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd September 7, 1997
 .Dt PNP 4 i386
@@ -142,7 +142,9 @@ driver for the device.
 The following routines and data structures can be used:
 .Bl -tag -width "xxxxxxxxxx"
 .It Dv struct pnp_cinfo
-This data structure (defined in /sys/i386/isa/pnp.h) contains all
+This data structure (defined in
+.Pa /sys/boot/common/isapnp.h )
+contains all
 informations related to a PnP logical device.
 .It Fn read_pnp_parms "struct pnp_cinfo *d" "int ldn"
 This function returns the configuration of the requested
diff --git a/share/man/man4/man4.i386/sbni.4 b/share/man/man4/man4.i386/sbni.4
index 3bdfcf4ab3..5d0f080f93 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.5 2005/12/10 00:22:29 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/sbni.4,v 1.6 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd January 8, 2002
 .Dt SBNI 4 i386
@@ -87,9 +87,9 @@ device sbni1 at isa? port 0x214 irq 7 flags 0xd6abcdef
 The sources for the driver reside in:
 .Pp
 .Bl -tag -compact
-.It Pa /sys/dev/sbni/if_sbni.c
-.It Pa /sys/dev/sbni/if_sbnireg.h
-.It Pa /sys/dev/sbni/if_sbnivar.h
+.It Pa /sys/dev/netif/sbni/if_sbni.c
+.It Pa /sys/dev/netif/sbni/if_sbnireg.h
+.It Pa /sys/dev/netif/sbni/if_sbnivar.h
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index 4746c76fed..ffcea501b1 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -1,6 +1,6 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/spkr.4,v 1.13.2.6 2001/12/17 11:30:13 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/spkr.4,v 1.4 2006/02/28 02:25:10 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/spkr.4,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd November 7, 1993
 .Dt SPKR 4 i386
@@ -48,7 +48,7 @@ on a speaker file descriptor to control the
 speaker driver directly; definitions for the
 .Xr ioctl 2
 interface are in
-.Pa /usr/include/machine/speaker.h .
+.In machine/speaker.h .
 The
 .Li tone_t
 structure used in these calls has two fields,
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 8fc5a0cc72..8a41571366 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/sr.4,v 1.15.2.4 2001/08/17 13:08:46 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/sr.4,v 1.4 2006/04/02 16:50:05 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/sr.4,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd July 4, 1996
 .Dt SR 4 i386
@@ -112,11 +112,11 @@ prepended, e.g.,
 .Dv sync_sr0 .
 .Sh FILES
 .Bl -tag -width /sys/i386/isa/ic/hd64570.h -compact
+.It Pa /sys/dev/netif/sr/if_sr.c
+.It Pa /sys/dev/netif/sr/if_sr.h
+.It Pa /sys/dev/netif/sr/if_sr_pci.c
+.It Pa /sys/dev/netif/sr/if_srregs.h
 .It Pa /sys/i386/isa/ic/hd64570.h
-.It Pa /sys/i386/isa/if_srregs.h
-.It Pa /sys/i386/isa/if_sr.c
-.It Pa /sys/i386/isa/if_sr.h
-.It Pa /sys/pci/if_sr_p.c
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 9d9267791b..1cecf1e71e 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mem.4	5.3 (Berkeley) 5/2/91
 .\" $FreeBSD: src/share/man/man4/mem.4,v 1.7.2.5 2002/02/27 03:39:23 dd Exp $
-.\" $DragonFly: src/share/man/man4/mem.4,v 1.4 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/mem.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd May 2, 1991
 .Dt MEM 4
@@ -79,7 +79,7 @@ These attributes can be manipulated via
 calls performed on
 .Pa /dev/mem .
 Declarations and data types are to be found in
-.Aq Pa sys/memrange.h .
+.In sys/memrange.h .
 .Pp
 The specific attributes, and number of programmable ranges may vary between
 architectures.
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 6035525fdc..148d6908d9 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)mtio.4	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man4/mtio.4,v 1.8.2.6 2001/08/17 13:08:38 ru Exp $
-.\" $DragonFly: src/share/man/man4/mtio.4,v 1.3 2005/03/05 16:10:39 hmp Exp $
+.\" $DragonFly: src/share/man/man4/mtio.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd March 5, 2005
 .Dt MTIO 4
@@ -80,8 +80,7 @@ A number of
 operations are available
 on raw magnetic tape.
 Consult
-.Aq Pa sys/mtio.h
-P
+.In sys/mtio.h
 for further information.
 .Sh FILES
 .Bl -tag -width /dev/[nr]sa* -compact
diff --git a/share/man/man4/multicast.4 b/share/man/man4/multicast.4
index 98c5fff53e..eaec510d92 100644
--- a/share/man/man4/multicast.4
+++ b/share/man/man4/multicast.4
@@ -24,7 +24,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\"
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/multicast.4,v 1.1 2003/10/17 15:12:01 bmah Exp $
-.\" $DragonFly: src/share/man/man4/multicast.4,v 1.3 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man4/multicast.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd September 4, 2003
 .Dt MULTICAST 4
@@ -40,7 +40,7 @@
 .In sys/types.h
 .In sys/socket.h
 .In netinet/in.h
-.In netinet/ip_mroute.h
+.In net/ip_mroute/ip_mroute.h
 .In netinet6/ip6_mroute.h
 .Ft int
 .Fn getsockopt "int s" IPPROTO_IP MRT_INIT "void *optval" "socklen_t *optlen"
@@ -172,7 +172,8 @@ The
 .Dq vif_flags
 contains the
 .Dq VIFF_*
-flags as defined in <netinet/ip_mroute.h>.
+flags as defined in
+.In net/ip_mroute/ip_mroute.h .
 The
 .Dq min_ttl_threshold
 contains the minimum TTL a multicast data packet must have to be
@@ -209,7 +210,8 @@ The
 .Dq mif_flags
 contains the
 .Dq MIFF_*
-flags as defined in <netinet6/ip6_mroute.h>.
+flags as defined in
+.In netinet6/ip6_mroute.h .
 The
 .Dq pif_index
 is the physical interface index of the corresponding local interface.
@@ -239,7 +241,9 @@ or
 .Dq MRT6_INIT .
 The IPv4 upcalls have
 .Dq struct igmpmsg
-header (see <netinet/ip_mroute.h>) with field
+header (see
+.In net/ip_mroute/ip_mroute.h )
+with field
 .Dq im_mbz
 set to zero.
 Note that this header follows the structure of
@@ -249,7 +253,9 @@ with the protocol field
 set to zero.
 The IPv6 upcalls have
 .Dq struct mrt6msg
-header (see <netinet6/ip6_mroute.h>) with field
+header (see
+.In netinet6/ip6_mroute.h )
+with field
 .Dq im6_mbz
 set to zero.
 Note that this header follows the structure of
@@ -421,7 +427,10 @@ in the future there will be IPv6 support as well.
 .Pp
 Below is a summary of the expandable API solution.
 Note that all new options and structures are defined
-in <netinet/ip_mroute.h> and <netinet6/ip6_mroute.h>,
+in
+.In net/ip_mroute/ip_mroute.h
+and
+.In netinet6/ip6_mroute.h ,
 unless stated otherwise.
 .Pp
 The user-level process uses new get/setsockopt() options to
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 805a74076f..53562cc48f 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -34,7 +34,7 @@
 .\"          Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.39.2.1 2001/12/21 09:00:50 ru Exp $
-.\" $DragonFly: src/share/man/man4/netgraph.4,v 1.5 2006/04/02 16:50:05 swildner Exp $
+.\" $DragonFly: src/share/man/man4/netgraph.4,v 1.6 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
 .\"
 .Dd January 19, 1999
@@ -310,7 +310,7 @@ structure describing meta-data about the message
 .Dv NULL
 if there is no additional information. The format for this information is
 described in
-.Pa sys/netgraph/netgraph.h .
+.In netgraph/netgraph.h .
 The memory for meta-data must allocated via
 .Fn malloc
 with type
@@ -686,7 +686,7 @@ that node type.
 There are a number of standard predefined messages that will work
 for any node, as they are supported directly by the framework itself.
 These are defined in
-.Pa ng_message.h
+.In netgraph/ng_message.h
 along with the basic layout of messages and other similar information.
 .Bl -tag -width xxx
 .It Dv NGM_CONNECT
@@ -961,7 +961,7 @@ Two macros
 and
 .Fn NG_FREE_DATA "m" "meta"
 should be used if possible to free data and meta data (see
-.Pa netgraph.h ) .
+.In netgraph/netgraph.h ) .
 .It 3
 Messages sent using
 .Fn ng_send_message
@@ -971,19 +971,19 @@ recipient should copy them if it wants to keep that information.
 .El
 .Sh FILES
 .Bl -tag -width xxxxx -compact
-.It Pa /sys/netgraph/netgraph.h
+.It In netgraph/netgraph.h
 Definitions for use solely within the kernel by
 .Nm
 nodes.
-.It Pa /sys/netgraph/ng_message.h
+.It In netgraph/ng_message.h
 Definitions needed by any file that needs to deal with
 .Nm
 messages.
-.It Pa /sys/netgraph/ng_socket.h
+.It In netgraph/socket/ng_socket.h
 Definitions needed to use
 .Nm
 socket type nodes.
-.It Pa /sys/netgraph/ng_{type}.h
+.It In netgraph/{type}/ng_{type}.h
 Definitions needed to use
 .Nm
 {type}
diff --git a/share/man/man4/ng_UI.4 b/share/man/man4/ng_UI.4
index 866a949e7a..3e5268ce87 100644
--- a/share/man/man4/ng_UI.4
+++ b/share/man/man4/ng_UI.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_UI.4,v 1.9.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_UI.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_UI.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_UI.8,v 1.4 1999/01/25 02:37:56 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_UI
 .Nd UI netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_UI.h
+.In netgraph/UI/ng_UI.h
 .Sh DESCRIPTION
 The
 .Nm UI
diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4
index fed56f9c6c..a6751ef3cd 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_async.4,v 1.12.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_async.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_async.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_async.8,v 1.6 1999/01/25 23:46:25 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_async
 .Nd asynchronous framing netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_async.h
+.In netgraph/async/ng_async.h
 .Sh DESCRIPTION
 The
 .Nm async
diff --git a/share/man/man4/ng_bpf.4 b/share/man/man4/ng_bpf.4
index c46152658a..baeb4de37e 100644
--- a/share/man/man4/ng_bpf.4
+++ b/share/man/man4/ng_bpf.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_bpf.4,v 1.17.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_bpf.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_bpf.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_bpf.8,v 1.2 1999/12/03 01:57:12 archie Exp $
 .\"
 .Dd December 2, 1999
@@ -44,7 +44,7 @@
 .Nd Berkeley packet filter netgraph node type
 .Sh SYNOPSIS
 .In net/bpf.h
-.In netgraph/ng_bpf.h
+.In netgraph/bpf/ng_bpf.h
 .Sh DESCRIPTION
 The
 .Nm bpf
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index 5d1ef7f0f7..038afc6ac7 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.1.2.6 2001/12/17 11:30:12 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_bridge.4,v 1.3 2006/04/17 18:01:37 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_bridge.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd August 31, 2000
 .Dt NG_BRIDGE 4
@@ -43,7 +43,7 @@
 .Nd Ethernet bridging netgraph node type
 .Sh SYNOPSIS
 .In sys/types.h
-.In netgraph/ng_bridge.h
+.In netgraph/bridge/ng_bridge.h
 .Sh DESCRIPTION
 The
 .Nm bridge
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index b2f989fbb3..b9e69c31e8 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_cisco.4,v 1.11.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_cisco.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_cisco.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_cisco.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -44,7 +44,7 @@
 .Nd Cisco HDLC protocol netgraph node type
 .Sh SYNOPSIS
 .In netinet/in.h
-.In netgraph/ng_cisco.h
+.In netgraph/cisco/ng_cisco.h
 .Sh DESCRIPTION
 The
 .Nm cisco
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index 70515e90d3..2045719254 100644
--- a/share/man/man4/ng_echo.4
+++ b/share/man/man4/ng_echo.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_echo.4,v 1.10.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_echo.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_echo.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_echo.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_echo
 .Nd netgraph echo node type
 .Sh SYNOPSIS
-.In netgraph/ng_echo.h
+.In netgraph/echo/ng_echo.h
 .Sh DESCRIPTION
 The
 .Nm echo
diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4
index 7b49f5ec29..54cafea913 100644
--- a/share/man/man4/ng_etf.4
+++ b/share/man/man4/ng_etf.4
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.3.2.1 2002/04/09 20:17:17 julian Exp $
-.\" $DragonFly: src/share/man/man4/ng_etf.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_etf.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd February 28, 2001
 .Dt NG_ETF 4
@@ -34,7 +34,7 @@
 .Nm ng_etf
 .Nd Ethertype filtering netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_etf.h
+.In netgraph/etf/ng_etf.h
 .Sh DESCRIPTION
 The
 .Nm etf
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index f81ebeba69..7251bfda27 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_ether.4,v 1.4.2.12 2002/04/07 04:57:13 dd Exp $
-.\" $DragonFly: src/share/man/man4/ng_ether.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_ether.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd June 26, 2000
 .Dt NG_ETHER 4
@@ -42,7 +42,7 @@
 .Nm ng_ether
 .Nd Ethernet netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_ether.h
+.In netgraph/ether/ng_ether.h
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/ng_frame_relay.4 b/share/man/man4/ng_frame_relay.4
index 41ed76ea66..b478b69253 100644
--- a/share/man/man4/ng_frame_relay.4
+++ b/share/man/man4/ng_frame_relay.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_frame_relay.4,v 1.11.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_frame_relay.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_frame_relay.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_frame_relay.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_frame_relay
 .Nd frame relay netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_frame_relay.h
+.In netgraph/frame_relay/ng_frame_relay.h
 .Sh DESCRIPTION
 The
 .Nm frame_relay
diff --git a/share/man/man4/ng_hole.4 b/share/man/man4/ng_hole.4
index 10a8399a73..2b4daf878c 100644
--- a/share/man/man4/ng_hole.4
+++ b/share/man/man4/ng_hole.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_hole.4,v 1.10.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_hole.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_hole.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_hole.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_hole
 .Nd netgraph discard node type
 .Sh SYNOPSIS
-.In netgraph/ng_hole.h
+.In netgraph/hole/ng_hole.h
 .Sh DESCRIPTION
 The
 .Nm hole
diff --git a/share/man/man4/ng_iface.4 b/share/man/man4/ng_iface.4
index 4edd248079..d9e28eef39 100644
--- a/share/man/man4/ng_iface.4
+++ b/share/man/man4/ng_iface.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_iface.4,v 1.13.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_iface.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_iface.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_iface
 .Nd interface netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_iface.h
+.In netgraph/iface/ng_iface.h
 .Sh DESCRIPTION
 An
 .Nm iface
diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4
index bd098cd7e7..cd79bafc1a 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_ksocket.4,v 1.15.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_ksocket.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_ksocket.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd November 15, 1999
 .Dt NG_KSOCKET 4
@@ -42,7 +42,7 @@
 .Nm ng_ksocket
 .Nd kernel socket netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_ksocket.h
+.In netgraph/ksocket/ng_ksocket.h
 .Sh DESCRIPTION
 A
 .Nm ksocket
diff --git a/share/man/man4/ng_l2tp.4 b/share/man/man4/ng_l2tp.4
index e6d4759c2c..8e199818c0 100644
--- a/share/man/man4/ng_l2tp.4
+++ b/share/man/man4/ng_l2tp.4
@@ -36,7 +36,7 @@
 .\" Author: Archie Cobbs <archie@freebsd.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_l2tp.4,v 1.1.2.1 2002/08/20 23:48:53 archie Exp $
-.\" $DragonFly: src/share/man/man4/ng_l2tp.4,v 1.4 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_l2tp.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd April 22, 2002
 .Dt NG_L2TP 4
@@ -45,7 +45,7 @@
 .Nm ng_l2tp
 .Nd L2TP protocol netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_l2tp.h
+.In netgraph/l2tp/ng_l2tp.h
 .Sh DESCRIPTION
 The
 .Nm ng_l2tp
diff --git a/share/man/man4/ng_lmi.4 b/share/man/man4/ng_lmi.4
index 40890f8f84..1b3995be4e 100644
--- a/share/man/man4/ng_lmi.4
+++ b/share/man/man4/ng_lmi.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_lmi.4,v 1.11.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_lmi.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_lmi.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_lmi.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_lmi
 .Nd frame relay LMI protocol netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_lmi.h
+.In netgraph/lmi/ng_lmi.h
 .Sh DESCRIPTION
 The
 .Nm lmi
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index 80363c59c6..387c026b9a 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -34,7 +34,7 @@
 .\"
 .\" $Whistle: ng_mppc.8,v 1.1 1999/12/08 20:20:39 archie Exp $
 .\" $FreeBSD: src/share/man/man4/ng_mppc.4,v 1.11.2.3 2002/03/20 18:16:36 archie Exp $
-.\" $DragonFly: src/share/man/man4/ng_mppc.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_mppc.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd December 8, 1999
 .Dt NG_MPPC 4
@@ -43,7 +43,7 @@
 .Nm ng_mppc
 .Nd Microsoft MPPC/MPPE compression and encryption netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_mppc.h
+.In netgraph/mppc/ng_mppc.h
 .Sh DESCRIPTION
 The
 .Nm mppc
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index 6328b77e0c..50ea54babd 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_one2many.4,v 1.1.2.9 2003/01/06 23:32:22 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/ng_one2many.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_one2many.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd November 15, 2000
 .Dt NG_ONE2MANY 4
@@ -42,7 +42,7 @@
 .Nm ng_one2many
 .Nd packet multiplexing netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_one2many.h
+.In netgraph/one2many/ng_one2many.h
 .Sh DESCRIPTION
 The
 .Nm one2many
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index dc044d64c1..0c2a083e23 100644
--- a/share/man/man4/ng_ppp.4
+++ b/share/man/man4/ng_ppp.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_ppp.4,v 1.18.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_ppp.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_ppp.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_ppp.8,v 1.3 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_ppp
 .Nd PPP protocol netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_ppp.h
+.In netgraph/ppp/ng_ppp.h
 .Sh DESCRIPTION
 The
 .Nm ppp
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index 68d2995dec..8038c1e72a 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.18.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_pppoe.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_pppoe.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd October 28, 1999
@@ -44,7 +44,7 @@
 .Nd RFC 2516 PPPOE protocol netgraph node type
 .Sh SYNOPSIS
 .In net/ethernet.h
-.In netgraph/ng_pppoe.h
+.In netgraph/pppoe/ng_pppoe.h
 .Sh DESCRIPTION
 The
 .Nm pppoe
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index 98febd5d5c..af1e7b0090 100644
--- a/share/man/man4/ng_pptpgre.4
+++ b/share/man/man4/ng_pptpgre.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_pptpgre.4,v 1.16.2.2 2002/03/19 18:24:07 schweikh Exp $
-.\" $DragonFly: src/share/man/man4/ng_pptpgre.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_pptpgre.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
 .\"
 .Dd December 7, 2001
@@ -43,7 +43,7 @@
 .Nm ng_pptpgre
 .Nd PPTP GRE protocol netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_pptpgre.h
+.In netgraph/pptpgre/ng_pptpgre.h
 .Sh DESCRIPTION
 The
 .Nm pptpgre
diff --git a/share/man/man4/ng_rfc1490.4 b/share/man/man4/ng_rfc1490.4
index 50869eeb45..7b70b96980 100644
--- a/share/man/man4/ng_rfc1490.4
+++ b/share/man/man4/ng_rfc1490.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_rfc1490.4,v 1.11.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_rfc1490.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_rfc1490.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_rfc1490.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_rfc1490
 .Nd RFC 1490 netgraph node type
 .Sh SYNOPSIS
-.In netgraph/ng_rfc1490.h
+.In netgraph/rfc1490/ng_rfc1490.h
 .Sh DESCRIPTION
 The
 .Nm rfc1490
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index f97ec8dcb8..66c5226c91 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_socket.4,v 1.14.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_socket.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_socket.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_socket.8,v 1.5 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -44,7 +44,7 @@
 .Nd netgraph socket node type
 .Sh SYNOPSIS
 .In netgraph/ng_message.h
-.In netgraph/ng_socket.h
+.In netgraph/socket/ng_socket.h
 .Sh DESCRIPTION
 A
 .Nm socket
diff --git a/share/man/man4/ng_tee.4 b/share/man/man4/ng_tee.4
index 194b9d693e..a5d6724760 100644
--- a/share/man/man4/ng_tee.4
+++ b/share/man/man4/ng_tee.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_tee.4,v 1.12.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_tee.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_tee.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_tee.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -43,7 +43,7 @@
 .Nm ng_tee
 .Nd netgraph ``tee'' node type
 .Sh SYNOPSIS
-.In netgraph/ng_tee.h
+.In netgraph/tee/ng_tee.h
 .Sh DESCRIPTION
 The
 .Nm tee
diff --git a/share/man/man4/ng_tty.4 b/share/man/man4/ng_tty.4
index 3dacb6f8f2..fe3ec15a1a 100644
--- a/share/man/man4/ng_tty.4
+++ b/share/man/man4/ng_tty.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.14.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_tty.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ng_tty.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -45,7 +45,7 @@
 .Sh SYNOPSIS
 .In sys/ttycom.h
 .In netgraph/ng_message.h
-.In netgraph/ng_tty.h
+.In netgraph/tty/ng_tty.h
 .Sh DESCRIPTION
 The
 .Nm tty
diff --git a/share/man/man4/ng_vjc.4 b/share/man/man4/ng_vjc.4
index 69c081d44d..e6dcb5e9f2 100644
--- a/share/man/man4/ng_vjc.4
+++ b/share/man/man4/ng_vjc.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_vjc.4,v 1.17.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_vjc.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ng_vjc.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_vjc.8,v 1.4 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -44,7 +44,7 @@
 .Nd Van Jacobson compression netgraph node type
 .Sh SYNOPSIS
 .In net/slcompress.h
-.In netgraph/ng_vjc.h
+.In netgraph/vjc/ng_vjc.h
 .Sh DESCRIPTION
 The
 .Nm vjc
@@ -164,7 +164,7 @@ below).
 This command returns the node's current state described by the
 .Dv "struct slcompress"
 structure, which is defined in
-.Pa net/slcompress.h .
+.In net/slcompress.h .
 .It Dv NGM_VJC_CLR_STATS
 Clears the node statistics counters.  Statistics are also cleared whenever the
 .Dv enableComp
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 2816417d92..cfcd5918c5 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$FreeBSD: src/share/man/man4/pci.4,v 1.3.2.5 2001/08/17 13:08:39 ru Exp $
-.\"	$DragonFly: src/share/man/man4/pci.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\"	$DragonFly: src/share/man/man4/pci.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd October 24, 1999
 .Dt PCI 4
@@ -66,7 +66,7 @@ The following
 calls are supported by the
 .Nm
 driver.  They are defined in the header file
-.Aq Pa sys/pciio.h .
+.In sys/pciio.h .
 .Bl -tag -width 012345678901234
 .Pp
 .It PCIOCGETCONF
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index 03f9f79b35..c266ef54eb 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/pcm.4,v 1.12.2.11 2002/12/12 19:53:32 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/pcm.4,v 1.4 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/pcm.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd June 3, 1998
 .Dt PCM 4
@@ -80,7 +80,7 @@ memory-mapped access to the audio buffers). As a consequence, some
 applications may need to be recompiled with a slightly modified
 audio module.
 See
-.Aq Pa sys/soundcard.h
+.In sys/soundcard.h
 for a complete list of the supported ioctls.
 .Sh SUPPORTED CARDS
 Below we include a list of supported codecs/cards.
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 09ca13edac..cec6f1d07d 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: pf.4,v 1.46 2004/02/19 21:29:51 cedric Exp $
-.\"	$DragonFly: src/share/man/man4/pf.4,v 1.2 2005/12/28 13:35:02 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/pf.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .\" Copyright (C) 2001, Kjell Wooding.  All rights reserved.
 .\"
@@ -613,7 +613,9 @@ are set to the TCP MSS, the TCP window size, the IP length and the IP TTL of
 the TCP SYN packet respectively.
 The
 .Va fp_flags
-member is filled according to the net/pfvar.h include file PF_OSFP_* defines.
+member is filled according to the
+.In net/pfvar.h
+include file PF_OSFP_* defines.
 The
 .Va fp_getnum
 is not used with this ioctl.
diff --git a/share/man/man4/pflog.4 b/share/man/man4/pflog.4
index 7be4d6535a..36c9c49858 100644
--- a/share/man/man4/pflog.4
+++ b/share/man/man4/pflog.4
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: pflog.4,v 1.7 2004/03/21 19:47:59 miod Exp $
-.\"	$DragonFly: src/share/man/man4/pflog.4,v 1.2 2005/08/05 15:35:52 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/pflog.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .\" Copyright (c) 2001 Tobias Weingartner
 .\" All rights reserved.
@@ -52,7 +52,7 @@ with it of length
 This header documents the address family, interface name, rule
 number, reason, action, and direction of the packet that was logged.
 This structure, defined in
-.Aq Pa net/if_pflog.h
+.In net/pf/if_pflog.h
 looks like
 .Bd -literal -offset indent
 struct pfloghdr {
diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4
index 2ac3a32c2b..349e56ed66 100644
--- a/share/man/man4/pfsync.4
+++ b/share/man/man4/pfsync.4
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: pfsync.4,v 1.14 2004/03/21 19:47:59 miod Exp $
-.\"	$DragonFly: src/share/man/man4/pfsync.4,v 1.3 2006/04/17 18:01:37 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/pfsync.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .\" Copyright (c) 2002 Michael Shalayeff
 .\" All rights reserved.
@@ -81,7 +81,7 @@ The header indicates the version of the protocol, address family,
 action taken on the following states and the number of state
 table entries attached in this packet.
 This structure, defined in
-.Aq Pa net/if_pfsync.h
+.In net/pf/if_pfsync.h
 looks like:
 .Bd -literal -offset indent
 struct pfsync_header {
diff --git a/share/man/man4/pim.4 b/share/man/man4/pim.4
index 59ad0868c3..0182aa73b2 100644
--- a/share/man/man4/pim.4
+++ b/share/man/man4/pim.4
@@ -24,7 +24,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\"
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/pim.4,v 1.1 2003/10/17 15:12:01 bmah Exp $
-.\" $DragonFly: src/share/man/man4/pim.4,v 1.1 2003/10/18 21:40:41 hmp Exp $
+.\" $DragonFly: src/share/man/man4/pim.4,v 1.2 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd September 4, 2003
 .Dt PIM 4
@@ -41,7 +41,7 @@
 .In sys/types.h
 .In sys/socket.h
 .In netinet/in.h
-.In netinet/ip_mroute.h
+.In net/ip_mroute/ip_mroute.h
 .In netinet/pim.h
 .Ft int
 .Fn getsockopt "int s" IPPROTO_IP MRT_PIM "void *optval" "socklen_t *optlen"
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 6b410727b8..bef9a3bcaf 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/psm.4,v 1.24.2.9 2002/12/29 16:35:38 schweikh Exp $
-.\" $DragonFly: src/share/man/man4/psm.4,v 1.4 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/psm.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd April 1, 2000
 .Dt PSM 4
@@ -349,7 +349,7 @@ There are a few
 .Xr ioctl 2
 commands for mouse drivers.
 These commands and related structures and constants are defined in
-.Ao Pa machine/mouse.h Ac .
+.In machine/mouse.h .
 General description of the commands is given in
 .Xr mouse 4 .
 This section explains the features specific to the
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index fba84d1ed8..43ec4283aa 100644
--- a/share/man/man4/pt.4
+++ b/share/man/man4/pt.4
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/pt.4,v 1.8.2.3 2001/08/17 13:08:39 ru Exp $
-.\" $DragonFly: src/share/man/man4/pt.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/pt.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd March 2, 1995
 .Dt PT 4
@@ -65,7 +65,7 @@ The following
 calls are supported by the
 .Nm
 driver.  They are defined in the header file
-.Aq Pa sys/ptio.h .
+.In sys/ptio.h .
 .Pp
 .It PTIOCGETTIMEOUT
 This ioctl allows userland applications to fetch the current
diff --git a/share/man/man4/sbsh.4 b/share/man/man4/sbsh.4
index d757f22e77..bc56b66cd1 100644
--- a/share/man/man4/sbsh.4
+++ b/share/man/man4/sbsh.4
@@ -22,7 +22,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/sbsh.4,v 1.1.2.1 2003/04/15 18:15:08 fjoe Exp $
-.\" $DragonFly: src/share/man/man4/sbsh.4,v 1.4 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/sbsh.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd April 11, 2003
 .Dt SBSH 4
@@ -46,8 +46,8 @@ sb16config utility before interface activation.
 The sources for the driver reside in:
 .Pp
 .Bl -tag -compact
-.It Pa /sys/dev/sbsh/if_sbsh.c
-.It Pa /sys/dev/sbsh/if_sbshreg.h
+.It Pa /sys/dev/netif/sbsh/if_sbsh.c
+.It Pa /sys/dev/netif/sbsh/if_sbshreg.h
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/ses.4 b/share/man/man4/ses.4
index daca9704ee..ff2ab438c9 100644
--- a/share/man/man4/ses.4
+++ b/share/man/man4/ses.4
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ses.4,v 1.2.2.6 2001/08/17 13:08:39 ru Exp $
-.\" $DragonFly: src/share/man/man4/ses.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/ses.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd January 29, 2000
 .Dt SES 4
@@ -78,7 +78,7 @@ calls apply to
 .Nm
 devices.
 They are defined in the header file
-.Aq Pa cam/scsi/scsi_ses.h
+.In bus/cam/scsi/scsi_ses.h
 (\fIq.v.\fR).
 .Pp
 .Bl -tag -width SESIOC_GETENCSTAT
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 00de564806..69795d0ace 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/syscons.4,v 1.10.2.14 2003/04/25 21:21:36 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/syscons.4,v 1.5 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man4/syscons.4,v 1.6 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd January 28, 2005
 .Dt SYSCONS 4
@@ -313,7 +313,7 @@ above.
 .It Dv SC_KERNEL_CONS_REV_ATTR=_attribute_
 These options will set the default colors.
 Available colors are defined in
-.Pa /usr/include/machine/pc/display.h .
+.In machine/pc/display.h .
 See
 .Sx EXAMPLES
 below.
@@ -416,7 +416,7 @@ The following
 commands are defined for the
 .Nm
 driver in
-.Aq Pa sys/consio.h .
+.In sys/consio.h .
 .Pp
 .Bl -tag -width CONS -compact
 .It Dv KDGETMODE Ar int *mode
@@ -689,7 +689,7 @@ Prevent or permit terminal switching.
 The following
 .Xr ioctl 2
 commands are defined for switching video modes. See
-.Aq Pa sys/fbio.h
+.In sys/fbio.h
 for defined mode numbers (commands for higher mode numbers have to be
 supplied by the programmer):
 .Dv SW_B40x25 ,
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index ff187ce763..9595ad2cda 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/sysmouse.4,v 1.12.2.5 2001/12/17 11:30:12 ru Exp $
-.\" $DragonFly: src/share/man/man4/sysmouse.4,v 1.3 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man4/sysmouse.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd December 3, 1997
 .Dt SYSMOUSE 4
@@ -418,7 +418,7 @@ The
 field specifies the signal to be delivered to the process.
 It must be
 one of the values defined in
-.Ao Pa signal.h Ac .
+.In signal.h .
 The
 .Dv mode
 field is currently unused.
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index afa369dbd0..92b0b2ae10 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/share/man/man4/tap.4,v 1.1.2.7 2002/04/16 23:59:28 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/tap.4,v 1.4 2005/12/10 00:22:29 swildner Exp $
+.\" $DragonFly: src/share/man/man4/tap.4,v 1.5 2006/05/26 19:39:39 swildner Exp $
 .\" Based on PR#2411
 .\"
 .Dd July 9, 2000
@@ -100,7 +100,7 @@ The following
 .Xr ioctl 2
 calls are supported
 (defined in
-.Aq Pa net/if_tap.h ) :
+.In net/if_tap.h ) :
 .Bl -tag -width VMIO_SIOCSETMACADDR
 .It Dv TAPSDEBUG
 The argument should be a pointer to an
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index 0c05e4d253..bc2f52e4a3 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/targ.4,v 1.3.2.1 2003/02/18 22:07:11 njl Exp $
-.\" $DragonFly: src/share/man/man4/targ.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/targ.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd November 15, 2002
 .Dt TARG 4
@@ -71,7 +71,7 @@ Any data transfers requested by the user CCBs are done via zero-copy IO.
 The following
 .Xr ioctl 2
 calls are defined in the header file
-.Aq Pa cam/scsi/scsi_targetio.h .
+.In bus/cam/scsi/scsi_targetio.h .
 .Bl -tag -width ".Dv TARGIOCDISABLE"
 .It Dv TARGIOCENABLE
 .Pq Vt "struct ioc_enable_lun"
@@ -113,7 +113,7 @@ it.
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /sys/cam/scsi/scsi_target.c" -compact
-.It Aq Pa cam/scsi/scsi_targetio.h
+.It In bus/cam/scsi/scsi_targetio.h
 describes the usermode interface.
 .It Pa /sys/cam/scsi/scsi_target.c
 is the driver source file.
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index 0f8f8035dd..fde3a311c2 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man4/tcp.4,v 1.11.2.14 2002/12/29 16:35:38 schweikh Exp $
-.\" $DragonFly: src/share/man/man4/tcp.4,v 1.5 2005/08/01 01:49:17 swildner Exp $
+.\" $DragonFly: src/share/man/man4/tcp.4,v 1.6 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd February 14, 1995
 .Dt TCP 4
@@ -175,7 +175,7 @@ available from
 or
 .Dv IPPROTO_TCP .
 All options are declared in
-.Aq Pa netinet/tcp.h .
+.In netinet/tcp.h .
 .Pp
 Options at the
 .Tn IP
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index c90b262a1d..04b00e09c5 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)termios.4	8.4 (Berkeley) 4/19/94
 .\" $FreeBSD: src/share/man/man4/termios.4,v 1.12.2.9 2001/12/17 11:30:12 ru Exp $
-.\" $DragonFly: src/share/man/man4/termios.4,v 1.3 2005/12/28 13:35:02 swildner Exp $
+.\" $DragonFly: src/share/man/man4/termios.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd April 19, 1994
 .Dt TERMIOS 4
@@ -762,7 +762,7 @@ Routines that need to control certain terminal
 .Tn I/O
 characteristics
 do so by using the termios structure as defined in the header
-.Aq Pa termios.h .
+.In termios.h .
 This structure contains minimally four scalar elements of bit flags
 and one array of special characters.  The scalar flag elements are
 named:
@@ -1406,7 +1406,7 @@ The special control characters values are defined by the array
 This table lists the array index, the corresponding special character,
 and the system default value.  For an accurate list of
 the system defaults, consult the header file
-.Aq Pa ttydefaults.h .
+.In sys/ttydefaults.h .
 .Pp
 .Bl -column "Index Name" "Special Character" -offset indent -compact
 .It Em "Index Name	Special Character	Default Value"
@@ -1455,4 +1455,4 @@ after
 .Fn open
 is set according to
 the values in the header
-.Aq Pa sys/ttydefaults.h .
+.In sys/ttydefaults.h .
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index bfd9a75e92..a95edd2f89 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)tty.4	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD: src/share/man/man4/tty.4,v 1.9.2.6 2001/12/17 11:30:12 ru Exp $
-.\" $DragonFly: src/share/man/man4/tty.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/tty.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd August 14, 1992
 .Dt TTY 4
@@ -163,7 +163,7 @@ file descriptor zero by the following code fragment:
 Change to the new line discipline pointed to by
 .Fa ldisc .
 The available line disciplines are listed in
-.Aq Pa sys/ttycom.h
+.In sys/ttycom.h
 and currently are:
 .Pp
 .Bl -tag -width NETGRAPHDISC -compact
@@ -304,7 +304,7 @@ If the value of the int pointed to by
 contains the
 .Dv FREAD
 bit as defined in
-.Aq Pa sys/file.h ,
+.In sys/file.h ,
 then all characters in the input queue are cleared.  If it contains
 the
 .Dv FWRITE
@@ -325,7 +325,7 @@ and is the means by which most full\&-screen oriented programs determine the
 screen size.  The
 .Va winsize
 structure is defined in
-.Aq Pa sys/ioctl.h .
+.In sys/ioctl.h .
 .It Dv TIOCSWINSZ Fa struct winsize *ws
 Set the window size associated with the terminal to be the value in
 the
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index ee2e25d6d5..8807587dd0 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,6 +1,6 @@
 .\" $NetBSD: tun.4,v 1.1 1996/06/25 22:17:37 pk Exp $
 .\" $FreeBSD: src/share/man/man4/tun.4,v 1.9.2.4 2001/08/17 13:08:39 ru Exp $
-.\" $DragonFly: src/share/man/man4/tun.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/tun.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" Based on PR#2411
 .\"
 .Dd March 10, 1996
@@ -130,7 +130,7 @@ The following
 .Xr ioctl 2
 calls are supported
 (defined in
-.Aq Pa net/if_tun.h ) :
+.In net/tun/if_tun.h ) :
 .Bl -tag -width ".Dv TUNSIFMODE"
 .It Dv TUNSDEBUG
 The argument should be a pointer to an
@@ -150,7 +150,7 @@ device.
 The
 .Vt struct tuninfo
 is declared in
-.Aq Pa net/if_tun.h .
+.In net/tun/if_tun.h .
 .It Dv TUNGIFINFO
 The argument should be a pointer to an
 .Vt struct tuninfo ,
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index 2c25e12ec2..e92974229d 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)unix.4	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: src/share/man/man4/unix.4,v 1.3.2.4 2002/04/22 08:59:53 dd Exp $
-.\" $DragonFly: src/share/man/man4/unix.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/unix.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd July 15, 2001
 .Dt UNIX 4
@@ -63,7 +63,7 @@ filesystem pathnames for addressing.
 addresses are variable-length filesystem pathnames of
 at most 104 characters.
 The include file
-.Aq Pa sys/un.h
+.In sys/un.h
 defines this address:
 .Bd -literal -offset indent
 struct sockaddr_un {
@@ -126,7 +126,7 @@ Any valid descriptor may be sent in a message.
 The file descriptor(s) to be passed are described using a
 .Vt "struct cmsghdr"
 that is defined in the include file
-.Aq Pa sys/socket.h .
+.In sys/socket.h .
 The type of the message is
 .Dv SCM_RIGHTS ,
 and the data portion of the messages is an array of integers
@@ -161,7 +161,7 @@ of the server.
 These will arrive in the form of a filled in
 .Vt "struct xucred"
 (defined in
-.Aq Pa sys/ucred.h ) .
+.In sys/ucred.h ) .
 The credentials presented to the server (the
 .Xr listen 2
 caller) are those of the client when it called
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 5ff87c4d4c..15812ad8b8 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -26,7 +26,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/usb.4,v 1.9.2.10 2002/12/19 20:48:25 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/usb.4,v 1.3 2004/03/11 12:28:55 hmp Exp $
+.\" $DragonFly: src/share/man/man4/usb.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd February 21, 1999
 .Dt USB 4
@@ -37,8 +37,8 @@
 .Sh SYNOPSIS
 .Cd "device usb"
 .Pp
-.In dev/usb/usb.h
-.In dev/usb/usbhid.h
+.In bus/usb/usb.h
+.In bus/usb/usbhid.h
 .Sh DESCRIPTION
 .Dx
 provides machine-independent bus support and drivers for
@@ -155,7 +155,7 @@ Use the following to get access to the
 .Tn USB
 specific structures and defines.
 .Pp
-.In dev/usb/usb.h
+.In bus/usb/usb.h
 .Pp
 The
 .Pa /dev/usb Ns Ar N
@@ -273,7 +273,7 @@ can destroy the bus integrity.
 .El
 .Pp
 The include file
-.Aq Pa dev/usb/usb.h
+.In bus/usb/usb.h
 contains definitions for the types used by the various
 .Xr ioctl 2
 calls.
@@ -290,7 +290,7 @@ and
 macros to handle byte order and alignment properly.
 .Pp
 The include file
-.Aq Pa dev/usb/usbhid.h
+.In bus/usb/usbhid.h
 similarly contains the definitions for
 Human Interface Devices
 .Pq Tn HID .
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index 48c050afcc..f96473c1b6 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/a.out.5,v 1.10.2.4 2002/04/16 14:50:18 trhodes Exp $
-.\" $DragonFly: src/share/man/man5/a.out.5,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man5/a.out.5,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd June 5, 1993
 .Dt A.OUT 5
@@ -46,7 +46,7 @@
 .In a.out.h
 .Sh DESCRIPTION
 The include file
-.Aq Pa a.out.h
+.In a.out.h
 declares three structures and several macros.
 The structures describe the format of
 executable machine code files
@@ -191,7 +191,7 @@ Contains the size in bytes of the data relocation table.
 .El
 .Pp
 The
-.Pa a.out.h
+.In a.out.h
 include file defines several macros which use an
 .Fa exec
 structure to test consistency or to locate section offsets in the binary file.
@@ -408,7 +408,7 @@ field hold one of two values:
 and
 .Dv AUX_OBJECT
 (see
-.Aq Pa link.h
+.In link.h
 for their definitions).
 .Dv AUX_FUNC
 associates the symbol with a callable function, while
@@ -447,7 +447,7 @@ is always 4 on 32-bit machines.
 .Xr stab 5
 .Sh HISTORY
 The
-.Pa a.out.h
+.In a.out.h
 include file appeared in
 .At v7 .
 .Sh BUGS
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 6088859909..34368f80bb 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)core.5	8.3 (Berkeley) 12/11/93
 .\" $FreeBSD: src/share/man/man5/core.5,v 1.8.2.5 2003/01/07 22:03:50 keramida Exp $
-.\" $DragonFly: src/share/man/man5/core.5,v 1.3 2004/03/11 12:28:56 hmp Exp $
+.\" $DragonFly: src/share/man/man5/core.5,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd January 9, 2002
 .Dt CORE 5
@@ -97,14 +97,14 @@ area, whose size (in pages) is
 defined by the
 .Dv UPAGES
 manifest in the
-.Aq Pa sys/param.h
+.In sys/param.h
 file.
 The
 .Fa u.
 area starts with a
 .Fa user
 structure as given in
-.Aq Pa sys/user.h .
+.In sys/user.h .
 The remainder of the core
 file consists of the data pages followed by
 the stack pages of the process image.
@@ -124,7 +124,7 @@ area.
 The size of a ``page'' is given by the constant
 .Dv PAGE_SIZE
 (also from
-.Aq Pa sys/param.h ) .
+.In sys/param.h ) .
 .Sh EXAMPLES
 In order to store all core images in per-user private areas under
 .Pa /var/coredumps ,
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index ecfec543e6..96f000e410 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)dir.5	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD: src/share/man/man5/dir.5,v 1.12.2.5 2001/12/17 11:30:13 ru Exp $
-.\" $DragonFly: src/share/man/man5/dir.5,v 1.6 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man5/dir.5,v 1.7 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd March 5, 2005
 .Dt DIR 5
@@ -81,7 +81,7 @@ and
 .Xr mount 8 . )
 .Pp
 The directory entry format is defined in
-.Aq Pa sys/dirent.h .
+.In sys/dirent.h .
 This file should not be included directly by applications.
 .Sh SEE ALSO
 .Xr fs 5 ,
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 089c757a61..2708b8d516 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -23,7 +23,7 @@
 .\"SUCH DAMAGE.
 .\"
 .\"	$FreeBSD: src/share/man/man5/elf.5,v 1.6.2.8 2001/12/17 11:30:13 ru Exp $
-.\"	$DragonFly: src/share/man/man5/elf.5,v 1.3 2005/07/13 18:33:50 asmodai Exp $
+.\"	$DragonFly: src/share/man/man5/elf.5,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd July 31, 1999
 .Dt ELF 5
@@ -35,7 +35,7 @@
 .In elf.h
 .Sh DESCRIPTION
 The header file
-.Aq Pa elf.h
+.In elf.h
 defines the format of ELF executable binary files.
 Amongst these files are
 normal executable files, relocatable object files, core files and shared
@@ -52,7 +52,7 @@ the file.
 .Pp
 Applications which wish to process ELF binary files for their native
 architecture only should include
-.Pa elf.h
+.In elf.h
 in their source code.
 These applications should need to refer to
 all the types and structures by their generic names
@@ -64,11 +64,11 @@ regardless whether the host is 32-bit or 64-bit.
 .Pp
 Should an application need to process ELF files of an unknown
 architecture then the application needs to include both
-.Pa sys/elf32.h
+.In sys/elf32.h
 and
-.Pa sys/elf64.h
+.In sys/elf64.h
 instead of
-.Pa elf.h .
+.In elf.h .
 Furthermore, all types and structures need to be identified by either
 .Dq Elf32_xxx
 or
@@ -79,9 +79,9 @@ or
 .Dq ELF64_xxx .
 .Pp
 Whatever the system's architecture is, it will always include
-.Pa sys/elf_common.h
+.In sys/elf_common.h
 as well as
-.Pa sys/elf_generic.h .
+.In sys/elf_generic.h .
 .Pp
 These header files describe the above mentioned headers as C structures
 and also include structures for dynamic sections, relocation sections and
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index 6e8c12f592..aee95637ce 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fs.5	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/share/man/man5/fs.5,v 1.10.2.4 2001/12/17 11:30:14 ru Exp $
-.\" $DragonFly: src/share/man/man5/fs.5,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man5/fs.5,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd April 19, 1994
 .Dt FS 5
@@ -42,17 +42,17 @@
 .Nd format of file system volume
 .Sh SYNOPSIS
 .In sys/param.h
-.In ufs/ffs/fs.h
+.In vfs/ufs/fs.h
 .Pp
 .In sys/types.h
 .In sys/lock.h
-.In ufs/ufs/quota.h
-.In ufs/ufs/inode.h
+.In vfs/ufs/quota.h
+.In vfs/ufs/inode.h
 .Sh DESCRIPTION
 The files
-.Aq Pa fs.h
+.In vfs/ufs/fs.h
 and
-.Aq Pa inode.h
+.In vfs/ufs/inode.h
 declare several structures, defined variables and macros
 which are used to create and manage the underlying format of
 file system objects on random access devices (disks).
@@ -75,7 +75,7 @@ that is of size
 .Dv SBSIZE .
 The following structure describes the super-block and is
 from the file
-.Aq Pa ufs/ffs/fs.h :
+.In vfs/ufs/fs.h :
 .Bd -literal
 /*
  * Super block for an FFS file system.
@@ -369,7 +369,7 @@ each current directory, each mounted-on file,
 text file, and the root.
 An inode is `named' by its device/i-number pair.
 For further information, see the include file
-.Aq Pa ufs/ufs/inode.h .
+.In vfs/ufs/inode.h .
 .Sh HISTORY
 A super-block structure named filsys appeared in
 .At v6 .
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index 16194b4549..128d916adf 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)group.5	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD: src/share/man/man5/group.5,v 1.15.2.4 2002/02/01 15:51:18 ru Exp $
-.\" $DragonFly: src/share/man/man5/group.5,v 1.4 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man5/group.5,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd September 29, 1994
 .Dt GROUP 5
@@ -99,7 +99,7 @@ entry and does not need to be added to that group in the
 .\" the fields are read into the structure
 .\" .Fa group
 .\" declared in
-.\" .Aq Pa grp.h :
+.\" .In grp.h :
 .\" .Bd -literal -offset indent
 .\" struct group {
 .\"	char    *gr_name;        /* group name */
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 1c5bd52f0b..3feeec7d88 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -27,7 +27,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man5/link.5,v 1.14.2.10 2004/05/17 11:38:55 brueffer Exp $
-.\" $DragonFly: src/share/man/man5/link.5,v 1.4 2004/07/23 06:43:05 hmp Exp $
+.\" $DragonFly: src/share/man/man5/link.5,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
@@ -41,7 +41,7 @@
 .In link.h
 .Sh DESCRIPTION
 The include file
-.Aq Pa link.h
+.In link.h
 declares several structures that are present in dynamically linked
 programs and libraries.
 The structures define the interface between several components of the
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 09a03a959c..443df3155d 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/share/man/man5/procfs.5,v 1.14.2.5 2001/08/17 13:08:47 ru Exp $
-.\" $DragonFly: src/share/man/man5/procfs.5,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man5/procfs.5,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\" Written by Garrett Wollman
 .\" This file is in the public domain.
 .\"
@@ -79,7 +79,7 @@ in which case that signal is delivered to the process
 The debug registers as defined by
 .Dv "struct dbregs"
 in
-.Pa <machine/reg.h> .
+.In machine/reg.h .
 .Pa dbregs
 is currently only implemented on the i386 architecture.
 .It Pa etype
@@ -94,7 +94,7 @@ or to start another copy of the process.
 The floating point registers as defined by
 .Dv "struct fpregs"
 in
-.Pa <machine/reg.h> .
+.In machine/reg.h .
 .Pa fpregs
 is only implemented on machines which have distinct general
 purpose and floating point register sets.
@@ -114,7 +114,7 @@ Allows read and write access to the process' register set.
 This file contains a binary data structure
 .Dv "struct regs"
 defined in
-.Pa <machine/reg.h> .
+.In machine/reg.h .
 .Pa regs
 can only be written when the process is stopped.
 .It Pa rlimit
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index 642ee7165f..9035e1cb65 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)stab.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/stab.5,v 1.4.2.5 2001/12/17 11:30:15 ru Exp $
-.\" $DragonFly: src/share/man/man5/stab.5,v 1.3 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man5/stab.5,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd June 5, 1993
 .Dt STAB 5
@@ -43,7 +43,7 @@
 .In stab.h
 .Sh DESCRIPTION
 The file
-.Aq Pa stab.h
+.In stab.h
 defines some of the symbol table
 .Fa n_type
 field values for a.out files.
@@ -95,7 +95,7 @@ The low bits of the
 field are used to place a symbol into
 at most one segment, according to
 the following masks, defined in
-.Aq Pa a.out.h .
+.In a.out.h .
 A symbol can be in none of these segments by having none of these segment
 bits set.
 .Bd -literal
diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index c1080d1b6a..1cf3ed3586 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)types.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/types.5,v 1.10.2.2 2001/12/17 11:30:15 ru Exp $
-.\" $DragonFly: src/share/man/man5/Attic/types.5,v 1.6 2005/03/05 16:10:39 hmp Exp $
+.\" $DragonFly: src/share/man/man5/Attic/types.5,v 1.7 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd March 5, 2005
 .Dt TYPES 5
@@ -43,7 +43,7 @@
 .In sys/types.h
 .Sh DESCRIPTION
 The file
-.Aq Pa sys/types.h
+.In sys/types.h
 contains the defined data types used in the kernel; most are used
 through out the system.
 .Sh SEE ALSO
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index 107990e143..bfeeb5b33b 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
 .\" $FreeBSD: src/share/man/man5/utmp.5,v 1.9.2.8 2001/12/17 11:30:15 ru Exp $
-.\" $DragonFly: src/share/man/man5/utmp.5,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man5/utmp.5,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd November 14, 2001
 .Dt UTMP 5
@@ -46,7 +46,7 @@
 .In utmp.h
 .Sh DESCRIPTION
 The file
-.Aq Pa utmp.h
+.In utmp.h
 declares the structures used to record information about current
 users in the file
 .Nm ,
diff --git a/share/man/man8/sticky.8 b/share/man/man8/sticky.8
index a4b408e336..3ef7a68196 100644
--- a/share/man/man8/sticky.8
+++ b/share/man/man8/sticky.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man8/sticky.8,v 1.7.2.1 2001/08/17 13:08:50 ru Exp $
-.\" $DragonFly: src/share/man/man8/sticky.8,v 1.4 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man8/sticky.8,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
@@ -50,7 +50,7 @@ See
 .Xr chmod 2
 or
 the file
-.Pa /usr/include/sys/stat.h
+.In sys/stat.h
 for an explanation of file modes.
 .Sh STICKY DIRECTORIES
 A directory whose `sticky bit' is set
diff --git a/share/man/man9/DECLARE_MODULE.9 b/share/man/man9/DECLARE_MODULE.9
index 9bf90dc125..c748b8ed7b 100644
--- a/share/man/man9/DECLARE_MODULE.9
+++ b/share/man/man9/DECLARE_MODULE.9
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/DECLARE_MODULE.9,v 1.2.2.3 2001/12/17 11:30:18 ru Exp $
-.\" $DragonFly: src/share/man/man9/DECLARE_MODULE.9,v 1.3 2004/06/01 11:36:53 hmp Exp $
+.\" $DragonFly: src/share/man/man9/DECLARE_MODULE.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd March 3, 2001
 .Dt DECLARE_MODULE 9
@@ -77,7 +77,7 @@ Valid values for this are contained in the
 .Vt sysstem_sub_id
 enumeration
 (see
-.Pa kernel.h )
+.In sys/kernel.h )
 and specify the type of system startup interfaces.
 The
 .Xr DRIVER_MODULE 9
@@ -95,15 +95,15 @@ value is another argument for
 It represents the KLDs order of initialization within the subsystem.
 Valid values are defined in the
 .Vt sysinit_elem_order
-enumeration
-.Pa ( kernel.h ) .
+enumeration (see
+.In sys/kernel.h ) .
 .Sh SEE ALSO
 .Xr DEV_MODULE 9 ,
 .Xr DRIVER_MODULE 9 ,
 .Xr module 9 ,
 .Xr SYSCALL_MODULE 9
 .Pp
-.Pa /usr/include/sys/kernel.h ,
+.In sys/kernel.h ,
 .Pa /usr/share/examples/kld
 .Sh AUTHORS
 .An -nosplit
diff --git a/share/man/man9/SYSCALL_MODULE.9 b/share/man/man9/SYSCALL_MODULE.9
index 447fd49ef5..af9497c762 100644
--- a/share/man/man9/SYSCALL_MODULE.9
+++ b/share/man/man9/SYSCALL_MODULE.9
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/SYSCALL_MODULE.9,v 1.2.2.2 2001/12/17 11:30:18 ru Exp $
-.\" $DragonFly: src/share/man/man9/SYSCALL_MODULE.9,v 1.3 2004/06/01 11:36:53 hmp Exp $
+.\" $DragonFly: src/share/man/man9/SYSCALL_MODULE.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd April 27, 2001
 .Dt SYSCALL_MODULE 9
@@ -57,7 +57,7 @@ syscall is allocated.
 .Fa new_sysent
 specifies the function implementing the syscall and the number of
 arguments this function needs (see
-.Aq Pa sys/sysent.h ) .
+.In sys/sysent.h ) .
 .Pp
 .Fa evh
 is a pointer to the kernel module event handler function with the argument
diff --git a/share/man/man9/VOP_MMAP.9 b/share/man/man9/VOP_MMAP.9
index bffe30b0bd..c3a8d5497f 100644
--- a/share/man/man9/VOP_MMAP.9
+++ b/share/man/man9/VOP_MMAP.9
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/VOP_MMAP.9,v 1.4 1999/08/28 00:21:14 peter Exp $
-.\" $DragonFly: src/share/man/man9/VOP_MMAP.9,v 1.3 2004/06/01 11:36:53 hmp Exp $
+.\" $DragonFly: src/share/man/man9/VOP_MMAP.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd July 24, 1996
 .Os
@@ -34,8 +34,8 @@
 .Nm VOP_MMAP
 .Nd map a file into memory
 .Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/vnode.h>
+.In sys/param.h
+.In sys/vnode.h
 .Ft int
 .Fn VOP_MMAP "struct vnode *vp" "int fflags" "struct ucred *cred" "struct proc *p"
 .Sh DESCRIPTION
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 953009b73c..e38777eeac 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/devstat.9,v 1.10.2.5 2001/12/17 11:30:18 ru Exp $
-.\" $DragonFly: src/share/man/man9/devstat.9,v 1.3 2006/02/25 19:35:46 swildner Exp $
+.\" $DragonFly: src/share/man/man9/devstat.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd May 22, 1998
 .Dt DEVSTAT 9
@@ -370,7 +370,7 @@ from the CCB is ORed with 0xf to determine the tag type to pass in to
 There is a macro,
 .Dv DEVSTAT_VERSION
 that is defined in
-.Aq sys/devicestat.h .
+.In sys/devicestat.h .
 This is the current version of the
 .Nm
 subsystem, and it should be incremented each time a change is made that
diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9
index e0a58db096..b5c178b1e8 100644
--- a/share/man/man9/ieee80211.9
+++ b/share/man/man9/ieee80211.9
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/share/man/man9/ieee80211.9,v 1.2 2005/08/05 22:35:10 swildner Exp $
+.\" $DragonFly: src/share/man/man9/ieee80211.9,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: ieee80211.9,v 1.3 2004/07/07 12:59:39 ru Exp $
 .\"
 .Dd March 2, 2004
@@ -47,8 +47,8 @@
 .Nm ieee80211_media2rate
 .Nd core 802.11 network stack functions
 .Sh SYNOPSIS
-.In net80211/ieee80211_var.h
-.In net80211/ieee80211_proto.h
+.In netproto/802_11/ieee80211_var.h
+.In netproto/802_11/ieee80211_proto.h
 .Ft void
 .Fn ieee80211_ifattach "struct ifnet *ifp"
 .Ft void
diff --git a/share/man/man9/ieee80211_input.9 b/share/man/man9/ieee80211_input.9
index 83488ec8f9..9e6331af7b 100644
--- a/share/man/man9/ieee80211_input.9
+++ b/share/man/man9/ieee80211_input.9
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/share/man/man9/ieee80211_input.9,v 1.2 2005/08/05 22:35:10 swildner Exp $
+.\" $DragonFly: src/share/man/man9/ieee80211_input.9,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: ieee80211_input.9,v 1.2 2004/07/07 12:59:39 ru Exp $
 .\"
 .Dd March 2, 2004
@@ -37,8 +37,8 @@
 .Nm ieee80211_recv_mgmt
 .Nd software 802.11 stack input functions
 .Sh SYNOPSIS
-.In net80211/ieee80211_var.h
-.In net80211/ieee80211_proto.h
+.In netproto/802_11/ieee80211_var.h
+.In netproto/802_11/ieee80211_proto.h
 .Ft void
 .Fo ieee80211_input
 .Fa "struct ifnet *ifp" "struct mbuf *m" "struct ieee80211_node *ni"
diff --git a/share/man/man9/ieee80211_ioctl.9 b/share/man/man9/ieee80211_ioctl.9
index 72816ea04c..ff0be228ea 100644
--- a/share/man/man9/ieee80211_ioctl.9
+++ b/share/man/man9/ieee80211_ioctl.9
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/share/man/man9/ieee80211_ioctl.9,v 1.3 2006/04/01 10:06:39 swildner Exp $
+.\" $DragonFly: src/share/man/man9/ieee80211_ioctl.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: ieee80211_ioctl.9,v 1.2 2004/07/07 12:59:39 ru Exp $
 .\"
 .Dd March 2, 2004
@@ -37,9 +37,9 @@
 .Nm ieee80211_ioctl
 .Nd 802.11 interface ioctl commands
 .Sh SYNOPSIS
-.In net80211/ieee80211_var.h
-.In net80211/ieee80211_proto.h
-.In net80211/ieee80211_ioctl.h
+.In netproto/802_11/ieee80211_var.h
+.In netproto/802_11/ieee80211_proto.h
+.In netproto/802_11/ieee80211_ioctl.h
 .Ft int
 .Fn ieee80211_cfgget "struct ifnet *ifp" "u_long cmd" "caddr_t data"
 .Ft int
diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9
index f40701cffe..cfbd29b1b1 100644
--- a/share/man/man9/ieee80211_node.9
+++ b/share/man/man9/ieee80211_node.9
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/share/man/man9/ieee80211_node.9,v 1.1 2004/07/27 14:50:56 hmp Exp $
+.\" $DragonFly: src/share/man/man9/ieee80211_node.9,v 1.2 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: ieee80211_node.9,v 1.3 2004/07/07 12:59:39 ru Exp $
 .\"
 .Dd July 4, 2004
@@ -49,9 +49,9 @@
 .Nm ieee80211_iterate_nodes
 .Nd software 802.11 stack node management functions
 .Sh SYNOPSIS
-.In net80211/ieee80211_var.h
-.In net80211/ieee80211_proto.h
-.In net80211/ieee80211_node.h
+.In netproto/802_11/ieee80211_var.h
+.In netproto/802_11/ieee80211_proto.h
+.In netproto/802_11/ieee80211_node.h
 .Ft void
 .Fn ieee80211_node_attach "struct ifnet *ifp"
 .Ft void
diff --git a/share/man/man9/ieee80211_output.9 b/share/man/man9/ieee80211_output.9
index 0c71434be5..794afe3d92 100644
--- a/share/man/man9/ieee80211_output.9
+++ b/share/man/man9/ieee80211_output.9
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/share/man/man9/ieee80211_output.9,v 1.2 2005/08/05 22:35:10 swildner Exp $
+.\" $DragonFly: src/share/man/man9/ieee80211_output.9,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: ieee80211_output.9,v 1.2 2004/07/07 12:59:39 ru Exp $
 .\"
 .Dd March 2, 2004
@@ -38,8 +38,8 @@
 .Nm ieee80211_send_mgmt
 .Nd software 802.11 stack output functions
 .Sh SYNOPSIS
-.In net80211/ieee80211_var.h
-.In net80211/ieee80211_proto.h
+.In netproto/802_11/ieee80211_var.h
+.In netproto/802_11/ieee80211_proto.h
 .Ft struct mbuf *
 .Fo ieee80211_encap
 .Fa "struct ifnet *ifp" "struct mbuf *m" "struct ieee80211_node **pni"
diff --git a/share/man/man9/ieee80211_proto.9 b/share/man/man9/ieee80211_proto.9
index 43a6db0f78..22c2dbed32 100644
--- a/share/man/man9/ieee80211_proto.9
+++ b/share/man/man9/ieee80211_proto.9
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/share/man/man9/ieee80211_proto.9,v 1.1 2004/07/27 14:50:56 hmp Exp $
+.\" $DragonFly: src/share/man/man9/ieee80211_proto.9,v 1.2 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: ieee80211_proto.9,v 1.2 2004/07/07 12:59:39 ru Exp $
 .\"
 .Dd March 2, 2004
@@ -40,8 +40,8 @@
 .Nm ieee80211_proto
 .Nd software 802.11 stack protocol helper functions
 .Sh SYNOPSIS
-.In net80211/ieee80211_var.h
-.In net80211/ieee80211_proto.h
+.In netproto/802_11/ieee80211_var.h
+.In netproto/802_11/ieee80211_proto.h
 .Ft void
 .Fn ieee80211_proto_attach "struct ifnet *ifp"
 .Ft void
diff --git a/share/man/man9/ieee80211_radiotap.9 b/share/man/man9/ieee80211_radiotap.9
index 2851ff1798..6c78e60110 100644
--- a/share/man/man9/ieee80211_radiotap.9
+++ b/share/man/man9/ieee80211_radiotap.9
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/share/man/man9/ieee80211_radiotap.9,v 1.2 2004/12/26 12:37:08 swildner Exp $
+.\" $DragonFly: src/share/man/man9/ieee80211_radiotap.9,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: ieee80211_radiotap.9,v 1.3 2004/07/07 12:59:39 ru Exp $
 .\"
 .Dd March 2, 2004
@@ -36,9 +36,9 @@
 .Nm ieee80211_radiotap
 .Nd software 802.11 stack packet capture definitions
 .Sh SYNOPSIS
-.In net80211/ieee80211_var.h
-.In net80211/ieee80211_ioctl.h
-.In net80211/ieee80211_radiotap.h
+.In netproto/802_11/ieee80211_var.h
+.In netproto/802_11/ieee80211_ioctl.h
+.In netproto/802_11/ieee80211_radiotap.h
 .In net/bpf.h
 .\"
 .Sh DESCRIPTION
@@ -136,7 +136,7 @@ or received.
 The second value is a bitmap containing flags which specify properties of
 the channel in use.
 These are documented within the header file,
-.Pa net80211/ieee80211_radiotap.h .
+.In netproto/802_11/ieee80211_radiotap.h .
 .It Dv IEEE80211_RADIOTAP_FHSS
 This field contains two 8-bit values.
 This field should be present for frequency-hopping radios only.
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 4d62878145..beb1c68e7f 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.9.2.10 2003/06/15 02:22:30 hmp Exp $
-.\" $DragonFly: src/share/man/man9/ifnet.9,v 1.5 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man9/ifnet.9,v 1.6 2006/05/26 19:39:40 swildner Exp $
 .Dd January 15, 1997
 .Os
 .Dt IFNET 9
@@ -130,14 +130,14 @@ in the
 and
 .Vt ifmultiaddr
 structures in
-.Aq Pa net/if.h
+.In net/if.h
 and
-.Aq Pa net/if_var.h
+.In net/if_var.h
 and the functions named above and defined in
 .Pa /sys/net/if.c .
 Those interfaces which are intended to be used by user programs
 are defined in
-.Aq Pa net/if.h ;
+.In net/if.h ;
 these include the interface flags, the
 .Vt if_data
 structure, and the structures defining the appearance of
@@ -146,18 +146,18 @@ interface-related messages on the
 routing socket and in
 .Xr sysctl 3 .
 The header file
-.Aq Pa net/if_var.h
+.In net/if_var.h
 defines the kernel-internal interfaces, including the
 .Vt ifnet , ifaddr ,
 and
 .Vt ifmultiaddr
 structures and the functions which manipulate them.
 (A few user programs will need
-.Aq Pa net/if_var.h
+.In net/if_var.h
 because it is the prerequisite of some other header file like
-.Aq Pa netinet/if_ether.h .
+.In netinet/if_ether.h .
 Most references to those two files in particular can be replaced by
-.Aq Pa net/ethernet.h . )
+.In net/ethernet.h . )
 .Pp
 The system keeps a linked list of interfaces using the
 .Li TAILQ
@@ -350,7 +350,7 @@ Process interface-related
 .Xr ioctl 2
 requests
 (defined in
-.Aq Pa sys/sockio.h ) .
+.In sys/sockio.h ) .
 Preliminary processing is done by the generic routine
 .Fn ifioctl
 to check for appropriate privileges, locate the interface being
@@ -476,7 +476,7 @@ significantly over the course of normal operation:
 .It Va ifi_type
 .Pq Vt u_char
 The type of the interface, as defined in
-.Aq Pa net/if_types.h
+.In net/if_types.h
 and described below in the
 .Sx "Interface Types"
 section.
@@ -583,7 +583,7 @@ for
 .El
 .Ss Interface Types
 The header file
-.Aq Pa net/if_types.h
+.In net/if_types.h
 defines symbolic constants for a number of different types of
 interfaces.
 The most common are:
diff --git a/share/man/man9/ktr.9 b/share/man/man9/ktr.9
index 9496164ff6..eda5d6bad5 100644
--- a/share/man/man9/ktr.9
+++ b/share/man/man9/ktr.9
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/ktr.9,v 1.8 2005/03/08 01:37:36 hmp Exp $
-.\" $DragonFly: src/share/man/man9/ktr.9,v 1.7 2005/08/05 22:35:10 swildner Exp $
+.\" $DragonFly: src/share/man/man9/ktr.9,v 1.8 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd February 15, 2001
 .Dt KTR 9
@@ -77,7 +77,7 @@ macros.
 The first parameter is a mask of event types
 .Pq Dv KTR_*
 defined in
-.Aq Pa sys/ktr.h .
+.In sys/ktr.h .
 The event will be logged only if any of the event types specified in
 .Fa mask
 are enabled in the global event mask stored in
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index e67014fe3a..4a4d3e60cd 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.2.2.3 2001/12/17 11:30:18 ru Exp $
-.\" $DragonFly: src/share/man/man9/make_dev.9,v 1.2 2003/06/17 04:37:01 dillon Exp $
+.\" $DragonFly: src/share/man/man9/make_dev.9,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd September 25, 1999
 .Os
@@ -54,7 +54,7 @@ and with the name as specified in
 The permissions of the file specified in
 .Va perms
 are defined in
-.Aq Pa sys/stat.h :
+.In sys/stat.h :
 .Pp
 .Bd -literal -offset indent -compact
 #define S_IRWXU 0000700    /* RWX mask for owner */
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index f616385bd4..c33d5de984 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.27.2.1 2003/05/28 13:53:18 yar Exp $
-.\" $DragonFly: src/share/man/man9/mbuf.9,v 1.3 2004/12/18 21:55:21 liamfoy Exp $
+.\" $DragonFly: src/share/man/man9/mbuf.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd October 17, 2000
 .Dt MBUF 9
@@ -119,7 +119,7 @@ buffer for data.
 The mbuf's total size,
 .Dv MSIZE ,
 is a machine-dependent constant defined in
-.Pa machine/param.h .
+.In machine/param.h .
 The mbuf header includes:
 .Pp
 .Bl -tag -width "m_nextpkt" -compact -offset indent
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index 833070ba56..ba39c639b5 100644
--- a/share/man/man9/mi_switch.9
+++ b/share/man/man9/mi_switch.9
@@ -35,7 +35,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/mi_switch.9,v 1.7.2.4 2001/12/17 11:30:18 ru Exp $
-.\" $DragonFly: src/share/man/man9/Attic/mi_switch.9,v 1.5 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man9/Attic/mi_switch.9,v 1.6 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd November 24, 1996
 .Dt MI_SWITCH 9
@@ -112,8 +112,8 @@ priority queue data-structure.
 The priority queue consists of an array
 .Va qs[NQS]
 of queue header structures each of which identifies a list of runnable
-processes of equal priority
-.Pq see Fa <sys/proc.h> .
+processes of equal priority (see
+.In sys/proc.h ) .
 A single word
 .Va whichqs
 containing a bit mask identifying non-empty queues assists in selecting
diff --git a/share/man/man9/nlookup.9 b/share/man/man9/nlookup.9
index 1408dbefaa..fbdddc99ab 100644
--- a/share/man/man9/nlookup.9
+++ b/share/man/man9/nlookup.9
@@ -28,7 +28,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $DragonFly: src/share/man/man9/nlookup.9,v 1.6 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man9/nlookup.9,v 1.7 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd August 6, 2005
 .Os
@@ -178,7 +178,7 @@ in the nlc.
 .Pp
 .Fn naccess
 generally checks the V* access bits from
-.Pa sys/vnode.h .
+.In sys/vnode.h .
 All specified bits must pass for this function to return 0.
 If
 .Dv VCREATE
diff --git a/share/man/man9/pfil.9 b/share/man/man9/pfil.9
index f76a551ace..79fde234c6 100644
--- a/share/man/man9/pfil.9
+++ b/share/man/man9/pfil.9
@@ -1,5 +1,5 @@
 .\"	$NetBSD: pfil.9,v 1.24 2004/01/01 15:24:35 wiz Exp $
-.\" $DragonFly: src/share/man/man9/pfil.9,v 1.1 2005/12/21 19:50:54 swildner Exp $
+.\" $DragonFly: src/share/man/man9/pfil.9,v 1.2 2006/05/26 19:39:40 swildner Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
@@ -149,7 +149,7 @@ interface first appeared in
 The
 .Nm
 input and output lists were originally implemented as
-.Aq Pa sys/queue.h
+.In sys/queue.h
 .Dv LIST
 structures;
 however this was changed in
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index 9cf6832a57..d7d38ddefe 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/posix4.9,v 1.5.2.5 2001/08/17 13:08:54 ru Exp $
-.\" $DragonFly: src/share/man/man9/posix4.9,v 1.3 2004/03/11 12:28:57 hmp Exp $
+.\" $DragonFly: src/share/man/man9/posix4.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .Dd March 1, 1998
 .Dt POSIX.1B 9
 .Os
@@ -67,9 +67,12 @@ in the name space, i.e., if _POSIX_VERSION is 199309L (POSIX.1B) but
 _POSIX_C_SOURCE is 199009L (POSIX.1) then only POSIX.1 features should
 appear.
 .Sh PROPERLY HIDING EXTENSIONS
-The following test macros are set up in <sys/_posix.h>.  They should
+The following test macros are set up in
+.In sys/_posix.h .
+They should
 used by system header files to avoid the kind of tests you see in
-<sys/_posix.h>.  Source programs should not use these
+.In sys/_posix.h .
+Source programs should not use these
 .Dx
 specific
 implementation details and should test _POSIX_VERSION, _POSIX_SOURCE
@@ -83,7 +86,8 @@ the P1003_1B option.
 _P1003_1B_VISIBLE
 .Ed
 is a test macro that sorts out when extensions should be
-visible.  It is defined in <sys/_posix.h>.
+visible.  It is defined in
+.In sys/_posix.h .
 .Pp
 In normal C program development
 only _POSIX_VERSION is set, permitting
@@ -93,7 +97,9 @@ appear to the programs.  However, when adding new functionality mandated
 by POSIX.1B, it
 is important to satisfy the requirements added by the
 new _POSIX_C_SOURCE macro.  _P1003_1B_VISIBLE (not a standard feature test macro)
-is defined in sys/unistd.h when the combination of _POSIX_VERSION,
+is defined in
+.In sys/unistd.h
+when the combination of _POSIX_VERSION,
 _POSIX_SOURCE, and _POSIX_C_SOURCE indicate that the extensions are in scope.
 .Bd -literal -offset 0i
 _P1003_1B_VISIBLE_HISTORICALLY
@@ -114,7 +120,9 @@ be dependent on _P1003_1B_VISIBLE instead of _HISTORICALLY.
 Traditional
 .Bx
 headers (e.g., mmap.h) now specified
-in POSIX.1B can include <sys/_posix.h> and conditionalize
+in POSIX.1B can include
+.In sys/_posix.h
+and conditionalize
 .Bx
 extensions on _P1003_1B_VISIBLE_HISTORICALLY.
 .Sh NON STANDARD TEST MACROS
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index 927336ffcf..e361e7da26 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/rtentry.9,v 1.11.2.6 2002/03/17 09:12:50 schweikh Exp $
-.\" $DragonFly: src/share/man/man9/rtentry.9,v 1.3 2006/02/17 19:37:10 swildner Exp $
+.\" $DragonFly: src/share/man/man9/rtentry.9,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .Dd October 8, 1996
 .Os
 .Dt RTENTRY 9
@@ -46,7 +46,7 @@ of a socket in the
 .Xr route 4
 pseudo-protocol family.
 The
-.Aq Pa net/route.h
+.In net/route.h
 header file defines the structures and manifest constants used in this
 facility.
 .Pp
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index a6da88d305..aa32d24e4d 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/sbuf.9,v 1.12.2.4 2002/09/23 04:51:53 kbyanc Exp $
-.\" $DragonFly: src/share/man/man9/sbuf.9,v 1.2 2003/06/17 04:37:01 dillon Exp $
+.\" $DragonFly: src/share/man/man9/sbuf.9,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd January 28, 2001
 .Dt SBUF 9
@@ -97,7 +97,7 @@ Instead of arrays of characters, these functions operate on structures
 called
 .Fa sbufs ,
 defined in
-.Aq Pa sys/sbuf.h .
+.In sys/sbuf.h .
 .Pp
 The
 .Fn sbuf_new
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index aa0741368f..e6e7ed1028 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -44,7 +44,7 @@ is silent on an issue.
  *
  *	@(#)style	1.14 (Berkeley) 4/28/95
  * $FreeBSD: src/share/man/man9/style.9,v 1.32.2.19 2002/04/14 19:28:03 asmodai Exp $
- * $DragonFly: src/share/man/man9/style.9,v 1.17 2005/01/28 09:46:31 okumoto Exp $
+ * $DragonFly: src/share/man/man9/style.9,v 1.18 2006/05/26 19:39:40 swildner Exp $
  */
 
 /*
@@ -83,13 +83,13 @@ Leave another blank line before the header files.
 Kernel include files (i.e.\&
 .Pa sys/*.h )
 come first; normally, include
-.Aq Pa sys/types.h
+.In sys/types.h
 OR
-.Aq Pa sys/param.h ,
+.In sys/param.h ,
 but not both.
-.Aq Pa sys/types.h
+.In sys/types.h
 includes
-.Aq Pa sys/cdefs.h ,
+.In sys/cdefs.h ,
 and it is okay to depend on that.
 .Bd -literal
 #include <sys/types.h>	/* Non-local includes in angle brackets. */
@@ -117,7 +117,7 @@ which should be sorted alphabetically by name.
 .Ed
 .Pp
 Global pathnames are defined in
-.Aq Pa paths.h .
+.In paths.h .
 Pathnames local
 to the program go in
 .Qq Pa pathnames.h
@@ -271,7 +271,7 @@ Do not use the
 keyword and the
 .Dv __P
 macro from the include file
-.Aq Pa sys/cdefs.h .
+.In sys/cdefs.h .
 Code in the
 .Dx
 source tree is not expected to be K&R compliant.
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index 4ecd097252..46e3cc3c0d 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/sysctl_add_oid.9,v 1.3.2.10 2001/12/17 11:30:19 ru Exp $
-.\" $DragonFly: src/share/man/man9/sysctl_add_oid.9,v 1.2 2003/06/17 04:37:01 dillon Exp $
+.\" $DragonFly: src/share/man/man9/sysctl_add_oid.9,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd July 15, 2000
 .Dt SYSCTL_ADD_OID 9
@@ -183,7 +183,7 @@ for creating and deleting sysctl oids at runtime
 (e.g. during lifetime of a module).
 The alternative method,
 based on linker sets (see
-.Aq sys/linker_set.h
+.In sys/linker_set.h
 and
 .\" XXX Manual pages should avoid referencing source files
 .Pa src/sys/kern/kern_sysctl.c
@@ -272,7 +272,7 @@ The newly created oid will contain a copy of the name.
 .It Fa kind
 The kind of oid,
 specified as a bitmask of the type and access values defined in the
-.Aq sys/sysctl.h
+.In sys/sysctl.h
 header file.
 Oids created dynamically always have the
 .Dv CTLTYPE_DYN
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 1391c53eec..c452bd9ce7 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/usr.bin/file/file.1,v 1.16.2.10 2003/03/16 04:47:04 obrien Exp $
-.\" $DragonFly: src/usr.bin/file/Attic/file.1,v 1.3 2006/02/17 19:39:04 swildner Exp $
+.\" $DragonFly: src/usr.bin/file/Attic/file.1,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\" $Id: file.man,v 1.44 2003/02/27 20:47:46 christos Exp $
 .Dd February 27, 2003
 .Dt FILE 1 "Copyright but distributable"
@@ -75,17 +75,16 @@ Any known file types appropriate to the system you are running on
 implement them)
 are intuited if they are defined in
 the system header file
-.Aq Pa sys/stat.h .
+.In sys/stat.h .
 .Pp
 The magic number tests are used to check for files with data in
 particular fixed formats.
 The canonical example of this is a binary executable (compiled program)
 .Pa a.out
 file, whose format is defined in
-.Aq Pa a.out.h
+.In a.out.h
 and possibly
-.Aq Pa exec.h
-in the standard include directory.
+.In machine/exec.h .
 These files have a
 .Sq "magic number"
 stored in a particular place
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index d096e43ef7..d500807b2a 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.bin/getconf/getconf.1,v 1.9.2.2 2003/02/25 20:31:18 trhodes Exp $
-.\" $DragonFly: src/usr.bin/getconf/getconf.1,v 1.4 2006/02/17 19:39:05 swildner Exp $
+.\" $DragonFly: src/usr.bin/getconf/getconf.1,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd September 18, 2002
 .Dt GETCONF 1
@@ -66,7 +66,7 @@ and
 .Xr sysconf 3 ,
 depending on the type of variable.
 As an extension, the second form can also be used to query static limits from
-.Aq Pa limits.h .
+.In limits.h .
 .Pp
 All
 .Xr sysconf 3
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index 34508f09cf..457b7ce516 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.9.2.3 2002/10/11 14:25:39 sobomax Exp $
-.\" $DragonFly: src/usr.sbin/edquota/edquota.8,v 1.3 2006/02/17 19:40:14 swildner Exp $
+.\" $DragonFly: src/usr.sbin/edquota/edquota.8,v 1.4 2006/05/26 19:39:40 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
@@ -198,7 +198,7 @@ for a grace period that may be specified per filesystem.
 Once the grace period has expired,
 the soft limit is enforced as a hard limit.
 The default grace period for a filesystem is specified in
-.Pa /usr/include/ufs/ufs/quota.h .
+.In vfs/ufs/quota.h .
 The
 .Fl t
 flag can be used to change the grace period.
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 528633e089..89936afe56 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -25,7 +25,7 @@
 .\"	$Id: isdnd.8,v 1.29 2000/05/02 11:50:28 hm Exp $
 .\"
 .\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.9.2.7 2003/03/11 21:13:49 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.4 2006/03/26 22:56:58 swildner Exp $
+.\" $DragonFly: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.5 2006/05/26 19:39:40 swildner Exp $
 .\"
 .\"	last edit-date: [Wed May  2 10:48:30 2001]
 .\"
@@ -179,7 +179,8 @@ This option may be used to specify the logging facility in case
 logging is configured and another facility than the default LOCAL0
 facility shall be used.
 The facility is to be specified as an integer in
-the range 0-11 or 16-23 (see the file /usr/include/syslog.h).
+the range 0-11 or 16-23 (see the file
+.In syslog.h ) .
 .It Fl t
 In conjunction with the
 .Fl f
@@ -224,7 +225,7 @@ from device
 .Pp
 The messages and message parameters are documented in the include
 file
-.Em /usr/include/machine/i4b_ioctl.h .
+.In i4b_machine/i4b_ioctl.h .
 .Pp
 Supported command and response messages (ioctls) to the kernel are:
 .Bl -tag -width Ds -compact -offset indent
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index bb5b7d6a70..57c5e478d8 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -25,7 +25,7 @@
 .\"	$Id: i4b.4,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
 .\" $FreeBSD: src/usr.sbin/i4b/man/i4b.4,v 1.7.2.4 2001/08/01 17:45:09 obrien Exp $
-.\" $DragonFly: src/usr.sbin/i4b/man/i4b.4,v 1.2 2003/06/17 04:29:55 dillon Exp $
+.\" $DragonFly: src/usr.sbin/i4b/man/i4b.4,v 1.3 2006/05/26 19:39:40 swildner Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:09:12 1999]
 .\"
@@ -50,7 +50,7 @@ control and status informations.
 .Pp
 The messages and message parameters are documented in the include
 file
-.Em /usr/include/machine/i4b_ioctl.h .
+.In i4b_machine/i4b_ioctl.h .
 .Pp
 The available ioctl's are:
 .Pp
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index 951b36875d..d9cf52a8f2 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -25,7 +25,7 @@
 .\"	$Id: i4btel.4,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
 .\" $FreeBSD: src/usr.sbin/i4b/man/i4btel.4,v 1.8.2.6 2003/03/13 03:10:59 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/i4b/man/i4btel.4,v 1.5 2006/03/26 22:56:58 swildner Exp $
+.\" $DragonFly: src/usr.sbin/i4b/man/i4btel.4,v 1.6 2006/05/26 19:39:40 swildner Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:13:39 1999]
 .\"
@@ -55,7 +55,7 @@ Functionality zero is the usual telephony data stream i/o driver.
 Functionality one is used to enable commands to dial out and hang up and
 receive responses about the state of the dial out progress and status.
 This commands may change in the future, for details see the file
-.Em i4b_tel_ioctl.h
+.In i4b_machine/i4b_tel_ioctl.h
 and the
 .Xr isdnphone 8
 utility.
diff --git a/usr.sbin/pflogd/pflogd.8 b/usr.sbin/pflogd/pflogd.8
index 96af59eff6..5835791b2b 100644
--- a/usr.sbin/pflogd/pflogd.8
+++ b/usr.sbin/pflogd/pflogd.8
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: pflogd.8,v 1.24 2004/01/16 10:45:49 jmc Exp $
-.\"	$DragonFly: src/usr.sbin/pflogd/pflogd.8,v 1.2 2005/08/05 15:35:53 swildner Exp $
+.\"	$DragonFly: src/usr.sbin/pflogd/pflogd.8,v 1.3 2006/05/26 19:39:41 swildner Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
 .\"
@@ -144,7 +144,7 @@ operation of
 .Pp
 Tcpdump has been extended to be able to filter on the pfloghdr
 structure defined in
-.Aq Ar net/if_pflog.h .
+.In net/pf/if_pflog.h .
 Tcpdump can restrict the output
 to packets logged on a specified interface, a rule number, a reason,
 a direction, an IP family or an action.
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index b9d4678780..8e4e990c0e 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.51 2004/07/02 23:12:57 ru Exp $
-.\" $DragonFly: src/usr.sbin/syslogd/syslogd.8,v 1.4 2004/12/26 12:37:08 swildner Exp $
+.\" $DragonFly: src/usr.sbin/syslogd/syslogd.8,v 1.5 2006/05/26 19:39:41 swildner Exp $
 .\"
 .Dd November 24, 2001
 .Dt SYSLOGD 8
@@ -276,7 +276,7 @@ decimal number in angle braces, for example,
 .Sq Aq 5 .
 This priority code should map into the priorities defined in the
 include file
-.Aq Pa sys/syslog.h .
+.In sys/syslog.h .
 .Pp
 For security reasons,
 .Nm
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index a465ddcdfb..1f58b3eebe 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22.2.8 2002/12/29 16:35:44 schweikh Exp $
-.\" $DragonFly: src/usr.sbin/ypserv/ypserv.8,v 1.5 2006/03/26 22:56:58 swildner Exp $
+.\" $DragonFly: src/usr.sbin/ypserv/ypserv.8,v 1.6 2006/05/26 19:39:41 swildner Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -281,7 +281,7 @@ package is not distributed with
 However, if you have
 .Pa libwrap.a
 and
-.Pa tcpd.h ,
+.In tcpd.h ,
 you can easily recompile
 .Nm
 with them.