Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 1d4ab65d176ffa230485e2d452d9067574dbd9f1)
+++ general/genlib/genlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,179 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
+<chapter id="general-genlib">
+<?dbhtml filename="genlib.html" dir="general"?>
+<title>General Libraries</title>
 
-<chapter id="general-genlib">
-  <?dbhtml filename="genlib.html"?>
+<para>Libraries contain code which is often required by more than
+one program.  This has the advantage that each program doesn't need to
+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 glibc which is installed during the LFS
+book.  This contains all of the C library functions which programs
+use.</para>
 
-  <title>General Libraries</title>
+<para>There are two types of library, static and shared.  Shared
+libraries (usually libXXX.so) are loaded into memory from the shared
+copy at runtime (hence the name).  Static libraries (libXXX.a) are
+actually linked into the program executable file itself, thus making the
+program file larger.  Quite often, you will find both static and shared
+copies of the same library on your system.</para>
 
-  <para>
-    Libraries contain code which is often required by more than
-    one program.  This has the advantage that each program doesn't need to
-    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
-    installed during the LFS book.  This contains all of the
-    <application>C</application> library functions which programs use.
-  </para>
+<para>Generally, you only need to install libraries when you are
+installing software which requires functionality which they supply.  In
+the BLFS book, each package is listed 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 BLFS instructions, usually the <filename>README</filename>  or
+<filename>INSTALL</filename> file will contain details of the programs
+requirements.</para>
 
-  <para>
-    There are two types of libraries: static and shared.  Shared libraries
-    (usually <filename>libXXX.so</filename>) are loaded into memory from the
-    shared copy at runtime (hence the name).  Static libraries (<filename>
-    libXXX.a</filename>) are actually linked into the program executable file
-    itself, thus making the program file larger.  Quite often, you will find
-    both static and shared copies of the same library on your system.
-  </para>
+<para>There are certain libraries which nearly
+<emphasis>everyone</emphasis> will need at some point.  In this chapter
+we list these and some others and explain why you may want to install
+them.</para>
 
-  <para>
-    Generally, you only need to install libraries when you are
-    installing software that needs the functionality they supply.  In
-    the BLFS 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 BLFS 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> will
-    need at some point.  In this chapter these and some others are listed and
-    it is explained why you may want to install them.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abseil-cpp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boost.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brotli.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clucene.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="double-conversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="duktape.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enchant.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fftw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fmt.xml"/>
-
-<!-- systemd only -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcab.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm2.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime3.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highway.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inih.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-gmmlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jansson.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keyutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kirigami-addons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libaio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libassuan.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatasmart.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatomic_ops.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libblockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbytesize.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcloudproviders.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdisplay-info.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgrss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblinear.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmbim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnvme.xml"/>
-
-   <!-- systemd only -->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpaper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libportal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libptytty.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqalculate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqmi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libseccomp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++3.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc3.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigsegv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libssh2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstatgrab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuninameslist.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunistring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunwind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liburcu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb-compat.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxkbcommon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxmlb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
-
-<!-- systemd only -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="log4cplus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mtdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nodejs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="npth.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nspr.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openobex.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcre2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="popt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf-c.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qcoro.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spidermonkey.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uchardet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="umockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="utfcpp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
+&zlib;
+&openssl;
+&pcre;
+&popt;
+&slang;
+&libfam;
+&libxml;
+&libxml2;
+&libxslt;
 
 </chapter>
