8 files changed, 67 insertions, 28 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 9c74980..d0d8671 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1054,7 +1054,9 @@ can be used on a channel are defined by this setting.
 Country/Region codes are specified as a 2-character abbreviation
 defined by ISO 3166 or using a longer, but possibly ambiguous, spelling;
 e.g., "ES" and "Spain".
-The set of country codes are taken from /etc/regdomain.xml and can also
+The set of country codes are taken from
+.Pa /etc/regdomain.xml
+and can also
 be viewed with the ``list countries'' request.
 Note that not all devices support changing the country code from a default
 setting; typically stored in EEPROM.
@@ -1072,7 +1074,9 @@ according to a least-congested criteria.
 DFS support is mandatory for some 5GHz frequencies in certain
 locales (e.g., ETSI).
 By default DFS is enabled according to the regulatory definitions
-specified in /etc/regdomain.xml and the current country code, regdomain,
+specified in
+.Pa /etc/regdomain.xml
+and the current country code, regdomain,
 and channel.
 Note the underlying device (and driver) must support radar detection
 for full DFS support to work.
@@ -1578,7 +1582,9 @@ for operation.
 In particular the set of available channels, how the wireless device
 will operation on the channels, and the maximum transmit power that
 can be used on a channel are defined by this setting.
-Regdomain codes (SKU's) are taken from /etc/regdomain.xml and can also
+Regdomain codes (SKU's) are taken from
+.Pa /etc/regdomain.xml
+and can also
 be viewed with the ``list countries'' request.
 Note that not all devices support changing the regdomain from a default
 setting; typically stored in EEPROM.
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 570e20b..2f8a021 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -576,7 +576,7 @@ Incoming packets can carry any password that is valid, will
 be valid within the next 24 hours, or that was valid within the preceding
 24 hours.
 To protect the secrets, the passwd settings are valid only in the
-.Em /etc/gateways
+.Pa /etc/gateways
 file and only when that file is readable only by UID 0.
 .It Cm md5_passwd Ns \&= Ns Ar XXX|KeyID[start|stop]
 specifies a RIPv2 MD5 password.
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index fc86111..83fc7c5 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1461,7 +1461,7 @@ and
 For a list of all the protocol name to number mappings used by
 .Xr pfctl 8 ,
 see the file
-.Em /etc/protocols .
+.Pa /etc/protocols .
 .It Xo
 .Ar from Aq Ar source
 .Ar port Aq Ar source
diff --git a/share/man/man7/firewall.7 b/share/man/man7/firewall.7
index 20108d2..48558b2 100644
--- a/share/man/man7/firewall.7
+++ b/share/man/man7/firewall.7
@@ -91,7 +91,7 @@ a firewall in the sample firewall section below.
 .Sh IPFW KERNEL CONFIGURATION
 You do not need to create a custom kernel to use the IP firewalling features.
 If you enable firewalling in your
-.Em /etc/rc.conf
+.Pa /etc/rc.conf
 (see below), the ipfw kernel module will be loaded automatically
 when necessary.
 However,
@@ -103,7 +103,7 @@ option set.
 If compiled in the kernel, ipfw denies all
 packets by default, which means that, if you do not load in
 a permissive ruleset via
-.Em /etc/rc.conf ,
+.Pa /etc/rc.conf ,
 rebooting into your new kernel will take the network offline.
 This can prevent you from being able to access your system if you
 are not sitting at the console.
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 320b079..328f88d 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -434,15 +434,31 @@ local executables, libraries, etc.
 Also used as the default destination for the
 .Fx
 ports framework.
-Within local/, the general layout sketched out by
+Within
+.Pa local/ ,
+the general layout sketched out by
 .Nm
-for /usr
+for
+.Pa /usr
 should be used.
-Exceptions are the man directory (directly under local/
-rather than under local/share/), ports documentation (in share/doc/<port>/),
-and /usr/local/etc (mimics /etc).
+Exceptions are the
+.Pa man
+directory
+.Po directly under
+.Pa local/
+rather than under
+.Pa local/share/ Ns Pc ,
+ports documentation
+.Po in
+.Pa share/doc/<port>/ Ns Pc ,
+and
+.Pa /usr/local/etc
+.Po mimics
+.Pa /etc Ns Pc .
 .It Pa obj/
-architecture-specific target tree produced by building the /usr/src tree
+architecture-specific target tree produced by building the
+.Pa /usr/src
+tree
 .It Pa ports/
 The
 .Fx
@@ -633,38 +649,48 @@ source code for contributed software
 .It Pa crypto/
 source code for contributed cryptography software
 .It Pa etc/
-source code for files in /etc
+source code for files in
+.Pa /etc
 .It Pa games/
-source code for files in /usr/games
+source code for files in
+.Pa /usr/games
 .It Pa gnu/
 Utilities covered by the GNU General Public License
 .It Pa include/
-source code for files in /usr/include
+source code for files in
+.Pa /usr/include
 .It Pa kerberos5/
 build infrastructure for kerberos version 5
 .It Pa lib/
-source code for files in /usr/lib
+source code for files in
+.Pa /usr/lib
 .It Pa libexec/
-source code for files in /usr/libexec
+source code for files in
+.Pa /usr/libexec
 .It Pa release/
 files required to produce a
 .Fx
 release
 .It Pa sbin/
-source code for files in /sbin
+source code for files in
+.Pa /sbin
 .It Pa secure/
-build directory for files in /usr/src/crypto
+build directory for files in
+.Pa /usr/src/crypto
 .It Pa share/
-source for files in /usr/share
+source for files in
+.Pa /usr/share
 .It Pa sys/
 kernel source code
 .It Pa tools/
 tools used for maintenance and testing of
 .Fx
 .It Pa usr.bin/
-source code for files in /usr/bin
+source code for files in
+.Pa /usr/bin
 .It Pa usr.sbin/
-source code for files in /usr/sbin
+source code for files in
+.Pa /usr/sbin
 .El
 .El
 .It Pa /var/
diff --git a/usr.sbin/portsnap/portsnap/portsnap.8 b/usr.sbin/portsnap/portsnap/portsnap.8
index afe5c3e..baa1a57 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.8
+++ b/usr.sbin/portsnap/portsnap/portsnap.8
@@ -169,7 +169,9 @@ If your clock is set to local time, adding the line
 .Pp
 .Dl 0 3 * * * root /usr/sbin/portsnap cron
 .Pp
-to /etc/crontab is a good way to make sure you always have
+to
+.Pa /etc/crontab
+is a good way to make sure you always have
 an up-to-date snapshot of the ports tree available which
 can quickly be extracted into
 .Pa /usr/ports .
diff --git a/usr.sbin/pw/pw.conf.5 b/usr.sbin/pw/pw.conf.5
index 3f023aa..61c40e8 100644
--- a/usr.sbin/pw/pw.conf.5
+++ b/usr.sbin/pw/pw.conf.5
@@ -32,7 +32,7 @@
 .Nd format of the pw.conf configuration file
 .Sh DESCRIPTION
 The file
-.In /etc/pw.conf
+.Pa /etc/pw.conf
 contains configuration data for the
 .Xr pw 8
 utility.
diff --git a/usr.sbin/uhsoctl/uhsoctl.1 b/usr.sbin/uhsoctl/uhsoctl.1
index cd0c5ca..826a1ec 100644
--- a/usr.sbin/uhsoctl/uhsoctl.1
+++ b/usr.sbin/uhsoctl/uhsoctl.1
@@ -50,7 +50,7 @@
 is a small connection utility for Option N.V. devices that are based on Options
 packet interface and uses proprietary AT_* calls to establish connections.
 The utility (tries to) configure both default route and name servers
-(/etc/resolv.conf).
+.Po Pa /etc/resolv.conf Pc .
 .Pp
 By default
 .Nm
@@ -76,8 +76,13 @@ Specify username.
 .It Fl k Ar password
 Specify username.
 .It Fl r Ar path
-Path to resolv.conf, default /etc/resolv.conf.
-Use /dev/null to disable updating of name servers.
+Path to
+.Pa resolv.conf ,
+default
+.Pa /etc/resolv.conf .
+Use
+.Pa /dev/null
+to disable updating of name servers.
 .It Fl f Ar path
 Explicitly set the serial port to use as controlling terminal.
 Might be needed if the automatic detection fails.