diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
index f2adaa2585..725f6f37e8 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
@@ -257,9 +257,9 @@
 
 	<para>Both <command>ppp</command> and <command>pppd</command>
 	  (the kernel level implementation of PPP) use the configuration
-	  files located in the <filename>/etc/ppp</filename> directory.
+	  files located in the <filename class="directory">/etc/ppp</filename> directory.
           Examples for user ppp can be found in
-          <filename>/usr/share/examples/ppp/</filename>.</para>
+          <filename class="directory">/usr/share/examples/ppp/</filename>.</para>
 
 	<para>Configuring <command>ppp</command> requires that you edit a
 	  number of files, depending on your requirements.  What you put
@@ -348,10 +348,10 @@
 	      <listitem>
 		<para>Identifies the device to which the modem is
 		  connected.  <devicename>COM1</devicename> is
-		  <filename>/dev/cuad0</filename>
+		  <filename class="devicefile">/dev/cuad0</filename>
 		  and
 		  <devicename>COM2</devicename> is
-		  <filename>/dev/cuad1</filename>.</para>
+		  <filename class="devicefile">/dev/cuad1</filename>.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -554,7 +554,7 @@ protocol: ppp</screen>
             example.</para>
 
 	  <para>Example configuration files can be found in the
-	    <filename>/usr/share/examples/ppp/</filename> directory.</para>
+	    <filename class="directory">/usr/share/examples/ppp/</filename> directory.</para>
 	</sect4>
 
 	<sect4 id="userppp-dynamicIP">
@@ -768,7 +768,7 @@ exec /usr/sbin/ppp -direct $IDENT</programlisting>
 
 	    <programlisting>pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup</programlisting>
 
-	    <para>Create a <filename>/home/ppp</filename> directory that
+	    <para>Create a <filename class="directory">/home/ppp</filename> directory that
 	      is world readable containing the following 0 byte
 	      files:</para>
 
@@ -1230,8 +1230,8 @@ ifconfig_tun0=</programlisting>
 
 	  <step>
 	    <para>Ensure that the
-	      <filename>tun<replaceable>N</replaceable></filename> device
-	      file is available in the <filename>/dev</filename>
+	      <filename class="devicefile">tun<replaceable>N</replaceable></filename> device
+	      file is available in the <filename class="directory">/dev</filename>
 	      directory.</para>
 	  </step>
 
@@ -1268,8 +1268,8 @@ ifconfig_tun0=</programlisting>
 
 	  <step>
 	    <para>Ensure that the
-	      <filename>tun<replaceable>N</replaceable></filename> device
-	      file is available in the <filename>/dev</filename>
+	      <filename class="devicefile">tun<replaceable>N</replaceable></filename> device
+	      file is available in the <filename class="directory">/dev</filename>
 	      directory.</para>
 	  </step>
 
@@ -1332,8 +1332,8 @@ ifconfig_tun0=</programlisting>
 
       <para>Before you start setting up PPP on your machine, make sure
 	that <command>pppd</command> is located in
-	<filename>/usr/sbin</filename> and the directory
-	<filename>/etc/ppp</filename> exists.</para>
+	<filename class="directory">/usr/sbin</filename> and the directory
+	<filename class="directory">/etc/ppp</filename> exists.</para>
 
       <para><command>pppd</command> can work in two modes:</para>
 
@@ -1841,7 +1841,7 @@ exit 1
 	  so, you are not  required to rebuild the kernel.
 	  When matching up sio modem is on <devicename>sio1</devicename> or
           <devicename>COM2</devicename> if you are in DOS, then your
-	  modem device would be <filename>/dev/cuad1</filename>.</para>
+	  modem device would be <filename class="devicefile">/dev/cuad1</filename>.</para>
     </sect2>
 
     <sect2>
@@ -1862,7 +1862,7 @@ exit 1
 
       <para>We have now started <command>ppp</command>.</para>
 
-      <screen>ppp ON example&gt; <userinput>set device <filename>/dev/cuad1</filename></userinput></screen>
+      <screen>ppp ON example&gt; <userinput>set device <filename class="devicefile">/dev/cuad1</filename></userinput></screen>
 
       <para>We set our modem device, in this case it is
 	<devicename>cuad1</devicename>.</para>
@@ -1884,7 +1884,7 @@ exit 1
       <para>Switch to <quote>terminal</quote> mode so that we can manually
 	control the modem.</para>
 
-      <programlisting>deflink: Entering terminal mode on <filename>/dev/cuad1</filename>
+      <programlisting>deflink: Entering terminal mode on <filename class="devicefile">/dev/cuad1</filename>
 type '~h' for help</programlisting>
 
       <screen><userinput>at</userinput>
@@ -2301,13 +2301,13 @@ ppp_profile="adsl"</programlisting>
         configure <application>mpd</application> to suit your
         requirements and provider settings. The port places a set of
         sample configuration files which are well documented in
-        <filename><replaceable>PREFIX</replaceable>/etc/mpd/</filename>.
+        <filename class="directory"><replaceable>PREFIX</replaceable>/etc/mpd/</filename>.
         Note here that <replaceable>PREFIX</replaceable> means the directory
         into which your ports are installed, this defaults to
-        <filename>/usr/local/</filename>. A complete guide to
+        <filename class="directory">/usr/local/</filename>. A complete guide to
         configure <application>mpd</application> is available in
         HTML format once the port has been installed. It is placed in
-        <filename><replaceable>PREFIX</replaceable>/share/doc/mpd/</filename>.
+        <filename class="directory"><replaceable>PREFIX</replaceable>/share/doc/mpd/</filename>.
         Here is a sample configuration for connecting to an ADSL
         service with <application>mpd</application>. The configuration
         is spread over two files, first the
@@ -2515,18 +2515,18 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
 
       <para>First, determine which serial port your modem is connected to.
 	Many people set up a symbolic link, such as
-	<filename>/dev/modem</filename>, to point to the real device name,
-	<filename>/dev/cuadN</filename>.
+	<filename class="devicefile">/dev/modem</filename>, to point to the real device name,
+	<filename class="devicefile">/dev/cuad<replaceable>N</replaceable></filename>.
 	This allows you to abstract the actual device
 	name should you ever need to move the modem to a different port.  It
 	can become quite cumbersome when you need to fix a bunch of files in
-	<filename>/etc</filename> and <filename>.kermrc</filename> files all
+	<filename class="directory">/etc</filename> and <filename>.kermrc</filename> files all
 	over the system!</para>
 
       <note>
-	<para><filename>/dev/cuad0</filename>
+	<para><filename class="devicefile">/dev/cuad0</filename>
 	  is
-	  <devicename>COM1</devicename>, <filename>cuad1</filename>
+	  <devicename>COM1</devicename>, <filename class="devicefile">/dev/cuad1</filename>
 	  is
 	  <devicename>COM2</devicename>, etc.</para>
       </note>
@@ -2916,7 +2916,7 @@ water.CS.Example localhost.Example. UGH        34 47641234  lo0 -       0.438
 	<title>Sliplogin Configuration</title>
 
 	<para>As mentioned earlier, there are three files in the
-	  <filename>/etc/sliphome</filename> directory that are part of
+	  <filename class="directory">/etc/sliphome</filename> directory that are part of
 	  the configuration for <filename>/usr/sbin/sliplogin</filename>
 	  (see &man.sliplogin.8; for the actual manual page for
 	  <command>sliplogin</command>): <filename>slip.hosts</filename>,