Index: basicnet/mailnews/fetchmail.xml
===================================================================
--- basicnet/mailnews/fetchmail.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/mailnews/fetchmail.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -45,5 +45,5 @@
 <sect4><title>Required</title>
 
-<para><xref linkend="openssl"/> and a local MDA (<xref linkend="procmail"/>)
+<para><xref linkend="openssl-package"/> and a local MDA (<xref linkend="procmail"/>)
 </para>
 </sect4>
Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/mailnews/nail.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -50,5 +50,5 @@
 <sect3><title><application>Nail</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/> or 
+<para><xref linkend="openssl-package"/> or 
 Mozilla <acronym>NSS</acronym> (from 
 <xref linkend="mozilla"/> or 
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/mailnews/pine.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -50,5 +50,5 @@
 <sect3><title><application>Pine</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl"/></para></sect4>
+<para><xref linkend="openssl-package"/></para></sect4>
 <sect4><title>Optional</title>
 <para>
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/mailnews/slrn.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -43,5 +43,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl"/>,
+<xref linkend="openssl-package"/>,
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
 <ulink url="http://www.fpx.de/fp/Software/UUDeview/">UUDeview</ulink>,
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netlibs/curl.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -44,5 +44,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
@@ -96,5 +96,5 @@
 <para><command>curl</command> is a client that can get documents from or send 
 documents to any of the following protocols: <acronym>HTTP</acronym>, 
-<acronym>HTTPS</acronym> (needs <xref linkend="openssl"/>), 
+<acronym>HTTPS</acronym> (needs <xref linkend="openssl-package"/>), 
 <acronym>FTP</acronym>, GOPHER, DICT, TELNET, <acronym>LDAP</acronym> (needs 
 <xref linkend="openldap"/>) or FILE.</para></sect3>
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netlibs/wvstreams.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -44,5 +44,5 @@
 <sect4><title>Required</title>
 <para>
-<xref linkend="openssl"/>
+<xref linkend="openssl-package"/>
 </para></sect4>
 <sect4><title>Optional</title>
Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netprogs/ntp.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -38,5 +38,5 @@
 <sect3><title><application><acronym>NTP</acronym></application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/></para></sect4>
+<para><xref linkend="openssl-package"/></para></sect4>
 </sect3>
 
Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netprogs/subversion.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -58,5 +58,5 @@
 <xref linkend="apache"/>, 
 <xref linkend="j2sdk"/>, 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="openssh"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
Index: basicnet/netprogs/wget.xml
===================================================================
--- basicnet/netprogs/wget.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netprogs/wget.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -41,5 +41,5 @@
 <sect3><title><application>Wget</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/> and 
+<para><xref linkend="openssl-package"/> and 
 <ulink url="http://www.inet.no/dante/">Dante</ulink></para>
 </sect4>
Index: basicnet/netutils/bind-utils.xml
===================================================================
--- basicnet/netutils/bind-utils.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netutils/bind-utils.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -51,5 +51,5 @@
 dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/></para>
+<para><xref linkend="openssl-package"/></para>
 </sect4>
 </sect3>
Index: basicnet/netutils/ethereal.xml
===================================================================
--- basicnet/netutils/ethereal.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netutils/ethereal.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -61,5 +61,5 @@
 <xref linkend="GTK"/> or <xref linkend="gtk2"/> (to build the 
 <acronym>GUI</acronym> front-end), 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
 <xref linkend="python"/>, 
Index: basicnet/netutils/nmap.xml
===================================================================
--- basicnet/netutils/nmap.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/netutils/nmap.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -42,5 +42,5 @@
 <sect3><title><application>Nmap</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/>, 
+<para><xref linkend="openssl-package"/>, 
 <xref linkend="pcre"/>, 
 <xref linkend="GTK"/> (for building the graphical front-end) and 
Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/textweb/links.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -38,5 +38,5 @@
 <sect3><title><application>Links</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="gpm"/>, <xref linkend="openssl"/>, <xref linkend="libpng"/>,
+<para><xref linkend="gpm"/>, <xref linkend="openssl-package"/>, <xref linkend="libpng"/>,
 <xref linkend="libjpeg"/>, <xref linkend="libtiff"/>, <ulink
 url="http://www.svgalib.org/">SVGAlib</ulink>, 
Index: basicnet/textweb/lynx.xml
===================================================================
--- basicnet/textweb/lynx.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/textweb/lynx.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -40,5 +40,5 @@
 <sect3><title><application>Lynx</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/> or
+<para><xref linkend="openssl-package"/> or
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which
 needs <ulink
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ basicnet/textweb/w3m.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -43,5 +43,5 @@
 <para><xref linkend="pkgconfig"/>, 
 <xref linkend="gpm"/>, 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="imlib"/>, 
 <xref linkend="imlib2"/>, 
Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ content/databases/mysql.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -48,5 +48,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl"/>,
+<xref linkend="openssl-package"/>,
 <xref linkend="tcpwrappers"/>,
 <ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink> 
Index: content/databases/postgresql.xml
===================================================================
--- content/databases/postgresql.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ content/databases/postgresql.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -53,5 +53,5 @@
 <xref linkend="tcl"/>,
 <xref linkend="tk"/>,
-<xref linkend="openssl"/>,
+<xref linkend="openssl-package"/>,
 <xref linkend="Linux_PAM"/>,
 <xref linkend="sgml-dtd-3"/>, 
Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ content/web/apache.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -52,5 +52,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="db"/> or <xref linkend="gdbm"/>, 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="expat"/> and 
Index: content/web/php.xml
===================================================================
--- content/web/php.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ content/web/php.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -53,5 +53,5 @@
 <xref linkend="libxml2"/>,
 <xref linkend="libxslt"/>,
-<xref linkend="openssl"/>,
+<xref linkend="openssl-package"/>,
 <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
 <xref linkend="libjpeg"/>,
Index: content/web/vsftpd.xml
===================================================================
--- content/web/vsftpd.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ content/web/vsftpd.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -44,5 +44,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="Linux_PAM"/>,
-<xref linkend="openssl"/>, and
+<xref linkend="openssl-package"/>, and
 <xref linkend="tcpwrappers"/></para>
 </sect4>
Index: general.ent
===================================================================
--- general.ent	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ general.ent	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -29,4 +29,5 @@
 
 <!-- Chapter 4 -->                   
+<!ENTITY openssl-version              "0.9.7e">
 <!ENTITY cracklib-version             "2.7">   
 <!ENTITY Linux_PAM-version            "0.78">  
@@ -58,5 +59,4 @@
 <!-- Part III -->                    
 <!-- Chapter 8 -->                   
-<!ENTITY openssl-version              "0.9.7e">
 <!ENTITY pcre-version                 "5.0">
 <!ENTITY popt-version                 "1.7">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ general/genlib/genlib.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -14,5 +14,5 @@
 duplicate code (and risk introducing bugs), it just has to call
 functions from the libraries installed on the system.  The most obvious
-example of a set of libraries is <application>glibc</application> which is 
+example of a set of libraries is <application>Glibc</application> which is 
 installed during the <acronym>LFS</acronym> book.  This contains all of
 the <application>C</application> library functions which programs use.</para>
@@ -27,10 +27,10 @@
 <para>Generally, you only need to install libraries when you are
 installing software that needs the functionality they supply.  In
-the <acronym>BLFS</acronym> book, each package is presented with a list of (known)
-dependencies.  Thus, you can figure out which libraries you need to have
-before installing that program.  If you are installing something without
-using <acronym>BLFS</acronym> instructions, usually the <filename>README</filename>
-or <filename>INSTALL</filename> file will contain details of the 
-program's requirements.</para>
+the <acronym>BLFS</acronym> book, each package is presented with a list of 
+(known) dependencies.  Thus, you can figure out which libraries you need to 
+have before installing that program.  If you are installing something without 
+using <acronym>BLFS</acronym> instructions, usually the 
+<filename>README</filename> or <filename>INSTALL</filename> file will contain 
+details of the program's requirements.</para>
 
 <para>There are certain libraries which nearly <emphasis>everyone</emphasis> 
@@ -38,5 +38,4 @@
 explain why you may want to install them.</para>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssl.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pcre.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="popt.xml"/>
Index: general/genlib/libesmtp.xml
===================================================================
--- general/genlib/libesmtp.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ general/genlib/libesmtp.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -44,5 +44,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/></para>
+<para><xref linkend="openssl-package"/></para>
 </sect4>
 
Index: neral/genlib/openssl.xml
===================================================================
--- general/genlib/openssl.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY openssl-download-http "http://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-download-ftp "ftp://ftp.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-size "3.0 MB">
-<!ENTITY openssl-buildsize "35 MB">
-<!ENTITY openssl-time "1.16 SBU">
-]>
-
-<sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="openssl.html"?>
-<title>OpenSSL-&openssl-version;</title>
-
-<sect2>
-<title>Introduction to <application>Open<acronym>SSL</acronym></application>
-</title>
-
-<para>The <application>Open<acronym>SSL</acronym></application> package contains 
-management tools and libraries relating to cryptography.  These are useful for 
-providing cryptography functions to other packages, notably 
-<application>OpenSSH</application>, email applications and web browsers (for 
-accessing <acronym>HTTPS</acronym> sites).</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&openssl-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&openssl-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &openssl-size;</para></listitem>
-<listitem><para>Estimated disk space required: &openssl-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &openssl-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>Open<acronym>SSL</acronym></application> 
-dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="bc"/> (recommended
-if you run the test suite during the build)</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Open<acronym>SSL</acronym></application>
-</title>
-
-<para>Install <application>Open<acronym>SSL</acronym></application> by running 
-the following commands:</para>
-
-<screen><userinput><command>sed 's/^passwd/openssl-passwd/' doc/apps/passwd.pod \
-    > doc/apps/openssl-passwd.pod &amp;&amp;
-rm doc/apps/passwd.pod &amp;&amp;
-mv doc/crypto/{,openssl_}threads.pod &amp;&amp;
-./config --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;
-sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' Makefile &amp;&amp;
-make MANDIR=/usr/share/man &amp;&amp;
-make MANDIR=/usr/share/man install &amp;&amp;
-cp -r certs /etc/ssl</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><option>no-rc5 no-idea</option>: When added to the
-<command>./config</command> command, this will eliminate the building of those
-encryption methods. Patent licenses may be needed for you to utilize either of
-those methods in your projects.</para>
-
-<para><command>rm doc/apps/passwd.pod</command>: This command prevents
-<application>Open<acronym>SSL</acronym></application> from installing its
-passwd man page over an existing man page with the same name.</para>
-
-<para><command>mv doc/crypto/{,openssl_}threads.pod</command>: This
-commands prevents <application>Open<acronym>SSL</acronym></application> from
-overwriting an existing man page from <application>Perl</application>.</para>
-
-<para><command>sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' Makefile</command>:
-This command prevents installation of the non-existent <filename
-class="libraryfile">libfips</filename> library.</para>
-
-<para><screen><command>make MANDIR=/usr/share/man
-make MANDIR=/usr/share/man install</command></screen> These
-commands install <application>Open<acronym>SSL</acronym></application> with the 
-man pages in <filename class='directory'>/usr/share/man</filename> instead of 
-the default which is <filename class='directory'>/etc/ssl/man</filename>.</para>
-
-<para><command>cp -r certs /etc/ssl</command>: The certificates must be copied 
-manually since the install script skips this step.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>OpenSSL</application></title>
-
-<sect3><title>Config files</title>
-<para><filename>/etc/ssl/openssl.cnf</filename></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>Most people who just want to use 
-<application>Open<acronym>SSL</acronym></application> for providing functions
-to other programs such as <application>Open<acronym>SSH</acronym></application> 
-and web browsers won't need to worry about configuring 
-<application>Open<acronym>SSL</acronym></application>. Configuring
-<application>Open<acronym>SSL</acronym></application> is an advanced topic and 
-so those who do would normally be expected to either know how to do it
-or to be able to find out how to do it.</para>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>Open<acronym>SSL</acronym></application> package 
-contains <command>c_rehash</command>, <command>openssl</command>, 
-<filename class='libraryfile'>libcrypto</filename> libraries and 
-<filename class='libraryfile'>libssl</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>c_rehash</title>
-
-<para><command>c_rehash</command> is a <application>Perl</application> script
-that scans all files in a directory and adds symbolic links to their hash
-values.</para>
-
-</sect3>
-
-<sect3><title>openssl</title>
-
-<para>The <command>openssl</command> program is a command-line tool for using
-the various cryptography functions of
-<application>Open<acronym>SSL</acronym></application>'s
-crypto library from the shell. It can be used for various functions which are
-documented in <command>man 1 openssl</command>.</para>
-
-</sect3>
-
-<sect3><title>libcrypto</title>
-
-<para>The <application>Open<acronym>SSL</acronym></application> crypto library 
-implements a wide range of cryptographic algorithms used in various Internet 
-standards. The services provided by  this library are used by the
-<application>Open<acronym>SSL</acronym></application> implementations of 
-<acronym>SSL</acronym>, <acronym>TLS</acronym> and <acronym>S/MIME</acronym>, 
-and they have also been used to implement 
-<application>Open<acronym>SSH</acronym></application>,
-<application>Open<acronym>PGP</acronym></application>, and other cryptographic 
-standards.</para>
-
-</sect3>
-
-<sect3><title>libssl</title>
-
-<para>The <application>Open<acronym>SSL</acronym></application> 
-<acronym>SSL</acronym> library implements the Secure Sockets Layer 
-(<acronym>SSL</acronym> v2/v3) and Transport Layer Security 
-(<acronym>TLS</acronym> v1) protocols. It provides a rich 
-<acronym>API</acronym>, documentation on which can be found by running
-<command>man 3 ssl</command>.</para>
-
-</sect3>
-
-</sect2>
-
-</sect1>
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ general/prog/python.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -48,5 +48,5 @@
 <sect3><title><application>Python</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/>,
+<para><xref linkend="openssl-package"/>,
 <xref linkend="tk"/>, 
 <xref linkend="gdbm"/> and
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ general/prog/ruby.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -41,5 +41,5 @@
 <sect3><title><application>Ruby</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/>, 
+<para><xref linkend="openssl-package"/>, 
 <xref linkend="tk"/>, 
 <xref linkend="db"/>, 
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ gnome/core/gnome-vfs.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -60,5 +60,5 @@
 <xref linkend="gtk-doc"/>,
 <xref linkend="openssh"/>,
-<xref linkend="openssl"/> or
+<xref linkend="openssl-package"/> or
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ gnome/core/orbit2.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -51,5 +51,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/> and <xref linkend="openssl"/></para>
+<para><xref linkend="gtk-doc"/> and <xref linkend="openssl-package"/></para>
 </sect4>
 </sect3>
Index: gnome/otherlibs/gnome-vfs1.xml
===================================================================
--- gnome/otherlibs/gnome-vfs1.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ gnome/otherlibs/gnome-vfs1.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -63,5 +63,5 @@
 <xref linkend="GConf1"/>, 
 <xref linkend="bonobo14"/>, 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="CDParanoia"/>, 
 <xref linkend="gtk-doc"/> and 
Index: gnome/otherlibs/soup.xml
===================================================================
--- gnome/otherlibs/soup.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ gnome/otherlibs/soup.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -59,5 +59,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="apache"/>, 
-<xref linkend="openssl"/> or 
+<xref linkend="openssl-package"/> or 
 <xref linkend="mozilla"/> (for the <acronym>NSS</acronym> libraries), 
 <xref linkend="gtk-doc"/> and 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ introduction/welcome/changelog.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>January 12th, 2005 [randy]: Moved OpenSSL instructions from 
+Chapter 8 to Chapter 4, suggested by Torsten Vollmann.</para></listitem>
 
 <listitem><para>January 11th, 2005 [randy]: Moved libgtkhtml, GNOME-Doc-Utils 
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ kde/add/kdenetwork.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -47,5 +47,5 @@
 <xref linkend="libxml2"/>, 
 <xref linkend="libxslt"/> and 
-<xref linkend="openssl"/></para>
+<xref linkend="openssl-package"/></para>
 </sect4>
 
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ kde/add/kdepim.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -47,5 +47,5 @@
 <xref linkend="libxml2"/>, 
 <xref linkend="gnupg"/> and 
-<xref linkend="openssl"/></para>
+<xref linkend="openssl-package"/></para>
 </sect4>
 
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ kde/core/kdebase.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -59,5 +59,5 @@
 <xref linkend="libart_lgpl"/>, 
 <xref linkend="libxml2"/>, 
-<xref linkend="openssl"/> and 
+<xref linkend="openssl-package"/> and 
 <xref linkend="j2sdk"/></para>
 </sect4>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ kde/core/kdelibs.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -71,5 +71,5 @@
 <xref linkend="pcre"/>, 
 <xref linkend="fam"/>, 
-<xref linkend="openssl"/> and 
+<xref linkend="openssl-package"/> and 
 <ulink url="http://www.gnu.org/software/libidn/">Libidn</ulink></para>
 </sect4>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ postlfs/security/cyrus-sasl.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -46,5 +46,5 @@
 
 <sect4><title>Required</title>
-<para><xref linkend="openssl"/></para>
+<para><xref linkend="openssl-package"/></para>
 </sect4>
 
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ postlfs/security/heimdal.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -59,5 +59,5 @@
 <sect4><title>Required</title>
 <para>
-<xref linkend="openssl"/> and
+<xref linkend="openssl-package"/> and
 <xref linkend="db"/>
 </para></sect4>
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
+++ postlfs/security/openssl.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY openssl-download-http "http://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
+<!ENTITY openssl-download-ftp "ftp://ftp.openssl.org/source/openssl-&openssl-version;.tar.gz">
+<!ENTITY openssl-size "3.0 MB">
+<!ENTITY openssl-buildsize "35 MB">
+<!ENTITY openssl-time "1.16 SBU">
+]>
+
+<sect1 id="openssl-package" xreflabel="OpenSSL-&openssl-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="openssl.html"?>
+<title>OpenSSL-&openssl-version;</title>
+<indexterm zone="openssl-package">
+<primary sortas="a-OpenSSL-package">OpenSSL</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application>Open<acronym>SSL</acronym></application>
+</title>
+
+<para>The <application>Open<acronym>SSL</acronym></application> package 
+contains management tools and libraries relating to cryptography.  These are 
+useful for providing cryptography functions to other packages, notably 
+<application>OpenSSH</application>, email applications and web browsers (for 
+accessing <acronym>HTTPS</acronym> sites).</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&openssl-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&openssl-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &openssl-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&openssl-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&openssl-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Open<acronym>SSL</acronym></application> 
+dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="bc"/> (recommended
+if you run the test suite during the build)</para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Open<acronym>SSL</acronym></application>
+</title>
+
+<para>Install <application>Open<acronym>SSL</acronym></application> by running 
+the following commands:</para>
+
+<screen><userinput><command>sed 's/^passwd/openssl-passwd/' doc/apps/passwd.pod \
+    > doc/apps/openssl-passwd.pod &amp;&amp;
+rm doc/apps/passwd.pod &amp;&amp;
+mv doc/crypto/{,openssl_}threads.pod &amp;&amp;
+./config --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;
+sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' Makefile &amp;&amp;
+make MANDIR=/usr/share/man &amp;&amp;
+make MANDIR=/usr/share/man install &amp;&amp;
+cp -r certs /etc/ssl</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>no-rc5 no-idea</option>: When added to the
+<command>./config</command> command, this will eliminate the building of those
+encryption methods. Patent licenses may be needed for you to utilize either of
+those methods in your projects.</para>
+
+<para><command>rm doc/apps/passwd.pod</command>: This command prevents
+<application>Open<acronym>SSL</acronym></application> from installing its
+passwd man page over an existing man page with the same name.</para>
+
+<para><command>mv doc/crypto/{,openssl_}threads.pod</command>: This
+commands prevents <application>Open<acronym>SSL</acronym></application> from
+overwriting an existing man page from <application>Perl</application>.</para>
+
+<para><command>sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' 
+Makefile</command>: This command prevents installation of the non-existent 
+<filename class="libraryfile">libfips</filename> library.</para>
+
+<para><command>make MANDIR=/usr/share/man; make MANDIR=/usr/share/man 
+install</command>: These commands install 
+<application>Open<acronym>SSL</acronym></application> with the man pages in 
+<filename class='directory'>/usr/share/man</filename> instead of 
+<filename class='directory'>/etc/ssl/man</filename>.</para>
+
+<para><command>cp -r certs /etc/ssl</command>: The certificates must be copied 
+manually since the install script skips this step.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>OpenSSL</application></title>
+
+<sect3 id="openssl-config"><title>Config files</title>
+<para><filename>/etc/ssl/openssl.cnf</filename></para>
+<indexterm zone="openssl-package openssl-config">
+<primary sortas="e-etc-ssl-openssl.cnf">/etc/ssl/openssl.cnf</primary>
+</indexterm>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Most people who just want to use 
+<application>Open<acronym>SSL</acronym></application> for providing functions
+to other programs such as <application>Open<acronym>SSH</acronym></application> 
+and web browsers won't need to worry about configuring 
+<application>Open<acronym>SSL</acronym></application>. Configuring
+<application>Open<acronym>SSL</acronym></application> is an advanced topic and 
+so those who do would normally be expected to either know how to do it
+or to be able to find out how to do it.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>c_rehash and openssl</seg>
+<seg>libcrypto.[so,a] and libssl.[so,a]</seg>
+<seg>/etc/ssl and /usr/include/ssl</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="c_rehash">
+<term><command>c_rehash</command></term>
+<listitem><para>is a <application>Perl</application> script that scans all 
+files in a directory and adds symbolic links to their hash values.</para>
+<indexterm zone="openssl-package c_rehash">
+<primary sortas="b-c_rehash">c_rehash</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="openssl">
+<term><command>openssl</command></term>
+<listitem><para>is a command-line tool for using the various cryptography 
+functions of <application>Open<acronym>SSL</acronym></application>'s crypto 
+library from the shell. It can be used for various functions which are 
+documented in <command>man 1 openssl</command>.</para>
+<indexterm zone="openssl-package openssl">
+<primary sortas="b-openssl">openssl</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="libcrypto">
+<term><filename class='libraryfile'>libcrypto</filename></term>
+<listitem><para>implements a wide range of cryptographic algorithms used in 
+various Internet standards. The services provided by  this library are used by 
+the <application>Open<acronym>SSL</acronym></application> implementations of 
+<acronym>SSL</acronym>, <acronym>TLS</acronym> and <acronym>S/MIME</acronym>, 
+and they have also been used to implement 
+<application>Open<acronym>SSH</acronym></application>, 
+<application>Open<acronym>PGP</acronym></application>, and other cryptographic 
+standards.</para>
+<indexterm zone="openssl-package libcrypto">
+<primary sortas="c-libcrypto">libcrypto.[so,a]</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="libssl">
+<term><filename class='libraryfile'>libssl</filename></term>
+<listitem><para>implements the Secure Sockets Layer (<acronym>SSL</acronym> 
+v2/v3) and Transport Layer Security (<acronym>TLS</acronym> v1) protocols. It 
+provides a rich <acronym>API</acronym>, documentation on which can be found by 
+running <command>man 3 ssl</command>.</para>
+<indexterm zone="openssl-package libssl">
+<primary sortas="c-libssl">libssl.[so,a]</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ postlfs/security/security.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -25,6 +25,6 @@
 <para>Prevention of breaches, like a trojan, are assisted by applications like 
 <application>GnuPG</application>, specifically the ability to confirm signed 
-packages, which recognizes modifications of the <acronym>TAR</acronym> ball after 
-the packager creates it.</para>
+packages, which recognizes modifications of the <acronym>TAR</acronym> ball 
+after the packager creates it.</para>
 
 <para> Finally, we touch on detection with a package that stores "signatures" 
@@ -32,4 +32,5 @@
 "signatures" and compares for files that have been changed.</para>
 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssl.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cracklib.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux_pam.xml"/>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ postlfs/security/stunnel.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -52,5 +52,5 @@
 <sect3><title><application>Stunnel</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl"/></para>
+<para><xref linkend="openssl-package"/></para>
 </sect4>
 
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ pst/printing/cups.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -41,5 +41,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libjpeg"/>, <xref linkend="libpng"/>,
-<xref linkend="libtiff"/>, <xref linkend="openssl"/> or
+<xref linkend="libtiff"/>, <xref linkend="openssl-package"/> or
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which
 needs <ulink
Index: pst/printing/lprng.xml
===================================================================
--- pst/printing/lprng.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ pst/printing/lprng.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -43,5 +43,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl"/>,
+<xref linkend="openssl-package"/>,
 <xref linkend="tcpwrappers"/> and
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>
Index: pst/typesetting/tex.xml
===================================================================
--- pst/typesetting/tex.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ pst/typesetting/tex.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -68,5 +68,5 @@
 <para><xref linkend="libpng"/>, 
 <xref linkend="x-installing"/>, 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="mysql"/>, 
 <xref linkend="perl-modules"/>: Tk-&Perl-Tk-version;, <ulink 
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ server/mail/courier.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -54,5 +54,5 @@
 <xref linkend="mysql"/> or <xref linkend="postgresql"/>, 
 <xref linkend="Linux_PAM"/>,
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="fam"/>,
 <xref linkend="openldap"/>,
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ server/mail/exim.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -58,5 +58,5 @@
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="openldap"/>, 
-<xref linkend="openssl"/> or 
+<xref linkend="openssl-package"/> or 
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>, 
 <xref linkend="cyrus-sasl"/>, 
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ server/mail/qpopper.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -44,5 +44,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl"/>,
+<xref linkend="openssl-package"/>,
 <xref linkend="gdbm"/>,
 <xref linkend="Linux_PAM"/> and
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ server/mail/sendmail.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -48,5 +48,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/>, 
+<para><xref linkend="openssl-package"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="tcpwrappers"/>, 
Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ server/other/bind.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -46,5 +46,5 @@
 dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/></para>
+<para><xref linkend="openssl-package"/></para>
 </sect4>
 
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ server/other/openldap.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -45,5 +45,5 @@
 
 <sect4><title>Recommended</title>
-<para><xref linkend="cyrus-sasl"/> and <xref linkend="openssl"/></para>
+<para><xref linkend="cyrus-sasl"/> and <xref linkend="openssl-package"/></para>
 </sect4>
 
Index: server/other/openssh.xml
===================================================================
--- server/other/openssh.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ server/other/openssh.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -41,5 +41,5 @@
 dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl"/></para>
+<para><xref linkend="openssl-package"/></para>
 </sect4>
 <sect4><title>Optional</title>
Index: xsoft/graphweb/dillo.xml
===================================================================
--- xsoft/graphweb/dillo.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ xsoft/graphweb/dillo.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -51,5 +51,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/> and 
+<para><xref linkend="openssl-package"/> and 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
 </sect4>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision d992ab5642a1966c465b3da0a5e7f96b7a210812)
+++ xsoft/other/balsa.xml	(revision 939cf0dae54ea51820b728cca5a9de8fa887c3c0)
@@ -52,5 +52,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libgtkhtml"/>, 
-<xref linkend="openssl"/>, 
+<xref linkend="openssl-package"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="pcre"/>, 
