Index: basicnet/mailnews/fetchmail.xml
===================================================================
--- basicnet/mailnews/fetchmail.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/mailnews/fetchmail.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -22,8 +22,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">fetchmail-&fetchmail-version;.tar</keyword>
-      <keyword role="ftpdir">fetchmail</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/mailnews/mailx.xml
===================================================================
--- basicnet/mailnews/mailx.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/mailnews/mailx.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">mailx-&mailx-version;.tar</keyword>
-      <keyword role="ftpdir">mailx</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/mailnews/mutt.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">mutt-&mutt-version;.tar</keyword>
-      <keyword role="ftpdir">mutt</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/mailnews/pine.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">pine&pine-version;.tar</keyword>
-      <keyword role="ftpdir">pine</keyword>
-    </keywordset>
   </sect1info>
 
@@ -110,5 +106,5 @@
 
     <para><command>patch -Np1 -i ../pine-&pine-version;-utf8-1.patch</command>:
-    This patch enables Pine UTF-8 and charset conversion.</para> 
+    This patch enables Pine UTF-8 and charset conversion.</para>
 
     <para><command>sed -i "s@/usr/ ... /lib/pine *)</command>: This
Index: basicnet/mailnews/procmail.xml
===================================================================
--- basicnet/mailnews/procmail.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/mailnews/procmail.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">procmail-&procmail-version;.tar</keyword>
-      <keyword role="ftpdir">procmail</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/mailnews/slrn.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">slrn-&slrn-version;.tar</keyword>
-      <keyword role="ftpdir">slrn</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/mailnews/tin.xml
===================================================================
--- basicnet/mailnews/tin.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/mailnews/tin.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">tin-&tin-version;.tar</keyword>
-      <keyword role="ftpdir">tin</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netlibs/curl.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">curl-&curl-version;.tar</keyword>
-      <keyword role="ftpdir">curl</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netlibs/gnet.xml
===================================================================
--- basicnet/netlibs/gnet.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netlibs/gnet.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnet-&gnet-version;.tar</keyword>
-      <keyword role="ftpdir">gnet</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netlibs/libpcap.xml
===================================================================
--- basicnet/netlibs/libpcap.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netlibs/libpcap.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -20,8 +20,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libpcap-&libpcap-version;.tar</keyword>
-      <keyword role="ftpdir">libpcap</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netlibs/wvstreams.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -31,8 +31,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">wvstreams-&wvstreams-version;.tar</keyword>
-      <keyword role="ftpdir">wvstreams</keyword>
-    </keywordset>
   </sect1info>
 
@@ -138,5 +134,5 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i ...</command>: Change to tcl8.4 from tcl8.3.</para> 
+    <para><command>sed -i ...</command>: Change to tcl8.4 from tcl8.3.</para>
 
     <para><parameter>--sysconfdir=/etc</parameter>: This parameter places
Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/cvs.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">cvs-&cvs-version;.tar</keyword>
-      <keyword role="ftpdir">cvs</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/inetutils.xml
===================================================================
--- basicnet/netprogs/inetutils.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/inetutils.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">inetutils-&inetutils-version;.tar</keyword>
-      <keyword role="ftpdir">inetutils</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/ncftp.xml
===================================================================
--- basicnet/netprogs/ncftp.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/ncftp.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -32,8 +32,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">ncftp-&ncftp-version;-src.tar</keyword>
-      <keyword role="ftpdir">ncftp</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/ncpfs.xml
===================================================================
--- basicnet/netprogs/ncpfs.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/ncpfs.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -31,8 +31,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">ncpfs-&ncpfs-version;.tar</keyword>
-      <keyword role="ftpdir">ncpfs</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/net-tools.xml
===================================================================
--- basicnet/netprogs/net-tools.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/net-tools.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -20,8 +20,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">net-tools-&net-tools-version;.tar</keyword>
-      <keyword role="ftpdir">net-tools</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/netprogs.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cvs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncftp.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncftp.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncpfs.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="net-tools.xml"/>
Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/ntp.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">ntp-&ntp-version;.tar</keyword>
-      <keyword role="ftpdir">ntp</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/othernetprogs.xml
===================================================================
--- basicnet/netprogs/othernetprogs.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/othernetprogs.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -15,9 +15,9 @@
 
   <title>Other Networking Programs</title>
-    
+
   <para condition="html" role="usernotes">User Notes:
   <ulink url="&blfs-wiki;/othernetprogs"/></para>
 
-  <para><application>NCPFS</application> contains client and administration 
+  <para><application>NCPFS</application> contains client and administration
   tools for use with Novell networks.  See the User Notes for details.</para>
 
Index: basicnet/netprogs/portmap.xml
===================================================================
--- basicnet/netprogs/portmap.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/portmap.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -31,8 +31,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">portmap_&portmap-version;.tar</keyword>
-      <keyword role="ftpdir">portmap</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/subversion.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -34,8 +34,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">subversion-&subversion-version;.tar</keyword>
-      <keyword role="ftpdir">subversion</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/tcpwrappers.xml
===================================================================
--- basicnet/netprogs/tcpwrappers.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/tcpwrappers.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">tcp_wrappers_&tcpwrappers-version;.tar</keyword>
-      <keyword role="ftpdir">tcp_wrappers</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/wget.xml
===================================================================
--- basicnet/netprogs/wget.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/wget.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">wget-&wget-version;.tar</keyword>
-      <keyword role="ftpdir">wget</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netprogs/wireless-tools.xml
===================================================================
--- basicnet/netprogs/wireless-tools.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netprogs/wireless-tools.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">wireless-tools-&wireless-tools-version;.tar</keyword>
-      <keyword role="ftpdir">wireless_tools</keyword>
-    </keywordset>
   </sect1info>
 
@@ -92,8 +88,8 @@
     The drivers are located in Device Drivers &rarr; Network Device Support
     &rarr; Wireless LAN (non-hamradio).  There are also external drivers
-    available for some very common cards.  For more information, look 
-    at the user notes.</para> 
-
-    <para>After the correct drivers are loaded, the interface will 
+    available for some very common cards.  For more information, look
+    at the user notes.</para>
+
+    <para>After the correct drivers are loaded, the interface will
     appear in <filename>/proc/net/wireless</filename>.</para>
 
@@ -124,5 +120,5 @@
      This modification is necessary to properly compile inline functions
      with GCC4.</para>
-    
+
   </sect2>
 -->
Index: basicnet/netutils/bind-utils.xml
===================================================================
--- basicnet/netutils/bind-utils.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netutils/bind-utils.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -31,8 +31,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">bind-&bind-version;.tar</keyword>
-      <keyword role="ftpdir">bind</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netutils/ethereal.xml
===================================================================
--- basicnet/netutils/ethereal.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netutils/ethereal.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">ethereal-&ethereal-version;.tar</keyword>
-      <keyword role="ftpdir">ethereal</keyword>
-    </keywordset>
   </sect1info>
 
@@ -66,6 +62,6 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact"> 
-      <listitem> 
+    <itemizedlist spacing="compact">
+      <listitem>
         <para>Additional Documentation: <ulink
         url="http://www.ethereal.com/docs/"/></para>
Index: basicnet/netutils/netutils.xml
===================================================================
--- basicnet/netutils/netutils.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netutils/netutils.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -16,5 +16,5 @@
   <para condition="html" role="usernotes">User Notes:
   <ulink url="&blfs-wiki;/basicnetworkingutilities"/></para>
-  
+
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="traceroute.xml"/>
Index: basicnet/netutils/nmap.xml
===================================================================
--- basicnet/netutils/nmap.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netutils/nmap.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -31,8 +31,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">nmap-&nmap-version;.tar</keyword>
-      <keyword role="ftpdir">nmap</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netutils/traceroute.xml
===================================================================
--- basicnet/netutils/traceroute.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netutils/traceroute.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -31,8 +31,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">traceroute-&traceroute-version;.tar</keyword>
-      <keyword role="ftpdir">traceroute</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/netutils/whois.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">whois_&whois-version;.tar</keyword>
-      <keyword role="ftpdir">whois</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/textweb/links.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">links-&Links-version;.tar</keyword>
-      <keyword role="ftpdir">links</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/textweb/lynx.xml
===================================================================
--- basicnet/textweb/lynx.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/textweb/lynx.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">lynx&lynx-version;.tar</keyword>
-      <keyword role="ftpdir">lynx</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision c82b8e09c034669bd6fbab35a96d31ec4b8ddf3c)
+++ basicnet/textweb/w3m.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">w3m-&w3m-version;.tar</keyword>
-      <keyword role="ftpdir">w3m</keyword>
-    </keywordset>
   </sect1info>
 
