Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision 3c88826a3c0aaeaabc3c1813636799b918158b24)
+++ basicnet/netprogs/cvs.xml	(revision b3497e457d1493ed94bd168b1fb77ec684f7ec7d)
@@ -14,124 +14,185 @@
 
 <sect1 id="cvs" xreflabel="CVS-&cvs-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="cvs.html"?>
-<title>CVS-&cvs-version;</title>
+  <?dbhtml filename="cvs.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>CVS</acronym></application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para><application><acronym>CVS</acronym></application> is the Concurrent 
-Versioning System. This is a version control system useful for projects
-using a central repository to hold files and then track all changes made to 
-those files. These instructions install the client used to manipulate the
-repository, creation of a repository is covered at <xref linkend="cvsserver"/>.
-</para>
+  <title>CVS-&cvs-version;</title>
+  
+  <indexterm zone="cvs">
+    <primary sortas="a-CVS">CVS</primary>
+  </indexterm>
+  
+  <sect2 role="package">
+    <title>Introduction to CVS</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&cvs-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&cvs-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &cvs-md5sum;</para></listitem>
-<listitem><para>Download size: &cvs-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&cvs-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&cvs-time;</para></listitem></itemizedlist>
-</sect3>
+    <para><application>CVS</application> is the Concurrent Versioning System. 
+    This is a version control system useful for projects using a central repository 
+    to hold files and then track all changes made to those files. These instructions 
+    install the client used to manipulate the repository, creation of a repository is 
+    covered at <xref linkend="cvsserver"/>.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&cvs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&cvs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &cvs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &cvs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &cvs-buildsize;</para>
+      </listitem>
+      <listitem>
+      <para>Estimated build time: &cvs-time;</para></listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Recommended patch: <ulink
+        url="&patch-root;/cvs-&cvs-version;-zlib-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">CVS Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="gdbm"/>,
+    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
+    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
+    <xref linkend="gs"/> or <xref linkend="espgs"/>,
+    <ulink url="../server/mail.html">MTA</ulink> and
+    <xref linkend="vim"/></para>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Recommended patch: <ulink
-url="&patch-root;/cvs-&cvs-version;-zlib-1.patch"/>
-</para></listitem>
-</itemizedlist></sect3>
+  </sect2>
 
-<sect3><title><application>CVS</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="gdbm"/>,
-<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
-<xref linkend="gs"/> or <xref linkend="espgs"/>,
-<ulink url="../server/mail.html">MTA</ulink> and
-<xref linkend="vim"/></para>
-</sect4>
-</sect3>
+  <sect2 role="installation">
+    <title>Installation of CVS</title>
 
-</sect2>
+    <para>By default <application>CVS</application>
+    is statically linked against the zlib library included in its source
+    tree. This makes it exposed to possible security vulnerabilities in that
+    library. If you want to modify CVS to use the newest system shared zlib
+    library apply the following patch:</para>
 
-<sect2>
-<title>Installation of <application><acronym>CVS</acronym></application></title>
+<screen><userinput>patch -Np1 -i ../cvs-&cvs-version;-zlib-1.patch</userinput></screen>
 
-<para>By default <application><acronym>CVS</acronym></application>
-is statically linked against the zlib library included in its source
-tree. This makes it exposed to possible security vulnerabilities in that
-library. If you want to modify CVS to use the newest system shared zlib
-library apply the following patch:</para>
+    <para>Install <application>cvs</application> by running 
+    the following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../cvs-&cvs-version;-zlib-1.patch</command></userinput></screen>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen>
 
-<para>Install <application><acronym>cvs</acronym></application> by running 
-the following commands:</para>
+  </sect2>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+  <sect2 role="configuration">
+    <title>Configuring CVS</title>
+    
+    <sect3 id="cvs-config">
+      <title>Config Files</title>
+      
+      <para><filename>~/.cvsrc</filename>, <filename>~/.cvswrappers</filename>,
+      and <filename>~/.cvspass</filename>.</para>
+      
+      <indexterm zone="cvs cvs-config">
+        <primary sortas="e-AA.cvsrc">~/.cvsrc</primary>
+      </indexterm>
+      
+      <indexterm zone="cvs cvs-config">
+        <primary sortas="e-AA.cvswrappers">~/.cvswrappers</primary>
+      </indexterm>
+      
+      <indexterm zone="cvs cvs-config">
+        <primary sortas="e-AA.cvspass">~/.cvspass</primary>
+      </indexterm>
+      
+    </sect3>
 
-</sect2>
+    <sect3>
+      <title>Configuration Information</title>
 
-<sect2>
-<title>Configuring <application><acronym>CVS</acronym></application></title>
+      <para><filename>~/.cvsrc</filename> is the main
+      <application>CVS</application> configuration file.
+      This file is used by users to specify defaults for different <command>cvs
+      </command> commands, for example to make all <command>cvs diff</command> 
+      commands run with <userinput>-u</userinput>, a user would add <userinput>
+      diff -u</userinput> to their <filename>.cvsrc</filename> file.</para>
 
-<sect3><title>Config files</title>
-<para><filename>~/.cvsrc</filename>, <filename>~/.cvswrappers</filename></para>
-</sect3>
+      <para><filename>~/.cvswrappers</filename> specifies wrappers to be used in 
+      addition to those specified in the <filename>CVSROOT/cvswrappers</filename> 
+      file in the repository.</para>
+      
+      <para><filename>~/.cvspass</filename> can hold passwords to complete
+      logins to servers.</para>
+      
+    </sect3>
 
-<sect3><title>Configuration Information</title>
+  </sect2>
 
-<para><filename>~/.cvsrc</filename> is the main
-<application><acronym>CVS</acronym></application> configuration file.
-This file is used by users to specify defaults for different <command>cvs
-</command> commands, for example to make all <command>cvs diff</command> 
-commands run with <userinput>-u</userinput>, a user would add <userinput>
-diff -u</userinput> to their <filename>.cvsrc</filename> file.</para>
-
-<para><filename>~/.cvswrappers</filename> specifies wrappers to be used in 
-addition to those specified in the <filename>CVSROOT/cvswrappers</filename> 
-file in the repository.</para>
-
-<para><filename>~/.cvspass</filename> can hold passwords to complete
-logins to servers.</para></sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>CVS</acronym></application> package contains 
-<command>cvs</command>, <command>cvsbug</command> and 
-<command>rcs2log</command>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>cvs</title>
-<para>This is the main program file for the concurrent versioning 
-system.</para></sect3>
-
-<sect3><title>cvsbug</title>
-<para>This is used to send problem reports about
-<application><acronym>CVS</acronym></application> to a central
-support site.</para></sect3>
-
-<sect3><title>rcs2log</title>
-<para><acronym>RCS</acronym> to Change Log generator.</para></sect3>
-
-</sect2>
-
+  <sect2 role="content">
+    <title>Contents</title>
+    
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>cvs, cvsbug, and rcs2log</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+     
+      <varlistentry id="cvs-prog">
+        <term><command>cvs</command></term>
+        <listitem>
+          <para>is the main program file for the concurrent versioning system.</para>
+          <indexterm zone="cvs cvs-prog">
+            <primary sortas="b-cvs">cvs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="cvsbug">
+        <term><command>cvsbug</command></term>
+        <listitem>
+          <para>is used to send problem reports about <application>CVS</application> 
+          to a central support site.</para>
+          <indexterm zone="cvs cvsbug">
+            <primary sortas="b-cvsbug">cvsbug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="rcs2log">
+        <term><command>rcs2log</command></term>
+        <listitem>
+          <para>RCS to Change Log generator.</para>
+          <indexterm zone="cvs rcs2log">
+            <primary sortas="b-rcs2log">rcs2log</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+    </variablelist>
+    
+  </sect2>
+  
 </sect1>
