Index: advanced-networking/chapter.xml
===================================================================
--- advanced-networking/chapter.xml
+++ advanced-networking/chapter.xml
@@ -2210,7 +2210,7 @@
 	    support layer using &man.wlandebug.8;.  On a &os; system
 	    prior to &os; 9.1, this program can be found in
 	    <filename
-	      class="directory">/usr/src/tools/tools/net80211</filename>.
+	      >/usr/src/tools/tools/net80211</filename>.
 	    For example, to enable console messages related to
 	    scanning for access points and the 802.11 protocol
 	    handshakes required to arrange communication:</para>
@@ -2220,7 +2220,7 @@
 
 	  <para>Many useful statistics are maintained by the 802.11
 	    layer and <command>wlanstats</command>, found in <filename
-	      class="directory">/usr/src/tools/tools/net80211</filename>,
+	      >/usr/src/tools/tools/net80211</filename>,
 	    will dump this information.  These statistics should
 	    display all errors identified by the 802.11 layer.
 	    However, some errors are identified in the device drivers
Index: basics/chapter.xml
===================================================================
--- basics/chapter.xml
+++ basics/chapter.xml
@@ -533,9 +533,9 @@
 		on the system.  This is the user's starting directory
 		when the user logs in.  A common convention is to put
 		all user home directories under <filename
-		  class="directory"><replaceable>/home/username</replaceable></filename>
+		  ><replaceable>/home/username</replaceable></filename>
 		or <filename
-		  class="directory"><replaceable>/usr/home/username</replaceable></filename>.
+		  ><replaceable>/usr/home/username</replaceable></filename>.
 		Each user stores their personal files and
 		subdirectories in their own home directory.</para>
 	    </listitem>
@@ -1784,16 +1784,16 @@
 	      <entry>Local executables and libraries.  Also used as
 		the default destination for the &os; ports framework.
 		Within
-		<filename class="directory">/usr/local</filename>, the
+		<filename>/usr/local</filename>, the
 		general layout sketched out by &man.hier.7; for
-		<filename class="directory">/usr</filename> should be
+		<filename>/usr</filename> should be
 		used.  Exceptions are the man directory, which is
 		directly under <filename
-		  class="directory">/usr/local</filename> rather than
+		  >/usr/local</filename> rather than
 		under <filename
-		  class="directory">/usr/local/share</filename>, and
+		  >/usr/local/share</filename>, and
 		the ports documentation is in <filename
-		  class="directory">share/doc/<replaceable>port</replaceable></filename>.</entry>
+		  >share/doc/<replaceable>port</replaceable></filename>.</entry>
 	    </row>
 
 	    <row>
Index: cutting-edge/chapter.xml
===================================================================
--- cutting-edge/chapter.xml
+++ cutting-edge/chapter.xml
@@ -565,7 +565,7 @@
 &prompt.root; <userinput>./install.sh GENERIC</userinput></screen>
 
 	<para>Replace <filename
-	    class="directory"><replaceable>X.Y-RELEASE</replaceable></filename>
+	    ><replaceable>X.Y-RELEASE</replaceable></filename>
 	  with the version of the release being used.  The
 	  <filename>GENERIC</filename> kernel will be installed in
 	  <filename>/boot/GENERIC</filename> by default.</para>
@@ -1418,7 +1418,7 @@
 	<step>
 	  <para>If the build world process has previously been run on
 	    this system, a copy of the previous build may still exist
-	    in <filename class="directory">/usr/obj</filename>.  To
+	    in <filename>/usr/obj</filename>.  To
 	    speed up the new build world process, and possibly save
 	    some dependency headaches, remove this directory if it
 	    already exists:</para>
@@ -1431,7 +1431,7 @@
 	  <para>Compile the new compiler and a few related tools, then
 	    use the new compiler to compile the rest of the new world.
 	    The result is saved to <filename
-	      class="directory">/usr/obj</filename>.</para>
+	      >/usr/obj</filename>.</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make buildworld</userinput></screen>
@@ -1439,7 +1439,7 @@
 
 	<step>
 	  <para>Use the new compiler residing in <filename
-	      class="directory">/usr/obj</filename> to build the new
+	      >/usr/obj</filename> to build the new
 	    kernel, in order to protect against compiler-kernel
 	    mismatches.  This is necessary, as certain memory
 	    structures may have changed, and programs like
@@ -1512,7 +1512,7 @@
 	    <filename>/var</filename> and <filename>/usr</filename>,
 	    with new or changed configuration files.  The next step is
 	    to perform some initial configuration file updates
-	    to <filename class="directory">/etc</filename> in
+	    to <filename>/etc</filename> in
 	    preparation for the new world.  The following command
 	    compares only those files that are essential for the
 	    success of <buildtarget>installworld</buildtarget>.  For
@@ -1529,7 +1529,7 @@
 
 	<step>
 	  <para>Install the new world and system binaries from
-	    <filename class="directory">/usr/obj</filename>.</para>
+	    <filename>/usr/obj</filename>.</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make installworld</userinput></screen>
@@ -2051,7 +2051,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>Can <filename class="directory">/usr/obj</filename>
+	  <term>Can <filename>/usr/obj</filename>
 	      be removed when finished?</term>
 
 	  <listitem>
@@ -2113,21 +2113,21 @@
 
 	    <para>Careful file system design or the use of ZFS
 	      datasets can make a difference.  Consider putting
-	      <filename class="directory">/usr/src</filename> and
-	      <filename class="directory">/usr/obj</filename> on
+	      <filename>/usr/src</filename> and
+	      <filename>/usr/obj</filename> on
 	      separate file systems.  If possible, place the file
 	      systems on separate disks on separate disk controllers.
 	      When mounting <filename
-		class="directory">/usr/src</filename>, use
+		>/usr/src</filename>, use
 	      <option>noatime</option> which prevents the file system
 	      from recording the file access time.  If <filename
-		class="directory">/usr/src</filename> is not on its
+		>/usr/src</filename> is not on its
 	      own file system, consider remounting <filename
-		class="directory">/usr</filename> with
+		>/usr</filename> with
 	      <option>noatime</option>.</para>
 
 	    <para>The file system holding <filename
-		class="directory">/usr/obj</filename> can be mounted
+		>/usr/obj</filename> can be mounted
 	      or remounted with <option>async</option> so that disk
 	      writes happen asynchronously.  The write completes
 	      immediately, and the data is written to the disk a few
@@ -2252,7 +2252,7 @@
       should list them all in its <varname>KERNCONF</varname>,
       listing its own kernel first.  The build machine must have the
       kernel configuration files for each machine in its <filename
-	class="directory">/usr/src/sys/<replaceable>arch</replaceable>/conf</filename>.</para>
+	>/usr/src/sys/<replaceable>arch</replaceable>/conf</filename>.</para>
 
     <para>On the build machine, build the kernel and world as
       described in <xref linkend="makeworld"/>, but do not install
Index: disks/chapter.xml
===================================================================
--- disks/chapter.xml
+++ disks/chapter.xml
@@ -479,7 +479,7 @@
 	the user that is to mount the file system.  One way to do that
 	is for <systemitem class="username">root</systemitem> to
 	create a subdirectory owned by that user as <filename
-	  class="directory">/mnt/<replaceable>username</replaceable></filename>.
+	  >/mnt/<replaceable>username</replaceable></filename>.
 	In the following example, replace
 	<replaceable>username</replaceable> with the login name of the
 	user and <replaceable>usergroup</replaceable> with the user's
@@ -3216,7 +3216,7 @@
 	size for <acronym>HAST</acronym> operation.  The
 	<acronym>HAST</acronym> pool, sometimes referred to as a
 	resource or the <acronym>GEOM</acronym> provider in <filename
-	  class="directory">/dev/hast/</filename>, will be called
+	  >/dev/hast/</filename>, will be called
 	<literal>test</literal>.</para>
 
       <para>Configuration of <acronym>HAST</acronym> is done using
Index: firewalls/chapter.xml
===================================================================
--- firewalls/chapter.xml
+++ firewalls/chapter.xml
@@ -1309,7 +1309,7 @@
 	      or port.  In order to use
 	      <application>spamd</application>'s greylisting
 	      features, &man.fdescfs.5; must be mounted at <filename
-		class="directory">/dev/fd</filename>.  Add the
+		>/dev/fd</filename>.  Add the
 	      following line to
 	      <filename>/etc/fstab</filename>:</para>
 
@@ -2795,7 +2795,7 @@
 	later matching rule that is a <literal>block</literal>, the
 	packet will be dropped.  Sample rulesets can be found in
 	<filename
-	  class="directory">/usr/share/examples/ipfilter</filename>.</para>
+	  >/usr/share/examples/ipfilter</filename>.</para>
 
       <para>When creating rules, a <literal>#</literal> character is
 	used to mark the start of a comment and may appear at the end
Index: install/chapter.xml
===================================================================
--- install/chapter.xml
+++ install/chapter.xml
@@ -582,7 +582,7 @@
 	  <para>Memory stick images for
 	    &os;&nbsp;8.<replaceable>X</replaceable> can be downloaded
 	    from the <filename
-	      class="directory">ISO-IMAGES/</filename> directory at
+	      >ISO-IMAGES/</filename> directory at
 	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>arch</replaceable>/ISO-IMAGES/<replaceable>version</replaceable>/&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-memstick.img</literal>.
 	    Replace <replaceable>arch</replaceable> and
 	    <replaceable>version</replaceable> with the architecture
@@ -704,7 +704,7 @@
 
 	  <para>The floppy images have a <filename>.flp</filename>
 	    extension.  <filename
-	      class="directory">floppies/</filename> contains a number
+	      >floppies/</filename> contains a number
 	    of different images.  Download
 	    <filename>boot.flp</filename> as well as the number of
 	    files associated with the type of installation, such as
@@ -1810,7 +1810,7 @@
 		&man.sysinstall.8; uses it, so following it makes the
 		installation slightly cleaner.  This filesystem can be
 		mounted anywhere; this example mounts it as <filename
-		  class="directory">/disk<replaceable>n</replaceable></filename>,
+		  >/disk<replaceable>n</replaceable></filename>,
 		where <replaceable>n</replaceable> is a number that
 		changes for each disk.</entry>
 	    </row>
Index: jails/chapter.xml
===================================================================
--- jails/chapter.xml
+++ jails/chapter.xml
@@ -278,10 +278,10 @@
 	  point.  This is where the jail will physically reside within
 	  the file system of the jail's host.  A good choice can be
 	  <filename
-	    class="directory">/usr/jail/<replaceable>jailname</replaceable></filename>,
+	    >/usr/jail/<replaceable>jailname</replaceable></filename>,
 	  where <replaceable>jailname</replaceable> is the hostname
 	  identifying the jail.  The
-	  <filename class="directory">/usr/</filename> file system
+	  <filename>/usr/</filename> file system
 	  usually has enough space for the jail file system, which for
 	  <quote>complete</quote> jails is, essentially, a replication
 	  of every file present in a default installation of the &os;
@@ -307,10 +307,10 @@
 	  <application>make</application> installs every needed
 	  configuration file.  In simple words, it installs every
 	  installable file of
-	  <filename class="directory">/usr/src/etc/</filename> to the
-	  <filename class="directory">/etc</filename> directory of the
+	  <filename>/usr/src/etc/</filename> to the
+	  <filename>/etc</filename> directory of the
 	  jail environment:
-	  <filename class="directory">$D/etc/</filename>.</para>
+	  <filename>$D/etc/</filename>.</para>
       </callout>
 
       <callout arearefs="jaildevfs">
@@ -830,12 +830,12 @@
 	  <para>The
 	    <varname>jail_<replaceable>name</replaceable>_rootdir</varname>
 	    variable is set to
-	    <filename class="directory">/usr/home</filename> instead
-	    of <filename class="directory">/home</filename> because
+	    <filename>/usr/home</filename> instead
+	    of <filename>/home</filename> because
 	    the physical path of <filename
-	      class="directory">/home</filename> on a default &os;
+	      >/home</filename> on a default &os;
 	    installation is <filename
-	      class="directory">/usr/home</filename>.  The
+	      >/usr/home</filename>.  The
 	    <varname>jail_<replaceable>name</replaceable>_rootdir</varname>
 	    variable must <emphasis>not</emphasis> be set to a path
 	    which includes a symbolic link, otherwise the jails will
Index: linuxemu/chapter.xml
===================================================================
--- linuxemu/chapter.xml
+++ linuxemu/chapter.xml
@@ -379,23 +379,23 @@
 	need to be copied from the CDROM or from a host with
 	<application>&mathematica;</application> installed to the
 	local machine.  These fonts are normally stored in <filename
-	  class="directory">/cdrom/Unix/Files/SystemFiles/Fonts</filename>
+	  >/cdrom/Unix/Files/SystemFiles/Fonts</filename>
 	on the CDROM, or <filename
-	  class="directory">/usr/local/mathematica/SystemFiles/Fonts</filename>
+	  >/usr/local/mathematica/SystemFiles/Fonts</filename>
 	on the hard drive.  The actual fonts are in the subdirectories
-	<filename class="directory">Type1</filename> and
-	<filename class="directory">X</filename>.  There are several
+	<filename>Type1</filename> and
+	<filename>X</filename>.  There are several
 	ways to use them, as described below.</para>
 
       <para>The first way is to copy the fonts into one of the
 	existing font directories in <filename
-	  class="directory">/usr/local/lib/X11/fonts</filename> then
+	  >/usr/local/lib/X11/fonts</filename> then
 	running &man.mkfontdir.1; within the directory containing the
 	new fonts.</para>
 
       <para>The second way to do this is to copy the directories to
 	<filename
-	  class="directory">/usr/local/lib/X11/fonts</filename>:</para>
+	  >/usr/local/lib/X11/fonts</filename>:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts</userinput>
 &prompt.root; <userinput>mkdir X</userinput>
@@ -421,11 +421,11 @@
       <indexterm><primary>fonts</primary></indexterm>
 
       <para>If <filename
-	  class="directory">/usr/local/lib/X11/fonts/Type1</filename>
+	  >/usr/local/lib/X11/fonts/Type1</filename>
 	does not already exist, change the name of the <filename
-	  class="directory">MathType1</filename> directory in the
+	  >MathType1</filename> directory in the
 	example above to <filename
-	  class="directory">Type1</filename>.</para>
+	  >Type1</filename>.</para>
     </sect2>
   </sect1>
   -->
@@ -473,7 +473,7 @@
 	<quote>RedHat</quote> option when prompted by the
 	installation program.  A typical installation directory
 	might be <filename
-	  class="directory">/usr/local/maple</filename>.</para></step>
+	  >/usr/local/maple</filename>.</para></step>
 
       <step>
 	<para>Copy the license to
@@ -775,7 +775,7 @@
 	<step>
 	  <para>Place the following startup script in
 	    <filename
-	      class="directory">/usr/local/bin/matlab</filename>:</para>
+	      >/usr/local/bin/matlab</filename>:</para>
 
 	  <programlisting>#!/bin/sh
 /compat/linux/bin/sh /compat/linux/usr/local/matlab/bin/matlab "$@"</programlisting>
@@ -1024,7 +1024,7 @@
       <title>Installing &oracle;</title>
 
       <para>Before starting the installer, create a directory named
-	<filename class="directory">/var/tmp/.oracle</filename> which
+	<filename>/var/tmp/.oracle</filename> which
 	is owned by the <username>oracle</username> user.  The
 	installation of <application>&oracle;</application> should
 	work without any problems.  If errors are encountered, check
@@ -1055,7 +1055,7 @@
 	some actions, which need to be performed as
 	<username>root</username>, are recorded in a shell script
 	called <filename>root.sh</filename>.  This script is
-	found in <filename class="directory">orainst</filename>.
+	found in <filename>orainst</filename>.
 	Apply the following patch to <filename>root.sh</filename>
 	so that it can find the &os; location of
 	<command>chown</command>.  Alternatively, run the script
@@ -1082,7 +1082,7 @@
       <para>If <application>&oracle;</application> is not installed
 	from CD, patch the source for <filename>root.sh</filename>.
 	It is called <filename>rthd.sh</filename> and is located in
-	<filename class="directory">orainst</filename> in the source
+	<filename>orainst</filename> in the source
 	tree.</para>
     </sect3>
 
@@ -1203,9 +1203,9 @@
       lookups.  This is, in effect, equivalent to the
       <option>union</option> option to file system mounts.  First, an
       attempt is made to lookup the file in <filename
-	class="directory">/compat/linux/<replaceable>original-path</replaceable></filename>.
+	>/compat/linux/<replaceable>original-path</replaceable></filename>.
       If that fails, the lookup is done in <filename
-	class="directory">/<replaceable>original-path</replaceable></filename>.
+	>/<replaceable>original-path</replaceable></filename>.
       This makes sure that binaries that require other binaries can
       run.  For example, the &linux; toolchain can all run under
       &linux; <acronym>ABI</acronym> support.  It also means that the
Index: network-servers/chapter.xml
===================================================================
--- network-servers/chapter.xml
+++ network-servers/chapter.xml
@@ -957,7 +957,7 @@
 	attempt to access a file within
 	<filename>/net/foobar/usr</filename> would tell
 	&man.automountd.8; to mount the <filename
-	  class="directory">/usr</filename> export from the host
+	  >/usr</filename> export from the host
 	<systemitem class="fqdomainname">foobar</systemitem>.</para>
 
       <example>
@@ -976,9 +976,9 @@
       </example>
 
       <para>The output from <command>showmount</command> shows
-	<filename class="directory">/usr</filename> as an export.
+	<filename>/usr</filename> as an export.
 	When changing directories to <filename
-	  class="directory">/host/foobar/usr</filename>,
+	  >/host/foobar/usr</filename>,
 	&man.automountd.8; intercepts the request and attempts to
 	resolve the hostname <systemitem
 	  class="fqdomainname">foobar</systemitem>.  If successful,
@@ -4486,7 +4486,7 @@
 	      Binaries are stored in the <filename>bin</filename> and
 	      <filename>sbin</filename> subdirectories of the server
 	      root and configuration files are stored in the <filename
-		class="directory">etc/apache2<replaceable>x</replaceable></filename>
+		>etc/apache2<replaceable>x</replaceable></filename>
 	      subdirectory.</para>
 	  </listitem>
 	</varlistentry>
Index: ports/chapter.xml
===================================================================
--- ports/chapter.xml
+++ ports/chapter.xml
@@ -1645,7 +1645,7 @@
       It may be convenient to put
       <application>poudriere</application> datasets in an isolated
       tree mounted at <filename
-	class="directory">/poudriere</filename>.  Defaults for the
+	>/poudriere</filename>.  Defaults for the
       other configuration values are adequate.</para>
 
     <para>The number of processor cores detected is used to define how
@@ -1726,7 +1726,7 @@
       <para>The basic configuration shown here puts a single jail-,
 	port-, and set-specific <filename>make.conf</filename> in
 	<filename
-	  class="directory">/usr/local/etc/poudriere.d</filename>.
+	  >/usr/local/etc/poudriere.d</filename>.
 	The filename in this example is created by combining the jail
 	name, port name, and set name:
 	<filename><replaceable>10amd64-local-workstation</replaceable>-make.conf</filename>.
Index: ppp-and-slip/chapter.xml
===================================================================
--- ppp-and-slip/chapter.xml
+++ ppp-and-slip/chapter.xml
@@ -581,7 +581,7 @@
 	    <programlisting>pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup</programlisting>
 
 	    <para>Create a <filename
-		class="directory">/home/ppp</filename> directory that
+		>/home/ppp</filename> directory that
 	      is world readable containing the following 0 byte
 	      files:</para>