Index: server/major/nfs-utils.xml
===================================================================
--- server/major/nfs-utils.xml	(revision a16cb0665ae5ddf8816a1db83cb6b43db91ece57)
+++ server/major/nfs-utils.xml	(revision eaf6a1cd726c15e10f37e45889f8107b352161ab)
@@ -23,11 +23,11 @@
 
 <indexterm zone="nfs-utils">
-  <primary sortas="a-nfs-utils">NFS Utilities</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to <application>nfs-utils</application></title>
-
-<para>The <application>nfs-utils</application> package contains the userspace 
+  <primary sortas="a-Nfs-utils">NFS Utilities</primary>
+</indexterm>
+
+<sect2 role="package">
+<title>Introduction to <application>NFS Utilities</application></title>
+
+<para>The <application>NFS Utilities</application> package contains the userspace 
 server and client tools necessary to use the kernel's nfs-abilities. 
 <acronym>NFS</acronym> is a protocol that allows sharing file systems over the 
@@ -44,5 +44,5 @@
 </itemizedlist>
 
-<bridgehead renderas="sect3">nfs-utils Dependencies</bridgehead>
+<bridgehead renderas="sect3">NFS Utilities Dependencies</bridgehead>
 <bridgehead renderas="sect4">Required</bridgehead>
 
@@ -57,5 +57,5 @@
 </sect2>
 
-<sect2 id='nfs-utils-kernel'>
+<sect2 role="kernel" id='nfs-utils-kernel'>
 <title>Kernel Configuration</title>
 
@@ -63,8 +63,8 @@
 and recompile the kernel if neccessary:</para>
 
-<screen>File systems:
+<screen><literal>File systems:
   Network File Systems:
     NFS File System Support: M or Y
-    NFS Server Support: M or Y</screen>
+    NFS Server Support: M or Y</literal></screen>
 
 <para>Select the appropriate sub-options that appear when the above options
@@ -76,23 +76,28 @@
 </sect2>
 
-<sect2>
-<title>Installation of nfs-utils</title>
-
-<para>Before you compile the program, you need to be sure the "nobody"
-user and "nogroup" group are available. You can add these by
-running the following commands as the root user:</para>
-
-<screen><userinput><command>groupadd -g 99 nogroup &amp;&amp;
-useradd -c nobody -d /home -g nogroup -s /bin/bash -u 99 nobody</command></userinput></screen>
+<sect2 role="installation">
+<title>Installation of NFS Utilities</title>
+
+<para>Before you compile the program, you need to be sure the <systemitem 
+class="username">nobody</systemitem> user and <systemitem 
+class="groupname">nogroup</systemitem> group are available. You can add these by
+running the following commands as the <systemitem class="username">root</systemitem>
+user:</para>
+
+<screen role="root"><userinput>groupadd -g 99 nogroup &amp;&amp;
+useradd -c nobody -d /home -g nogroup -s /bin/bash -u 99 nobody</userinput></screen>
 
 <note><para>The classic uid and gid values are 65534 which is also -2 when 
 interpreted as a signed 16-bit number.  These values impact other files on
-some filesystems that do not have support for sparse files.  The nobody
-and nogroup values have small impact.  The impact on a server is nil if the
-exports file is configured correctly.  If it is misconfigured, the impact is
-that a ls -l or ps listing will show a uid or gid number of 65534 instead
-of a name. The client uses nobody only as the user running rpc.statd.</para></note>
-
-<para>Install nfs-utils by running the following commands:</para>
+some filesystems that do not have support for sparse files.  The <systemitem 
+class="username">nobody</systemitem> and <systemitem 
+class="groupname">nogroup</systemitem> values have small impact.  
+The impact on a server is nil if the exports file is configured correctly.  If it is misconfigured, 
+the impact is that a <command>ls -l</command> or <command>ps</command> listing 
+will show a uid or gid number of 65534 instead of a name. The client uses <systemitem 
+class="username">nobody</systemitem> only as the user running 
+<command>rpc.statd</command>.</para></note>
+
+<para>Install NFS Utilities by running the following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
@@ -100,11 +105,12 @@
 make</userinput></screen>
 
-<para>Now, as the root user:</para>
+<para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install</userinput></screen>
 
-<note><para>If your <filename>/usr</filename> directory is NFS mounted,
-you should install the executables in <filename>/sbin</filename> by passing
-an additional parameter <command>--sbindir=/sbin</command> to the above
+<note><para>If your <filename class="directory">/usr</filename> directory is 
+<acronym>NFS</acronym> mounted, you should install the executables in 
+<filename class="directory">/sbin</filename> by passing
+an additional parameter <option>--sbindir=/sbin</option> to the above
 <command>./configure</command> command.</para></note>
 
@@ -115,25 +121,26 @@
 
 <para><parameter>--disable-nfsv4</parameter>: Disbles support  
-for NFS Version 4.</para>
+for <acronym>NFS</acronym> Version 4.</para>
 
 <para><parameter>--disable-gss</parameter>: Disbles support for 
-RPCSEC GSS (RPC Security).</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring nfs-utils</title>
-
-<bridgehead renderas="sect3">Server Configutation</bridgehead>
-
-<para id='nfs-utils-server-config'><filename>/etc/exports</filename> contains
-the exported directories on NFS servers. Refer to the exports manual page for
-the syntax of this file. Also refer to the NFS HowTo available at <ulink
+<acronym>RPCSEC GSS</acronym> (<acronym>RPC</acronym> Security).</para>
+
+</sect2>
+
+<sect2 role="configuration">
+<title>Configuring NFS Utilities</title>
+
+<sect3 id='nfs-utils-server-config'>
+<title>Server Configutation</title>
+
+<para><filename>/etc/exports</filename> contains the exported directories on 
+<acronym>NFS</acronym> servers. Refer to the exports manual page for
+the syntax of this file. Also refer to the "NFS HowTo" available at <ulink
 url="http://nfs.sourceforge.net/nfs-howto/"/> on how to configure the servers
 and clients in a secure manner. For example, for sharing the
-<filename>/home</filename> directory over the local network, the following line
+<filename class="directory">/home</filename> directory over the local network, the following line
 may be added:</para>
 
-<screen><userinput>/home 192.168.0.0/255.255.255.0(rw,anonuid=99,anongid=99)</userinput></screen>
+<screen role="root"><userinput>/home 192.168.0.0/255.255.255.0(rw,anonuid=99,anongid=99)</userinput></screen>
 
 <indexterm zone="nfs-utils nfs-utils-server-config">
@@ -145,5 +152,5 @@
 the server at boot.</para>
 
-<screen><userinput><command>make install-nfs-server</command></userinput></screen>
+<screen role="root"><userinput>make install-nfs-server</userinput></screen>
 
 <indexterm zone="nfs-utils nfs-utils-server-config">
@@ -154,10 +161,10 @@
 configuration file:</para>
 
-<screen><userinput><command>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"</command>
-PORT="2049"
+<screen role="root"><userinput>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"
+<literal>PORT="2049"
 PROCESSES="8"
 QUOTAS="no"
-KILLDELAY="10"
-<command>EOF</command></userinput></screen>
+KILLDELAY="10"</literal>
+EOF</userinput></screen>
 
 <indexterm zone="nfs-utils nfs-utils-server-config">
@@ -165,13 +172,16 @@
 </indexterm>
 
-<bridgehead renderas="sect3">Client Configutation</bridgehead>
-
-<para id='nfs-utils-client-config'><filename>/etc/fstab</filename> contains the
+</sect3>
+
+<sect3 id='nfs-utils-client-config'><title>Client Configutation</title>
+
+<para><filename>/etc/fstab</filename> contains the
 directories that are to be mounted on the client. Alternately the partitions
 can be mounted by using the <command>mount</command> command with the proper
-options. To mount the <filename>/home</filename> and <filename>/usr</filename>
+options. To mount the <filename class="directory">/home</filename> and 
+<filename class="directory">/usr</filename>
 partitions, add the following to the <filename>/etc/fstab</filename>:</para>
 
-<screen><userinput>&lt;server-name&gt;:/home  /home nfs   rw,_netdev,rsize=8192,wsize=8192 0 0
+<screen role="root"><userinput>&lt;server-name&gt;:/home  /home nfs   rw,_netdev,rsize=8192,wsize=8192 0 0
 &lt;server-name&gt;:/usr   /usr  nfs   ro,_netdev,rsize=8192            0 0</userinput></screen>
 
@@ -186,5 +196,5 @@
 start the client services at boot.</para>
 
-<screen><userinput><command>make install-nfs-client</command></userinput></screen>
+<screen role="root"><userinput>make install-nfs-client</userinput></screen>
 
 <indexterm zone="nfs-utils nfs-utils-client-config">
@@ -192,6 +202,7 @@
 </indexterm>
 
-<para>To automatically mount nfs filesystems, clients will also need to install 
-the netfs bootscript as described in <xref linkend='postlfs-config-netfs'/>.</para>
+<para>To automatically mount <systemitem class="filesystem">nfs</systemitem> filesystems, 
+clients will also need to install the <filename>netfs</filename> bootscript as described in 
+<xref linkend='postlfs-config-netfs'/>.</para>
 
 <indexterm zone="nfs-utils nfs-utils-client-config">
@@ -199,10 +210,12 @@
 </indexterm>
 
-</sect2>
-
-<sect2>
+</sect3>
+
+</sect2>
+
+<sect2 role="content">
 <title>Contents</title>
 <segmentedlist>
-  <segtitle>Installed Programis</segtitle>
+  <segtitle>Installed Programs</segtitle>
   <segtitle>Installed Libraries</segtitle>
   <segtitle>Installed Directories</segtitle>
@@ -210,5 +223,5 @@
   <seglistitem>
     <seg>exportfs, nfsstat, nhfsgraph, nhfsnums, nhfsrun, nhfsstone,
-         rpc.lockd, rpc.mountd, rpc.nfsd, rpc.rquotad, rpc.statd, showmount</seg>
+         rpc.lockd, rpc.mountd, rpc.nfsd, rpc.rquotad, rpc.statd, and showmount</seg>
     <seg>None</seg>
     <seg>/var/lib/nfs</seg>
@@ -224,5 +237,5 @@
   <term><command>exportfs</command></term>
   <listitem>
-    <para>maintains a list of NFS exported file systems.</para>
+    <para>maintains a list of <acronym>NFS</acronym> exported file systems.</para>
     <indexterm zone="nfs-utils exportfs">
       <primary sortas="b-exportfs">exportfs</primary>
@@ -234,5 +247,5 @@
   <term><command>nfsstat</command></term>
   <listitem>
-    <para>prints NFS statistics.</para>
+    <para>prints <acronym>NFS</acronym> statistics.</para>
     <indexterm zone="nfs-utils nfsstat">
       <primary sortas="b-nfsstat">nfsstat</primary>
@@ -244,5 +257,5 @@
   <term><command>nhfsgraph</command></term>
   <listitem>
-    <para>runs nhfsstone over multiple loads.</para>
+    <para>runs <command>nhfsstone</command> over multiple loads.</para>
     <indexterm zone="nfs-utils nhfsgraph">
       <primary sortas="b-nhfsgraph">nhfsgraph</primary>
@@ -254,5 +267,6 @@
   <term><command>nhfsnums</command></term>
   <listitem>
-    <para>converts raw numbers from nhfsstone output into plot format.</para>
+    <para>converts raw numbers from <command>nhfsstone</command> output 
+       into plot format.</para>
     <indexterm zone="nfs-utils nhfsnums">
       <primary sortas="b-nhfsnums">nhfsnums</primary>
@@ -264,5 +278,5 @@
   <term><command>nhfsrun</command></term>
   <listitem>
-    <para>executes nhfsstone with a range of different loads.</para>
+    <para>executes <command>nhfsstone</command> with a range of different loads.</para>
     <indexterm zone="nfs-utils nhfsrun">
       <primary sortas="b-nhfsrun">nhfsrun</primary>
@@ -274,6 +288,6 @@
   <term><command>nhfsstone</command></term>
   <listitem>
-    <para>is used on a NFS client to generate an artificial load with a 
-          particular mix of NFS operations.</para>
+    <para>is used on a <acronym>NFS</acronym> client to generate an artificial load with a 
+          particular mix of <acronym>NFS</acronym> operations.</para>
     <indexterm zone="nfs-utils nhfsstone">
       <primary sortas="b-nhfsstone">nhfsstone</primary>
@@ -285,6 +299,6 @@
   <term><command>rpc.lockd</command></term>
   <listitem>
-    <para>starts the NFS lock manager (NLM) on kernels that don't
-       start it automatically.  However, since most kernels do start it 
+    <para>starts the <acronym>NFS</acronym> lock manager (<acronym>NLM</acronym>) 
+       on kernels that don't start it automatically.  However, since most kernels do start it 
        automatically it is usually not required.</para>
     <indexterm zone="nfs-utils rpclockd">
@@ -297,5 +311,6 @@
   <term><command>rpc.mountd</command></term>
   <listitem>
-    <para>implements the NFS mount protocol on an NFS server.</para>
+    <para>implements the <acronym>NFS</acronym> mount protocol on an 
+       <acronym>NFS</acronym> server.</para>
     <indexterm zone="nfs-utils rpcmountd">
       <primary sortas="b-rpcmountd">rpc.mountd</primary>
@@ -307,5 +322,6 @@
   <term><command>rpc.nfsd</command></term>
   <listitem>
-    <para>implements the user level part of the NFS service on the server.</para>
+    <para>implements the user level part of the <acronym>NFS</acronym> 
+       service on the server.</para>
     <indexterm zone="nfs-utils rpcnfsd">
       <primary sortas="b-rpcnfsd">rpc.nfsd</primary>
@@ -318,5 +334,5 @@
   <listitem>
     <para>is an rpc server which returns quotas for a user of a local file
-       system which is mounted by a remote machine over the NFS.</para>
+       system which is mounted by a remote machine over the <acronym>NFS</acronym>.</para>
     <indexterm zone="nfs-utils rpcrquotad">
       <primary sortas="b-rpcrquotad">rpc.rquotad</primary>
@@ -328,7 +344,8 @@
   <term><command>rpc.statd</command></term>
   <listitem>
-    <para>is used by the NFS file locking service, rpc.lockd, to implement 
-       lock recovery when the NFS server machine crashes and reboots. Runs
-       on the NFS server only.</para>
+    <para>is used by the <acronym>NFS</acronym> file locking service, 
+       <command>rpc.lockd</command>, to implement lock recovery when the 
+       <acronym>NFS</acronym> server machine crashes and reboots. Runs
+       on the <acronym>NFS</acronym> server only.</para>
     <indexterm zone="nfs-utils rpcstatd">
       <primary sortas="b-rpcstatd">rpc.statd</primary>
@@ -340,5 +357,5 @@
   <term><command>showmount</command></term>
   <listitem>
-    <para>displays mount information for an NFS server.</para>
+    <para>displays mount information for an <acronym>NFS</acronym> server.</para>
     <indexterm zone="nfs-utils showmount">
       <primary sortas="b-showmount">showmount</primary>
