Index: basicnet/netprogs/tcpwrappers.xml
===================================================================
--- basicnet/netprogs/tcpwrappers.xml	(revision 68196987afc11086797f6c91947427e24288a630)
+++ basicnet/netprogs/tcpwrappers.xml	(revision 17d22d999b8cae5e7e6e43f61d2d83649417cbb8)
@@ -5,16 +5,4 @@
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
   <!ENTITY tcpwrappers-download-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_&tcpwrappers-version;.tar.gz">
   <!ENTITY tcpwrappers-download-ftp  "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_&tcpwrappers-version;.tar.gz">
@@ -22,8 +10,8 @@
   <!ENTITY tcpwrappers-size          "97 KB">
   <!ENTITY tcpwrappers-buildsize     "1.09 MB">
-  <!ENTITY tcpwrappers-time          "0.03 SBU">
+  <!ENTITY tcpwrappers-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="tcpwrappers" xreflabel="tcpwrappers-&tcpwrappers-version;">
+<sect1 id="tcpwrappers" xreflabel="TCP Wrapper-&tcpwrappers-version;">
   <?dbhtml filename="tcpwrappers.html"?>
 
@@ -37,14 +25,14 @@
   </sect1info>
 
-  <title>Tcpwrappers-&tcpwrappers-version;</title>
+  <title>TCP Wrapper-&tcpwrappers-version;</title>
 
   <indexterm zone="tcpwrappers">
-   <primary sortas="a-Tcpwrappers">Tcpwrappers</primary>
+   <primary sortas="a-TCP Wrapper">TCP Wrapper</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Tcpwrappers</title>
-
-      <para>The <application>tcpwrappers</application> package provides daemon
+    <title>Introduction to TCP Wrapper</title>
+
+      <para>The <application>TCP Wrapper</application> package provides daemon
       wrapper programs that report the name of the client requesting network
       services and the requested service.</para>
@@ -75,5 +63,5 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required Patch (Fixes some build issues and adds building of a
+        <para>Required Patch (Fixes some build issues and adds building a
         shared library): <ulink
         url="&patch-root;/tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch"/></para>
@@ -87,7 +75,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Tcpwrappers</title>
-
-    <para>Install <application>tcpwrappers</application> with the following
+    <title>Installation of TCP Wrapper</title>
+
+    <para>Install <application>TCP Wrapper</application> with the following
     commands:</para>
 
@@ -96,4 +84,6 @@
 make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -107,10 +97,10 @@
     <para><command>sed -i -e ... scaffold.c</command>: This command removes an
     obsolete C declaration which causes the build to fail if using
-    <application>GCC-3.4.x</application>.</para>
+    <application>GCC >= 3.4.x</application>.</para>
 
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring Tcpwrappers</title>
+    <title>Configuring TCP Wrapper</title>
 
     <sect3 id="tcpwrappers-config">
@@ -244,6 +234,6 @@
         <listitem>
           <para>contains the API functions required by
-          the <application>tcpwrappers</application> programs as well as other programs
-          to become <quote><application>tcpwrappers</application>-aware</quote>.</para>
+          the <application>TCP Wrapper</application> programs as well as other programs
+          to become <quote><application>TCP Wrapper</application>-aware</quote>.</para>
           <indexterm zone="tcpwrappers libwrap">
             <primary sortas="c-libwrap">libwrap.{so,a}</primary>
@@ -257,3 +247,2 @@
 
 </sect1>
-
