mdoc(7): Use the new feature of the .In macro.

54 files changed, 105 insertions, 107 deletions

diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index 2c5c22e..35e20b5 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -65,7 +65,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/pthread_once.3 b/share/man/man3/pthread_once.3
index aed9698..902f497 100644
--- a/share/man/man3/pthread_once.3
+++ b/share/man/man3/pthread_once.3
@@ -83,7 +83,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/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index a91566a..8dcd180 100644
--- a/share/man/man3/stdarg.3
+++ b/share/man/man3/stdarg.3
@@ -56,7 +56,7 @@
 A function may be called with a varying number of arguments of varying
 types.
 The include file
-.Aq Pa stdarg.h
+.In stdarg.h
 declares a type
 .Pq Em va_list
 and defines three macros for stepping
@@ -211,7 +211,7 @@ These macros are
 compatible with the historic macros they replace.
 A backward compatible version can be found in the include
 file
-.Aq Pa varargs.h .
+.In varargs.h .
 .Sh BUGS
 Unlike the
 .Em varargs
diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3
index 6d5de8b..7b6293f 100644
--- a/share/man/man3/timeradd.3
+++ b/share/man/man3/timeradd.3
@@ -58,7 +58,7 @@ and
 .Xr settimeofday 2
 calls.
 The structure is defined in
-.Aq Pa sys/time.h
+.In sys/time.h
 as:
 .Bd -literal
 struct timeval {
diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4
index cfdf908..a0f1ef8 100644
--- a/share/man/man4/agp.4
+++ b/share/man/man4/agp.4
@@ -64,7 +64,7 @@ The following
 operations can be performed on
 .Pa /dev/agpgart ,
 which are defined in
-.Aq Pa sys/agpio.h :
+.In sys/agpio.h :
 .Bl -tag -width indent
 .It Dv AGPIOC_INFO
 Returns state of the
@@ -104,7 +104,7 @@ typedef struct _agp_setup {
 .Ed
 .Pp
 The mode bits are defined in
-.Aq Pa sys/agpio.h .
+.In sys/agpio.h .
 .It Dv AGPIOC_ALLOCATE
 Allocate physical memory suitable for mapping into the AGP aperture.
 This
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 0dfc8c3..1d11710 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/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
@@ -154,7 +154,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.
@@ -275,7 +275,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
@@ -359,7 +359,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
@@ -422,7 +422,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/cd.4 b/share/man/man4/cd.4
index 7c491f5..87f78ab 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -99,9 +99,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 9bad5b2..48dbbf6 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -97,7 +97,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 c35b59f..b768589 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -165,7 +165,7 @@ 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/fdc.4 b/share/man/man4/fdc.4
index 1fe6c4b..2293cf1 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -178,7 +178,7 @@ driver offers a number of configurable options using
 .Xr ioctl 2 .
 In order to access any of this functionality, programmers need to
 include the header file
-.Aq Pa sys/fdcio.h
+.In sys/fdcio.h
 into their programs.
 The call to
 .Xr open 2
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index f4a106c..6c0a027 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -78,7 +78,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 .
 The index of the last row in the table is given by
 .Dq Li net.link.generic.system.ifcount
 (or, using the manifest constants,
@@ -132,7 +132,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
@@ -143,7 +143,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
@@ -161,7 +161,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.
@@ -170,7 +170,7 @@ For
 .Dv IFT_SLIP ,
 the structure is a
 .Dq Li struct sl_softc
-.Pq Aq Pa net/if_slvar.h .
+.Pq In net/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 3296a39..9dfbed3 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -63,7 +63,7 @@ network standard format (on the
 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 0fc15a4..18d7451 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -68,7 +68,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/ktr.4 b/share/man/man4/ktr.4
index fd21d5e..3b381e9 100644
--- a/share/man/man4/ktr.4
+++ b/share/man/man4/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/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index d4f15f9..2791382 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -59,7 +59,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
@@ -87,7 +87,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
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 4387a7d..61540fe 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -78,7 +78,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 46022a6..504e8cd 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -80,7 +80,7 @@ A number of
 operations are available
 on raw magnetic tape.
 The following definitions are from
-.Aq Pa sys/mtio.h :
+.In sys/mtio.h :
 .Bd  -literal
 #ifndef	_SYS_MTIO_H_
 #define	_SYS_MTIO_H_
diff --git a/share/man/man4/ng_source.4 b/share/man/man4/ng_source.4
index d56b684..bdae89b 100644
--- a/share/man/man4/ng_source.4
+++ b/share/man/man4/ng_source.4
@@ -322,7 +322,7 @@ starving the NIC.
 For clarity and simplicity, debugging messages and instrumentation code
 has been removed.
 On i386 one can include
-.Aq Pa machine/cpufunc.h
+.In machine/cpufunc.h
 to have access to the
 .Fn rdtsc
 function to read the instruction counter at the
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 86e463e..34759c0 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -68,7 +68,7 @@ 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 b6e167c..3dd4fb8 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -85,7 +85,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/pt.4 b/share/man/man4/pt.4
index 112b561..1589f58 100644
--- a/share/man/man4/pt.4
+++ b/share/man/man4/pt.4
@@ -63,7 +63,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/ses.4 b/share/man/man4/ses.4
index 816c6ad..4070c89 100644
--- a/share/man/man4/ses.4
+++ b/share/man/man4/ses.4
@@ -77,7 +77,7 @@ calls apply to
 .Nm
 devices.
 They are defined in the header file
-.Aq Pa cam/scsi/scsi_ses.h
+.In cam/scsi/scsi_ses.h
 (\fIq.v.\fR).
 .Pp
 .Bl -tag -width SESIOC_GETENCSTAT
@@ -108,7 +108,7 @@ Initialize the enclosure.
 .El
 .Sh EXAMPLE USAGE
 The files contained in
-.Aq Pa usr/share/examples/ses
+.In usr/share/examples/ses
 show simple mechanisms for how to use these interfaces, as well as a
 very stupid simple monitoring daemon.
 .Sh FILES
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index fc818ef..c05bff6 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -123,7 +123,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 5e8a727..f3618c0 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -72,7 +72,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 cam/scsi/scsi_targetio.h .
 .Bl -tag -width ".Dv TARGIOCDISABLE"
 .It Dv TARGIOCENABLE
 .Pq Vt "struct ioc_enable_lun"
@@ -114,7 +114,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 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 d03c843..fc1a7bb 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -186,7 +186,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 440b66a..5c9de56 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -823,7 +823,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:
@@ -1494,7 +1494,7 @@ 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 ttydefaults.h .
 .Pp
 .Bl -column "Index Name" "Special Character" -offset indent -compact
 .It Em "Index Name	Special Character	Default Value"
@@ -1543,4 +1543,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/ti.4 b/share/man/man4/ti.4
index 239f722..8fab9b6 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -203,7 +203,7 @@ the user can
 debug firmware running on the Tigon board.
 .Pp
 These ioctls and their arguments are defined in the
-.Aq Pa sys/tiio.h
+.In sys/tiio.h
 header file.
 .Bl -tag -width ".Dv ALT_WRITE_TG_MEM"
 .It Dv TIIOCGETSTATS
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index 43dc28a..a7029a4 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -168,7 +168,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
@@ -313,7 +313,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
@@ -336,7 +336,7 @@ 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 fdf5096..dfdad16 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -155,7 +155,7 @@ The following
 .Xr ioctl 2
 calls are supported
 (defined in
-.Aq Pa net/if_tun.h ) :
+.In net/if_tun.h ) :
 .Bl -tag -width ".Dv TUNSIFMODE"
 .It Dv TUNSDEBUG
 The argument should be a pointer to an
@@ -175,7 +175,7 @@ device.
 The
 .Vt struct tuninfo
 is declared in
-.Aq Pa net/if_tun.h .
+.In net/if_tun.h .
 .Pp
 The use of this ioctl is restricted to the super-user.
 .It Dv TUNGIFINFO
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index a2e9356..8b84a7d 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -62,7 +62,7 @@ file system pathnames for addressing.
 addresses are variable-length file system 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 {
@@ -125,7 +125,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
@@ -160,7 +160,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 57b2b77..337a8b4 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -154,8 +154,6 @@ Use the following to get access to the
 .Tn USB
 specific structures and defines.
 .Pp
-.In dev/usb/usb.h
-.Pp
 The
 .Pa /dev/usb Ns Ar N
 can be opened and a few operations can be performed on it.
@@ -281,7 +279,7 @@ can destroy the bus integrity.
 .El
 .Pp
 The include file
-.Aq Pa dev/usb/usb.h
+.In dev/usb/usb.h
 contains definitions for the types used by the various
 .Xr ioctl 2
 calls.
@@ -298,7 +296,7 @@ and
 macros to handle byte order and alignment properly.
 .Pp
 The include file
-.Aq Pa dev/usb/usbhid.h
+.In dev/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 c6b4784..ad87477 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -45,7 +45,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
@@ -405,7 +405,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
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 27df5dd..437d676 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -96,14 +96,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.
@@ -123,7 +123,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/elf.5 b/share/man/man5/elf.5
index 0dd4969..2be201f 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -34,7 +34,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
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index fac8515..48b4c1b 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -49,9 +49,9 @@
 .In ufs/ufs/inode.h
 .Sh DESCRIPTION
 The files
-.Aq Pa fs.h
+.In fs.h
 and
-.Aq Pa inode.h
+.In 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).
@@ -74,7 +74,7 @@ that is of size
 .Dv SBLOCKSIZE .
 The following structure describes the super-block and is
 from the file
-.Aq Pa ufs/ffs/fs.h :
+.In ufs/ffs/fs.h :
 .Bd -literal
 /*
  * Super block for an FFS filesystem.
@@ -377,7 +377,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 ufs/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 0f22a18..7dc1fc64 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -107,7 +107,7 @@ file.
 .\" 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 167163e..bbf019a 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -40,7 +40,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/stab.5 b/share/man/man5/stab.5
index b2d670eb..14eeef5 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -42,7 +42,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.
@@ -94,7 +94,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/style.Makefile.5 b/share/man/man5/style.Makefile.5
index d48bcad..ce91319 100644
--- a/share/man/man5/style.Makefile.5
+++ b/share/man/man5/style.Makefile.5
@@ -99,14 +99,14 @@ order is:
 Omit
 .Va SRCS
 when using
-.Aq Pa bsd.prog.mk
+.In bsd.prog.mk
 and there is a single source file named the same as the
 .Va PROG .
 .It
 Omit
 .Va MAN
 when using
-.Aq Pa bsd.prog.mk
+.In bsd.prog.mk
 and the manual page is named the same as the
 .Va PROG ,
 and is in section 1.
@@ -196,7 +196,7 @@ An
 space is allowed for variable names that extend beyond column 9.
 A lack of whitespace is also allowed for very long variable names.
 .It
-.Ic .include Aq Pa bsd.*.mk
+.Ic .include In bsd.*.mk
 goes last.
 .It
 Do not use anachronisms like
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index 543c135..c342041 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -45,7 +45,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/man7/stdint.7 b/share/man/man7/stdint.7
index d05090a..2f36953 100644
--- a/share/man/man7/stdint.7
+++ b/share/man/man7/stdint.7
@@ -34,7 +34,7 @@
 .In stdint.h
 .Sh DESCRIPTION
 The
-.Aq Pa stdint.h
+.In stdint.h
 header provides source-portable integer types of a specific
 size, smallest memory footprint with a minimum size, fastest
 access speed with a minimum size, largest integer size, and
@@ -120,17 +120,17 @@ that can later be converted back to a pointer to
 .Vt void .
 .Pp
 Additionally, the
-.Aq Pa stdint.h
+.In stdint.h
 header defines some macros, but none of them are documented here.
 .Sh STANDARDS
 The
-.Aq Pa stdint.h
+.In stdint.h
 header conforms to
 .St -isoC-99
 and
 .St -p1003.1-2001 .
 .Sh HISTORY
 The
-.Aq Pa stdint.h
+.In stdint.h
 header was first introduced in
 .Fx 5.0 .
diff --git a/share/man/man9/BUS_SETUP_INTR.9 b/share/man/man9/BUS_SETUP_INTR.9
index 2b39ade..36cf9bb 100644
--- a/share/man/man9/BUS_SETUP_INTR.9
+++ b/share/man/man9/BUS_SETUP_INTR.9
@@ -54,7 +54,7 @@ method.
 The
 .Fa flags
 are found in
-.Aq Pa sys/bus.h ,
+.In sys/bus.h ,
 and give the broad category of interrupt.
 The
 .Fa flags
diff --git a/share/man/man9/SYSCALL_MODULE.9 b/share/man/man9/SYSCALL_MODULE.9
index b5c87a0..434ea47 100644
--- a/share/man/man9/SYSCALL_MODULE.9
+++ b/share/man/man9/SYSCALL_MODULE.9
@@ -60,7 +60,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/ifnet.9 b/share/man/man9/ifnet.9
index e05ead4..e68e99a 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -129,14 +129,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
@@ -145,18 +145,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
@@ -352,7 +352,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
@@ -496,7 +496,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.
@@ -603,7 +603,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/ithread.9 b/share/man/man9/ithread.9
index 01c5d81..3388453 100644
--- a/share/man/man9/ithread.9
+++ b/share/man/man9/ithread.9
@@ -142,7 +142,7 @@ priority of the backing kernel thread.
 The
 .Fa flags
 argument can be used to specify properties of this handler as defined in
-.Aq Pa sys/bus.h .
+.In sys/bus.h .
 If
 .Fa cookiep
 is not
diff --git a/share/man/man9/ktr.9 b/share/man/man9/ktr.9
index ecbd350..c7f8a68 100644
--- a/share/man/man9/ktr.9
+++ b/share/man/man9/ktr.9
@@ -67,7 +67,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/lock.9 b/share/man/man9/lock.9
index ebaa5dc..d02a7e2 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -151,7 +151,7 @@ Wait for all activity on the lock to end, then mark it decommissioned.
 This is used before freeing a lock that is part of a piece of memory that is
 about to be freed.
 (As documented in
-.Aq Pa sys/lockmgr.h . )
+.In sys/lockmgr.h . )
 .It Dv LK_SLEEPFAIL
 Fail if operation has slept.
 .It Dv LK_NOWAIT
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index d819fcd..94edfdf 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -61,7 +61,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/malloc.9 b/share/man/man9/malloc.9
index 0cb271a..fea6396d 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -226,11 +226,11 @@ MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT);
 In order to use
 .Fn MALLOC_DEFINE ,
 one must include
-.Aq Pa sys/param.h
+.In sys/param.h
 (instead of
-.Aq Pa sys/types.h )
+.In sys/types.h )
 and
-.Aq Pa sys/kernel.h .
+.In sys/kernel.h .
 .Sh RETURN VALUES
 The
 .Fn malloc ,
diff --git a/share/man/man9/pfil.9 b/share/man/man9/pfil.9
index 3273d5f..fc1a8df 100644
--- a/share/man/man9/pfil.9
+++ b/share/man/man9/pfil.9
@@ -132,7 +132,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/rtentry.9 b/share/man/man9/rtentry.9
index 2dc21f9..655a28c 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -45,7 +45,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 1aa5324..84e0d46 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -99,7 +99,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 2ce2d2c..8791c20 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -94,13 +94,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. */
@@ -128,7 +128,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
diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9
index 2944a40..df016af 100644
--- a/share/man/man9/swi.9
+++ b/share/man/man9/swi.9
@@ -225,4 +225,4 @@ functions which date back to at least
 .Sh BUGS
 Most of the global variables described in this manual page should not be
 global, or at the very least should not be declared in
-.Aq Pa sys/interrupt.h .
+.In sys/interrupt.h .