Reverted last commit made by error.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5329 af4574ff-66df-0310-9fd7-8a98e5e911e0

basicnet/mailnews/fetchmail.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">fetchmail-&fetchmail-version;.tar</keyword>
-      <keyword role="ftptdir">fetchmail</keyword>
-    </keywordset>
   </sect1info>
 
   <title>Fetchmail-&fetchmail-version;</title>
@@ -63,11 +59,10 @@
     <bridgehead renderas="sect3">Fetchmail Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="openssl"/> and a local MDA
-    (<xref linkend="procmail"/>)</para>
+    <para><xref linkend="openssl"/> and a local MDA (<xref linkend="procmail"/>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> and <xref linkend="tk"/></para>
+    <para><xref linkend="python"/> and <xref linkend="tk"/></para>
 
   </sect2>
 

basicnet/mailnews/mutt.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">mutt-&mutt-version;.tar</keyword>
-      <keyword role="ftptdir">mutt</keyword>
-    </keywordset>
   </sect1info>
 
   <title>Mutt-&mutt-version;</title>
@@ -57,7 +53,7 @@
     <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnupg"/>,
+    <para><xref linkend="gnupg"/>,
       <xref linkend="ispell"/>,
       <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
       <xref linkend="cyrus-sasl"/>,

basicnet/mailnews/nail.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">nail-&nail-version;.tar</keyword>
-      <keyword role="ftptdir">nail</keyword>
-    </keywordset>
   </sect1info>
 
   <title>Nail-&nail-version;</title>
@@ -65,7 +61,7 @@
     <bridgehead renderas="sect3">Nail Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/> or Mozilla NSS (from
+    <para><xref linkend="openssl"/> or Mozilla NSS (from
     <xref linkend="mozilla"/> or
     <xref linkend="firefox"/> or
     <xref linkend="thunderbird"/>),

basicnet/mailnews/pine.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">pine&pine-version;.tar</keyword>
-      <keyword role="ftptdir">pine</keyword>
-    </keywordset>
   </sect1info>
 
   <title>Pine-&pine-version;</title>
@@ -71,10 +67,10 @@
     <bridgehead renderas="sect3">Pine Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="openssl"/></para>
+    <para><xref linkend="openssl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/> and <xref linkend="mitkrb"/></para>
+    <para><xref linkend="openldap"/> and <xref linkend="mitkrb"/></para>
 
   </sect2>
 

basicnet/mailnews/procmail.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">procmail-&procmail-version;.tar</keyword>
-      <keyword role="ftptdir">procmail</keyword>
-    </keywordset>
   </sect1info>
 
   <title>Procmail-&procmail-version;</title>

basicnet/mailnews/slrn.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">slrn-&slrn-version;.tar</keyword>
-      <keyword role="ftptdir">slrn</keyword>
-    </keywordset>
   </sect1info>
 
   <title>Slrn-&slrn-version;</title>
@@ -63,11 +59,11 @@
     <bridgehead renderas="sect3">Slrn Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="slang"/> and a
+    <para><xref linkend="slang"/> and a
     MTA (See <xref linkend="server-mail"/>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>,
+    <para><xref linkend="openssl"/>,
     <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
     <ulink url="http://www.fpx.de/fp/Software/UUDeview/">UUDeview</ulink>,
     <ulink url="http://www.isc.org/index.pl?/sw/inn/">INN</ulink> and

basicnet/netlibs/curl.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">curl-&curl-version;.tar</keyword>
-      <keyword role="ftptdir">curl</keyword>
-    </keywordset>
   </sect1info>
 
   <title>CURL-&curl-version;</title>
@@ -64,7 +60,7 @@
     <bridgehead renderas="sect3">CURL Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pkgconfig"/>,
+    <para><xref linkend="pkgconfig"/>,
     <xref linkend="openssl"/> or
     <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
     <xref linkend="openldap"/>,
@@ -75,7 +71,7 @@
     <ulink url="http://daniel.haxx.se/projects/c-ares/">c-ares</ulink></para>
 
     <bridgehead renderas="sect4">Optional (for Running the Test Suite)</bridgehead>
-    <para role="optional"><xref linkend="stunnel"/> (for running HTTPS and FTPS tests) and
+    <para><xref linkend="stunnel"/> (for running HTTPS and FTPS tests) and
     <ulink url="http://valgrind.kde.org/">Valgrind</ulink> (not used if building
     the shared library)</para>
 

basicnet/netlibs/gnet.xml

@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnet-&gnet-version;.tar</keyword>
-      <keyword role="ftptdir">gnet</keyword>
-    </keywordset>
   </sect1info>
 
   <title>GNet-&gnet-version;</title>
@@ -62,7 +58,7 @@
     <bridgehead renderas="sect3">GNet Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GLib"/> or <xref linkend="glib2"/></para>
+    <para><xref linkend="GLib"/> or <xref linkend="glib2"/></para>
 
   </sect2>
 

template/template.xml

@@ -23,13 +23,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <!-- The actual package name but without .bz2 or .gz extension -->
-      <keyword role="package">TEMPLATE-&TEMPLATE-version;.tar</keyword>
-      <!-- The subdir under BLFS/conglomeration/ in where the package
-      is stored on the FTP mirrors -->
-      <keyword role="ftptdir">TEMPLATE</keyword>
-    </keywordset>
   </sect1info>
 
   <!-- No other tags inside any title-->
@@ -89,16 +82,16 @@
     <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="BLFS DEPENDENCY"/></para>
+    <para><xref linkend="BLFS DEPENDENCY"/></para>
 
     <!-- As required -->
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>,
+    <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>,
     <xref linkend="BLFS DEPENDENCY"/></para>
 
     <!-- As required -->
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
+    <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
 
   </sect2>