Index: basicnet/netprogs/cvs/cvs-config.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-config.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netprogs/cvs/cvs-config.xml	(revision 3cfb81c88d87dd9db6691e80a68ce7b58913e21f)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring cvs</title>
+<title>Configuring <application>cvs</application></title>
 
 <sect3><title>Config files</title>
@@ -8,6 +8,6 @@
 <sect3><title>Configuration Information</title>
 
-<para><filename>~/.cvsrc</filename> is the main cvs configuration file.  This file is used by
-users to specify defaults for different cvs commands, for example to
+<para><filename>~/.cvsrc</filename> is the main <application>cvs</application> configuration file.
+This file is used by users to specify defaults for different cvs commands, for example to
 make all cvs diff commands run with -u, a user would add diff -u to
 their <filename>.cvsrc</filename> file.</para>
Index: basicnet/netprogs/cvs/cvs-desc.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netprogs/cvs/cvs-desc.xml	(revision 3cfb81c88d87dd9db6691e80a68ce7b58913e21f)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The cvs package contains <userinput>cvs</userinput>, <userinput>cvsbug</userinput> and
-<userinput>rcs2log</userinput>.</para>
+<para>The <application><acronym>cvs</acronym></application> package contains <command>cvs</command>, <command>cvsbug</command> and
+<command>rcs2log</command>.</para>
 
 </sect2>
@@ -14,9 +14,10 @@
 
 <sect3><title>cvsbug</title>
-<para>This is used to send problem reports about CVS to a central
+<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>RCS to ChangeLog generator.</para></sect3>
+<para><acronym>RCS</acronym> to ChangeLog generator.</para></sect3>
 
 </sect2>
Index: basicnet/netprogs/cvs/cvs-inst.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-inst.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netprogs/cvs/cvs-inst.xml	(revision 3cfb81c88d87dd9db6691e80a68ce7b58913e21f)
@@ -1,14 +1,24 @@
 <sect2>
-<title>Installation of cvs</title>
+<title>Installation of <application><acronym>cvs</acronym></application></title>
 
-<para>If you are going to use the patch mentioned above, first apply it:
-<screen><userinput>patch -Np1 -i ../cvs-1.11.5-zlib.patch</userinput></screen></para>
+<para>The <filename>cvs-&cvs-version;-zlib.patch</filename> patch is
+used to compile <application><acronym>CVS</acronym></application>
+dynamically against <application>zlib</application> instead of using the version
+included with the <application><acronym>CVS</acronym></application>
+source. This has the advantage that if (or when) there is a security
+vulnerability found in <application>zlib</application>, you don't need to wait for a
+new version of <application><acronym>CVS</acronym></application> to
+appear as once you have upgraded <application>zlib</application>, the problem
+will be fixed.</para>
 
-<para>Install cvs by running the following commands:</para>
+<para>If you are going to use the patch mentioned above, first apply it:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen>
-</para>
+<screen><userinput><command>patch -Np1 -i ../cvs-&cvs-version;-zlib.patch</command></userinput></screen>
+
+<para>Install <application><acronym>cvs</acronym></application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netprogs/cvs/cvs-intro.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-intro.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netprogs/cvs/cvs-intro.xml	(revision 3cfb81c88d87dd9db6691e80a68ce7b58913e21f)
@@ -1,21 +1,21 @@
 <sect2>
-<title>Introduction to cvs</title>
+<title>Introduction to <application><acronym>cvs</acronym></application></title>
 
-<screen>Download location (HTTP):       <ulink url="&cvs-download-http;"/>
-Download location (FTP):        <ulink url="&cvs-download-ftp;"/>
-Version used:                   &cvs-version;
-Package size:                   &cvs-size;
-Estimated Disk space required:  &cvs-buildsize;</screen>
-
-<para>CVS is the concurrent versioning system. This is useful for
+<para><application><acronym>CVS</acronym></application> is the concurrent versioning system. This is useful for
 projects on which multiple people are working or where archives of
 previous versions of files need to be kept.</para>
 
-<para>The <filename>cvs-&cvs-version;-zlib.patch</filename> patch is used to
-compile CVS dynamically against zlib instead of using the version included
-with the CVS source.  This has the advantage that if (or when) there is 
-a security vulnerability found in zlib, you don't need to wait for a new
-version of CVS to appear as once you have upgraded zlib, the problem will be
-fixed.  You can download the cvs patch at <ulink url="&hfile-root;"/>.</para>
+<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 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>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Optional Patch: <ulink url="&hfile-root;/cvs-&cvs-version;-zlib.patch"/></para></listitem></itemizedlist></sect3>
 
 </sect2>
Index: basicnet/netprogs/cvs/cvs.ent
===================================================================
--- basicnet/netprogs/cvs/cvs.ent	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netprogs/cvs/cvs.ent	(revision 3cfb81c88d87dd9db6691e80a68ce7b58913e21f)
@@ -5,8 +5,7 @@
 <!ENTITY cvs-config SYSTEM "cvs-config.xml">
 <!ENTITY cvs-buildsize "14 MB">
-<!ENTITY cvs-version "1.11.5">
-<!ENTITY cvs-download-http "http://ftp.cvshome.org/cvs-&cvs-version;/cvs-&cvs-version;.tar.gz">
-<!ENTITY cvs-download-ftp "ftp://ftp.cvshome.org/pub/cvs-&cvs-version;/cvs-&cvs-version;.tar.gz">
-<!ENTITY cvs-patch-http "&hfile-root;/cvs-1.11.2-zlib.patch.bz2">
-<!ENTITY cvs-patch-ftp "&ffile-root;/cvs-1.11.2-zlib.patch.bz2">
-<!ENTITY cvs-size "2.6 MB">
+<!ENTITY cvs-version "1.11.6">
+<!ENTITY cvs-download-http "">
+<!ENTITY cvs-download-ftp "ftp://ftp.cvshome.org/pub/release/stable/cvs-&cvs-version;/cvs-&cvs-version;.tar.bz2">
+<!ENTITY cvs-size "2.1 MB">
+<!ENTITY cvs-time "0.37 SBU">
