Index: fdp-primer/docbook-markup/chapter.xml
===================================================================
--- fdp-primer/docbook-markup/chapter.xml
+++ fdp-primer/docbook-markup/chapter.xml
@@ -1703,9 +1703,7 @@
       <title>Files, Directories, Extensions, Device Names</title>
 
       <para>To refer to the name of a file, a directory, a file
-	extension, or a device name, use <tag>filename</tag>.  For
-	directory names, set the <literal>class</literal> attribute to
-	<literal>directory</literal>.</para>
+	extension, or a device name, use <tag>filename</tag>.</para>
 
       <example>
 	<title><tag>filename</tag></title>
@@ -1713,8 +1711,7 @@
 	<para>Usage:</para>
 
 	<programlisting><tag class="starttag">para</tag>The source for the Handbook in English is found in
-  <tag class="starttag">filename
-    class="directory"</tag>/usr/doc/en_US.ISO8859-1/books/handbook/<tag class="endtag">filename</tag>.
+  <tag class="starttag">filename</tag>/usr/doc/en_US.ISO8859-1/books/handbook/<tag class="endtag">filename</tag>.
   The main file is called <tag class="starttag">filename</tag>book.xml<tag class="endtag">filename</tag>.
   There is also a <tag class="starttag">filename</tag>Makefile<tag class="endtag">filename</tag> and a
   number of files with a <tag class="starttag">filename</tag>.ent<tag class="endtag">filename</tag> extension.<tag class="endtag">para</tag>
@@ -1726,8 +1723,7 @@
 	<para>Appearance:</para>
 
 	<para>The source for the Handbook in English is found in
-	  <filename
-	    class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.
+	  <filename>/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.
 	  The main file is called <filename>book.xml</filename>.
 	  There is also a <filename>Makefile</filename> and a number
 	  of files with a <filename>.ent</filename> extension.</para>
Index: fdp-primer/structure/chapter.xml
===================================================================
--- fdp-primer/structure/chapter.xml
+++ fdp-primer/structure/chapter.xml
@@ -94,8 +94,8 @@
 	  </row>
 
 	  <row>
-	    <entry valign="top"><filename
-		class="directory"><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename></entry>
+	    <entry valign="top">
+		<filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename></entry>
 
 	    <entry>One directory exists for each available translation
 	      and encoding of the documentation, for example