- MFH

1 files changed, 31 insertions, 24 deletions

diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 56dd5d180a..aac296771e 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -961,21 +961,25 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 		  class="directory">/usr/local/</filename></entry>
 	      <entry>Local executables and libraries.  Also used as
 		the default destination for the &os; ports
-		framework.  Within <filename>/usr/local</filename>,
-		the general layout sketched out by &man.hier.7; for
-		<filename>/usr</filename> should be used.  Exceptions
-		are the man directory, which is directly under
-		<filename>/usr/local</filename> rather than under
-		<filename>/usr/local/share</filename>, and the ports
-		documentation is in
-		<filename>share/doc/<replaceable>port</replaceable></filename>.</entry>
+		framework.  Within
+		<filename class="directory">/usr/local</filename>, the
+		general layout sketched out by &man.hier.7; for
+		<filename class="directory">/usr</filename> should be
+		used.  Exceptions are the man directory, which is
+		directly under
+		<filename class="directory">/usr/local</filename>
+		rather than under
+		<filename class="directory">/usr/local/share</filename>,
+		and the ports documentation is in
+		<filename class="directory">share/doc/<replaceable>port</replaceable></filename>.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/usr/obj/</filename></entry>
 	      <entry>Architecture-specific target tree produced by
-		building the <filename>/usr/src</filename>
+		building the
+		<filename class="directory">/usr/src</filename>
 		tree.</entry>
 	    </row>
 
@@ -1075,9 +1079,9 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
       directory name, followed by a forward slash,
       <literal>/</literal>, followed by any other directory names that
       are necessary.  For example, if the directory
-      <filename>foo</filename> contains a directory
-      <filename>bar</filename> which contains the file
-      <filename>readme.txt</filename>, the full name, or
+      <filename class="directory">foo</filename> contains a directory
+      <filename class="directory">bar</filename> which contains the
+      file <filename>readme.txt</filename>, the full name, or
       <firstterm>path</firstterm>, to the file is
       <filename>foo/bar/readme.txt</filename>.  Note that this is
       different from &windows; which uses
@@ -1152,11 +1156,13 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <para>Any files that are in the <literal>B1</literal> or
       <literal>B2</literal> directories can be reached with the path
-      <filename>/A1/B1</filename> or <filename>/A1/B2</filename> as
-      necessary.  Any files that were in <filename>/A1</filename> have
+      <filename class="directory">/A1/B1</filename> or
+      <filename class="directory">/A1/B2</filename> as
+      necessary.  Any files that were in
+      <filename class="directory">/A1</filename> have
       been temporarily hidden.  They will reappear if
       <literal>B</literal> is <firstterm>unmounted</firstterm> from
-      A.</para>
+      <literal>A</literal>.</para>
 
     <para>If <literal>B</literal> had been mounted on
       <literal>A2</literal> then the diagram would look like
@@ -1180,8 +1186,10 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
       </textobject>
     </mediaobject>
 
-    <para>and the paths would be <filename>/A2/B1</filename> and
-      <filename>/A2/B2</filename> respectively.</para>
+    <para>and the paths would be
+      <filename class="directory">/A2/B1</filename> and
+      <filename class="directory">/A2/B2</filename>
+      respectively.</para>
 
     <para>File systems can be mounted on top of one another.
       Continuing the last example, the <literal>C</literal> file
@@ -1257,9 +1265,9 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 	  file system can be mounted read-only, making it impossible
 	  for users to inadvertently delete or edit a critical file.
 	  Separating user-writable file systems, such as
-	  <filename>/home</filename>, from other file systems allows
-	  them to be mounted <firstterm>nosuid</firstterm>.  This
-	  option prevents the
+	  <filename class="directory">/home</filename>, from other
+	  file systems allows them to be mounted
+	  <firstterm>nosuid</firstterm>.  This option prevents the
 	  <firstterm>suid</firstterm>/<firstterm>guid</firstterm> bits
 	  on executables stored on the file system from taking effect,
 	  possibly improving security.</para>
@@ -2153,8 +2161,6 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
       configuration.  Here is a list of common environment variables
       and their meanings:</para>
 
-    <indexterm><primary>environment variables</primary></indexterm>
-
     <informaltable frame="none" pgwide="1">
       <tgroup cols="2">
 	<thead>
@@ -2389,7 +2395,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
 
     <para>Most devices in a &os; must be accessed through special
       files called device nodes, which are located in
-      <filename>/dev</filename>.</para>
+      <filename class="directory">/dev</filename>.</para>
 
     <sect2>
       <title>Creating Device Nodes</title>
@@ -2637,7 +2643,8 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
 	equivalent to using &man.apropos.1;.</para>
 
       <para>To determine what the commands in
-	<filename>/usr/bin</filename> do, type:</para>
+	<filename class="directory">/usr/bin</filename> do,
+	type:</para>
 
       <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
 &prompt.user; <userinput>man -f *</userinput></screen>