Index: archive/alpine.xml
===================================================================
--- archive/alpine.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
+++ archive/alpine.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY alpine-download-http "&sources-anduin-http;/alpine/alpine-&alpine-version;.tar.xz">
+  <!ENTITY alpine-download-ftp  " ">
+  <!ENTITY alpine-md5sum        "02dad85c1be80ce020206f222ecf5ac8">
+  <!ENTITY alpine-size          "4.6 MB">
+  <!ENTITY alpine-buildsize     "122 MB">
+  <!ENTITY alpine-time          "1.0 SBU">
+]>
+
+<sect1 id="alpine" xreflabel="Alpine-&alpine-version;">
+  <?dbhtml filename="alpine.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Alpine-&alpine-version;</title>
+
+  <indexterm zone="alpine">
+    <primary sortas="a-alpine">alpine</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Alpine</title>
+
+    <para><application>Alpine</application> is a text-based email client
+    developed by the University of Washington.</para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&alpine-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&alpine-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &alpine-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &alpine-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &alpine-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &alpine-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Alpine Dependencies</bridgehead>
+<!--
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+    <xref linkend="openssl"/>
+    </para>
+-->
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <xref linkend="openldap"/>,
+    <xref linkend="mitkrb"/>,
+    <xref linkend="aspell"/>,
+    <xref linkend="tcl"/>, and
+    <xref linkend="linux-pam"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alpine"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Alpine</title>
+
+    <para>Install <application>Alpine</application> by running the following
+    commands:</para>
+
+<screen><userinput>LIBS+="-lcrypto" ./configure --prefix=/usr       \
+                             --sysconfdir=/etc   \
+                             --without-ldap      \
+                             --without-krb5      \
+                             --without-pam       \
+                             --without-tcl       \
+                             --with-ssl-dir=/usr \
+                             --with-passfile=.pine-passfile &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>LIBS+="-lcrypto"</command>: Enable linking to
+    openssl. Additional linker flags are required for 
+    <xref linkend="linux-pam"/>, <option>-lpam</option>, and for
+    <xref linkend="mitkrb"/>, <option>-lkrb5</option>.</para>
+
+    <para><parameter>--without-ldap</parameter>: Disables LDAP support.</para>
+
+    <para><parameter>--without-krb5</parameter>: Disables Kerberos support.</para>
+
+    <para><parameter>--without-pam</parameter>: Disables Linux-PAM
+    support.</para>
+
+    <para><parameter>--without-tcl</parameter>: Disables TCL support.</para>
+
+    <para><parameter>--with-ssl-dir=/usr</parameter>: Sets the root path to
+    OpenSSL libraries and include files.</para>
+
+    <para><parameter>--with-passfile=.pine-passfile</parameter>: Sets the
+    password cache file.</para>
+
+    <para><option>--without-ssl</option>: Disables OpenSSL support.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Alpine</title>
+
+    <sect3 id="alpine-config">
+      <title>Config Files</title>
+
+      <para><filename>~/.pinerc</filename></para>
+
+      <indexterm zone="alpine alpine-config">
+        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>It is not required to manually edit any configuration files to use
+      the <application>Alpine</application> email client. Users can configure
+      <application>Alpine</application> using the graphical configuration menu,
+      which stores the changes in <filename>~/.pinerc</filename>.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>alpine, pico, pilot, rpdump, and rpload</seg>
+        <seg>none</seg>
+        <seg>none</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="alpine-bin">
+        <term><command>alpine</command></term>
+        <listitem>
+          <para>is the Alpine mailer.</para>
+          <indexterm zone="alpine alpine-bin">
+            <primary sortas="b-alpine-bin">alpine</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pico">
+        <term><command>pico</command></term>
+        <listitem>
+          <para>is a standalone text editor similar to the Alpine message composer.</para>
+          <indexterm zone="alpine pico">
+            <primary sortas="b-pico">pico</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pilot">
+        <term><command>pilot</command></term>
+        <listitem>
+          <para>is a standalone file system navigator.</para>
+          <indexterm zone="alpine pilot">
+            <primary sortas="b-pilot">pilot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpdump">
+        <term><command>rpdump</command></term>
+        <listitem>
+          <para>is a utility for downloading a pinerc or address book to the
+          local machine.</para>
+          <indexterm zone="alpine rpdump">
+            <primary sortas="b-rpdump">rpdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpload">
+        <term><command>rpload</command></term>
+        <listitem>
+          <para> is a utility for uploading a local pinerc or address book to
+          an IMAP server.</para>
+          <indexterm zone="alpine rpload">
+            <primary sortas="b-rpload">rpload</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/gnome/caribou-new.xml
===================================================================
--- archive/gnome/caribou-new.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
+++ archive/gnome/caribou-new.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY caribou-download-http "&gnome-download-http;/caribou/0.4/caribou-&caribou-version;.tar.xz">
+  <!ENTITY caribou-download-ftp  "&gnome-download-ftp;/caribou/0.4/caribou-&caribou-version;.tar.xz">
+  <!ENTITY caribou-md5sum        "16b76cd7453b99e2871e8d4da88bf976">
+  <!ENTITY caribou-size          "420 KB">
+  <!ENTITY caribou-buildsize     "13 MB">
+  <!ENTITY caribou-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="caribou" xreflabel="Caribou-&caribou-version;">
+  <?dbhtml filename="caribou.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Caribou-&caribou-version;</title>
+
+  <indexterm zone="caribou">
+    <primary sortas="a-Caribou">Caribou</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Caribou</title>
+
+    <para>
+      <application>Caribou</application> is an input assistive technology
+      intended for switch and pointer users.
+    </para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&caribou-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&caribou-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &caribou-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &caribou-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &caribou-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &caribou-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Caribou Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="clutter"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="libgee"/>,
+      <xref linkend="libxklavier"/>,
+      <xref linkend="pygobject2"/>, and
+      <xref linkend="pygobject3"/> (needed regardless of what version of GTK is in use)
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk2"/> and
+      <xref linkend="vala"/> (with Valadoc installed)
+    </para>
+
+    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
+    <para role="optional">
+      For most <application>GNOME</application> users, this package is only
+      required as a compile-time dependency for other packages. If
+      you intend to use its keyboard you will require
+      <xref role="runtime" linkend="dbus-python"/>,
+      <xref role="runtime" linkend="dconf"/> and
+      <xref role="runtime" linkend="pyatspi2"/> at runtime.
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/caribou"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Caribou</title>
+
+    <para>
+      Install <application>Caribou</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>PYTHON=python3 ./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --disable-gtk2-module \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-gtk2-module</parameter>: Because
+      <application>GNOME</application> now uses
+      <application>GTK+-3</application>, this module has no use
+      on a <application>GNOME</application> desktop. Remove
+      this switch if you still want to build the
+      <application>GTK+-2</application> module.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          caribou (library executable),
+          antler (library executable),
+          and caribou-preferences
+        </seg>
+        <seg>
+          libcaribou.so
+        </seg>
+        <seg>
+          /usr/include/libcaribou,
+          /usr/lib/python&python2-majorver;/site-packages/caribou,
+          /usr/share/antler and
+          /usr/share/caribou
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libcaribou">
+        <term><filename class="libraryfile">libcaribou.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Caribou</application> API functions.
+          </para>
+          <indexterm zone="caribou libcaribou">
+            <primary sortas="c-libcaribou">libcaribou.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/js52.xml
===================================================================
--- archive/js52.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
+++ archive/js52.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY js52-download-http "http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS52-version;.tar.gz">
+  <!ENTITY js52-download-ftp  "ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS52-version;.tar.gz">
+  <!ENTITY js52-md5sum        "72bd9a715ed1ab70b2aebe92969f6b63">
+  <!ENTITY js52-size          "36 MB">
+  <!ENTITY js52-buildsize     "627 MB">
+  <!ENTITY js52-time          "6.4 SBU">
+]>
+
+<sect1 id="js52" xreflabel="js52-&JS52-version;">
+  <?dbhtml filename="js52.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>JS-&JS52-version;</title>
+
+  <indexterm zone="js52">
+    <primary sortas="a-js52">js52</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to JS</title>
+
+    <para>
+      <application>JS</application> is Mozilla's JavaScript engine
+      written in C. This package is present for GJS and polkit.
+    </para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&js52-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&js52-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &js52-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &js52-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &js52-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &js52-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">JS52 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="autoconf213"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="nspr"/>,
+      <xref linkend="python2"/>,
+      <xref linkend="xorg7-lib"/>, and
+      <!-- <xref linkend="yasm"/>, -->
+      <xref linkend="zip"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/js52"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of JS</title>
+
+    <para>
+      Install <application>JS</application> by running the following
+      commands:
+    </para>
+
+    &shell-env;
+
+<screen><userinput>cd js/src &amp;&amp;
+
+grep -rl -- '-Werror=format' |
+    xargs sed -i 's/error=format/no-&amp;/' &amp;&amp;
+
+./configure --prefix=/usr       \
+            --with-intl-api     \
+            --with-system-zlib  \
+            --with-system-nspr  \
+            --with-system-icu   \
+            --enable-readline   &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a working test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>grep -rl ...</command>: Allows building with GCC-9.1.
+    </para>
+
+    <para>
+      <parameter>--with-*</parameter>: These parameters allow the build system
+      to use system versions of the above libriares. These are required for
+      stability.
+    </para>
+
+    <para>
+      <parameter>--enable-readline</parameter>: This switch enables Readline
+      support in the JS shell.
+    </para>
+<!--    
+    <para>
+      <parameter>- -enable-threadsafe</parameter>: This switch enables support
+      for multiple threads at one time. This increases performance as well as
+      stability.
+    </para>
+-->
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries)</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          js52 and js52-config
+        </seg>
+        <!-- Yes, the static library is required. -->
+        <seg>
+          libmozjs-52.so and libjs_static.ajs
+        </seg>
+        <seg>
+          /usr/include/mozjs-52
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="js5-js52">
+        <term><command>js52</command></term>
+        <listitem>
+          <para>
+            provides a command line interface to the
+            <application>JavaScript</application> engine.
+          </para>
+          <indexterm zone="js52 js52">
+            <primary sortas="b-js52">js52</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="js52-config">
+        <term><command>js52-config</command></term>
+        <listitem>
+          <para>
+            is used to find the JS compiler and linker flags.
+          </para>
+          <indexterm zone="js52 js52-config">
+            <primary sortas="b-js52-config">js52-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmozjs-52">
+        <term><filename class="libraryfile">libmozjs-52.so</filename></term>
+        <listitem>
+          <para>
+            contains the Mozilla JavaScript API functions.
+          </para>
+          <indexterm zone="js52 libmozjs-52">
+            <primary sortas="c-libmozjs52">libmozjs-52.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: archive/keybinder3.xml
===================================================================
--- archive/keybinder3.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
+++ archive/keybinder3.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY keybinder3-download-http
+           "https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v&keybinder3-version;/keybinder-3.0-&keybinder3-version;.tar.gz">
+  <!ENTITY keybinder3-download-ftp " ">
+  <!ENTITY keybinder3-md5sum        "97260321fda721fce799174ea6ba10cf">
+  <!ENTITY keybinder3-size          "370 KB">
+  <!ENTITY keybinder3-buildsize     "2.6 MB">
+  <!ENTITY keybinder3-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="keybinder3" xreflabel="keybinder-3.0-&keybinder3-version;">
+  <?dbhtml filename="keybinder-3.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>keybinder-3.0-&keybinder3-version;</title>
+
+  <indexterm zone="keybinder3">
+    <primary sortas="a-keybinder3">keybinder-3.0</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to keybinder-3.0</title>
+
+    <para>
+      The <application>keybinder-3.0</application> package contains a utility
+      library registering global <application>X</application> keyboard
+      shortcuts for <application>GTK+-3</application>.
+    </para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&keybinder3-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&keybinder3-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &keybinder3-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &keybinder3-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &keybinder3-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &keybinder3-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">keybinder-3.0 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/keybinder-3.0"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of keybinder-3.0</title>
+
+    <para>
+      Install <application>keybinder-3.0</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libkeybinder-3.0.so
+        </seg>
+        <seg>
+          /usr/include/keybinder-3.0 and
+          /usr/share/gtk-doc/html/keybinder-3.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="keybinder3-lib">
+        <term><filename class="libraryfile">libkeybinder-3.0.so</filename></term>
+        <listitem>
+          <para>
+            is the library that registers global <application>X</application>
+            keyboard shortcuts.
+          </para>
+          <indexterm zone="keybinder3 keybinder3-lib">
+            <primary sortas="c-keybinder3">libkeybinder-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/npapi-sdk.xml
===================================================================
--- archive/npapi-sdk.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
+++ archive/npapi-sdk.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY npapi-sdk-download-http
+  "https://bitbucket.org/mgorny/npapi-sdk/downloads/npapi-sdk-&npapi-sdk-version;.tar.bz2">
+  <!ENTITY npapi-sdk-download-ftp  " ">
+  <!ENTITY npapi-sdk-md5sum        "e81db61e206cd615cf56c4a9f301e636">
+  <!ENTITY npapi-sdk-size          "65 KB">
+  <!ENTITY npapi-sdk-buildsize     "520 KB">
+  <!ENTITY npapi-sdk-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="npapi-sdk" xreflabel="NPAPI-SDK-&npapi-sdk-version;">
+  <?dbhtml filename="npapi-sdk.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>NPAPI-SDK-&npapi-sdk-version;</title>
+
+  <indexterm zone="npapi-sdk">
+    <primary sortas="a-NPAPI-SDK">NPAPI-SDK</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to NPAPI-SDK</title>
+
+    <para>
+      <application>NPAPI-SDK</application> is a bundle of Netscape Plugin
+      Application Programming Interface headers by Mozilla. This package
+      provides a clear way to install those headers and depend on them.
+    </para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&npapi-sdk-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&npapi-sdk-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &npapi-sdk-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &npapi-sdk-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &npapi-sdk-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &npapi-sdk-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url='&blfs-wiki;/NPAPI-SDK'/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of NPAPI-SDK</title>
+
+    <para>
+      Install <application>NPAPI-SDK</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/include/npapi-sdk
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: archive/w3m.xml
===================================================================
--- archive/w3m.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
+++ archive/w3m.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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;
+
+  <!ENTITY w3m-download-http "&sourceforge-dl;/w3m/w3m-&w3m-version;.tar.gz">
+  <!ENTITY w3m-download-ftp  " ">
+  <!ENTITY w3m-md5sum        "1b845a983a50b8dec0169ac48479eacc">
+  <!ENTITY w3m-size          "2.1 MB">
+  <!ENTITY w3m-buildsize     "26 MB">
+  <!ENTITY w3m-time          "0.3 SBU">
+]>
+
+<sect1 id="w3m" xreflabel="w3m-&w3m-version;">
+  <?dbhtml filename="w3m.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>W3m-&w3m-version;</title>
+
+  <indexterm zone="w3m">
+    <primary sortas="a-W3m">W3m</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to W3m</title>
+
+    <para><application>w3m</application> is primarily a pager but it can
+    also be used as a text-mode WWW browser.</para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&w3m-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&w3m-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &w3m-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &w3m-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &w3m-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &w3m-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/w3m-&w3m-version;-bdwgc72-2.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">W3m Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gc"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gpm"/>,
+<!--      <xref linkend="openssl10"/>,-->
+      <xref linkend="imlib2"/>,
+      <xref linkend="gtk2"/>,
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
+        (not recommended: obsolete, abandoned upstream,
+        <ulink url="http://bugs.debian.org/448360">buggy</ulink>, and gives no
+        additional functionality as compared to other image loading libraries),
+      <xref linkend="gdk-pixbuf"/>,
+      <xref linkend="compface"/>, and
+      <ulink url="http://packages.debian.org/unstable/text/nkf">nkf</ulink>,
+      a Mail User Agent, and
+      an External Browser
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/W3M"/></para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of W3m</title>
+
+    <para>Install <application>w3m</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../w3m-&w3m-version;-bdwgc72-2.patch      &amp;&amp;
+sed -i 's/file_handle/file_foo/' istream.{c,h}  &amp;&amp;
+sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
+sed -i '/USE_EGD/s/define/undef/' config.h.in   &amp;&amp;
+
+
+./configure --prefix=/usr --sysconfdir=/etc  &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m644 -D doc/keymap.default /etc/w3m/keymap &amp;&amp;
+install -v -m644    doc/menu.default /etc/w3m/menu &amp;&amp;
+install -v -m755 -d /usr/share/doc/w3m-&w3m-version; &amp;&amp;
+install -v -m644    doc/{HISTORY,READ*,keymap.*,menu.*,*.html} \
+                    /usr/share/doc/w3m-&w3m-version;</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>patch -p1 &lt; ../w3m-&w3m-version;-bdwgc72-2.patch</command>:
+      This patch fixes compiling w3m with GC-7.2 and above installed.
+    </para>
+
+    <para><command>sed -i 's/file_handle/file_foo/' istream.{c,h}</command>:
+    This sed renames the file_handle function to avoid a clash with a glibc
+    function that has the same name, defined in
+    /usr/include/bits/fcntl.h.</para>
+
+    <para><command>sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#'
+    configure</command>: This sed fixes compiling <application>w3m</application>
+    using <xref linkend="gtk2"/> as its image library. It has no impact if
+    <xref linkend="gtk2"/> is not installed.</para>
+
+    <para>
+      <command>sed -i '/USE_EGD/s/define/undef/' config.h.in</command>: Allows
+      building against <application>openssl-1.1</application>.
+    </para>
+
+    <para><parameter>--sysconfdir=/etc</parameter>: This option puts the
+    configuration files in /etc.</para>
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring W3m</title>
+
+    <sect3 id="w3m-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/w3m/*</filename> and
+      <filename>~/.w3m/*</filename></para>
+
+      <indexterm zone="w3m w3m-config">
+        <primary sortas="e-etc-w3m/*">/etc/w3m/*</primary>
+      </indexterm>
+
+      <indexterm zone="w3m w3m-config">
+        <primary sortas="e-AA.w3m/*">~/.w3m/*</primary>
+      </indexterm>
+    </sect3>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>w3m and w3mman</seg>
+        <seg>None</seg>
+        <seg>/usr/libexec/w3m,
+             /usr/share/w3m, and
+             /usr/share/doc/w3m-&w3m-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="w3m-prog">
+        <term><command>w3m</command></term>
+        <listitem>
+          <para>is a text based web browser and pager.</para>
+          <indexterm zone="w3m w3m-prog">
+            <primary sortas="b-w3m">w3m</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="w3mman">
+         <!-- Don't remove the extra space, it prevent a FOP warning. -->
+        <term><command>w3mman</command> </term>
+        <listitem>
+          <para>is an interface to the on-line reference manuals in
+          <command>w3m</command>.</para>
+          <indexterm zone="w3m w3mman">
+            <primary sortas="b-w3mman">w3mman</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: neral/genlib/js52.xml
===================================================================
--- general/genlib/js52.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,215 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY js52-download-http "http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS52-version;.tar.gz">
-  <!ENTITY js52-download-ftp  "ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS52-version;.tar.gz">
-  <!ENTITY js52-md5sum        "72bd9a715ed1ab70b2aebe92969f6b63">
-  <!ENTITY js52-size          "36 MB">
-  <!ENTITY js52-buildsize     "627 MB">
-  <!ENTITY js52-time          "6.4 SBU">
-]>
-
-<sect1 id="js52" xreflabel="js52-&JS52-version;">
-  <?dbhtml filename="js52.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>JS-&JS52-version;</title>
-
-  <indexterm zone="js52">
-    <primary sortas="a-js52">js52</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C. This package is present for GJS and polkit.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&js52-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&js52-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &js52-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &js52-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &js52-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &js52-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JS52 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="autoconf213"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="python2"/>,
-      <xref linkend="xorg7-lib"/>, and
-      <!-- <xref linkend="yasm"/>, -->
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/js52"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <para>
-      Install <application>JS</application> by running the following
-      commands:
-    </para>
-
-    &shell-env;
-
-<screen><userinput>cd js/src &amp;&amp;
-
-./configure --prefix=/usr       \
-            --with-intl-api     \
-            --with-system-zlib  \
-            --with-system-nspr  \
-            --with-system-icu   \
-            --enable-readline   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-*</parameter>: These parameters allow the build system
-      to use system versions of the above libriares. These are required for
-      stability.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the JS shell.
-    </para>
-<!--    
-    <para>
-      <parameter>- -enable-threadsafe</parameter>: This switch enables support
-      for multiple threads at one time. This increases performance as well as
-      stability.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries)</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js52 and js52-config
-        </seg>
-        <!-- Yes, the static library is required. -->
-        <seg>
-          libmozjs-52.so and libjs_static.ajs
-        </seg>
-        <seg>
-          /usr/include/mozjs-52
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js5-js52">
-        <term><command>js52</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine.
-          </para>
-          <indexterm zone="js52 js52">
-            <primary sortas="b-js52">js52</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js52-config">
-        <term><command>js52-config</command></term>
-        <listitem>
-          <para>
-            is used to find the JS compiler and linker flags.
-          </para>
-          <indexterm zone="js52 js52-config">
-            <primary sortas="b-js52-config">js52-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-52">
-        <term><filename class="libraryfile">libmozjs-52.so</filename></term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions.
-          </para>
-          <indexterm zone="js52 libmozjs-52">
-            <primary sortas="c-libmozjs52">libmozjs-52.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/yaml.xml
===================================================================
--- general/genlib/yaml.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY yaml-download-http "http://pyyaml.org/download/libyaml/yaml-&yaml-version;.tar.gz">
-  <!ENTITY yaml-download-ftp  " ">
-  <!ENTITY yaml-md5sum        "72724b9736923c517e5a8fc6757ef03d">
-  <!ENTITY yaml-size          "588 KB">
-  <!ENTITY yaml-buildsize     "6.7 MB">
-  <!ENTITY yaml-time          "0.1 SBU">
-]>
-
-<sect1 id="yaml" xreflabel="YAML-&yaml-version;">
-  <?dbhtml filename="yaml.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>YAML-&yaml-version;</title>
-
-  <indexterm zone="yaml">
-    <primary sortas="a-YAML">YAML</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to YAML</title>
-
-    <para>
-      The <application>YAML</application> package contains a C
-      library for parsing and emitting YAML (YAML Ain't Markup
-      Language).
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yaml-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yaml-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yaml-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yaml-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yaml-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yaml-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">YAML Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/yaml"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of YAML</title>
-
-    <para>
-      Install <application>YAML</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libyaml.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libyaml">
-        <term><filename class="libraryfile">libyaml.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for parsing and emitting YAML.
-          </para>
-          <indexterm zone="yaml libyaml">
-            <primary sortas="c-libyaml">libyaml.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/autoconf-archive.xml
===================================================================
--- general/prog/autoconf-archive.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,96 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY autoconf-archive-download-http "&gnu-http;/autoconf-archive/autoconf-archive-&autoconf-archive-version;.tar.xz">
-  <!ENTITY autoconf-archive-download-ftp  "&gnu-ftp;/autoconf-archive/autoconf-archive-&autoconf-archive-version;.tar.xz">
-  <!ENTITY autoconf-archive-md5sum        "46b13a5936372297b6d49980327a3c35">
-  <!ENTITY autoconf-archive-size          "636 KB">
-  <!ENTITY autoconf-archive-buildsize     "12.4 MB">
-  <!ENTITY autoconf-archive-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="autoconf-archive" xreflabel="autoconf-archive-&autoconf-archive-version;">
-  <?dbhtml filename="autoconf-archive.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>autoconf-archive-&autoconf-archive-version;</title>
-
-  <indexterm zone="autoconf-archive">
-    <primary sortas="a-autoconf-archive">autoconf-archive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to autoconf-archive</title>
-
-    <para><application>Autoconf-archive</application> is a collection of 500+
-    <application>GNU Autoconf</application> macros contributed by various free
-    and open source projects.</para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&autoconf-archive-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&autoconf-archive-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &autoconf-archive-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &autoconf-archive-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &autoconf-archive-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &autoconf-archive-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/autoconf-archive"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of autoconf-archive</title>
-
-    <para>Install <application>autoconf-archive</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not have a test sutie.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>/usr/share/aclocal and /usr/share/autoconf-archive</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/npapi-sdk.xml
===================================================================
--- general/prog/npapi-sdk.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY npapi-sdk-download-http
-  "https://bitbucket.org/mgorny/npapi-sdk/downloads/npapi-sdk-&npapi-sdk-version;.tar.bz2">
-  <!ENTITY npapi-sdk-download-ftp  " ">
-  <!ENTITY npapi-sdk-md5sum        "e81db61e206cd615cf56c4a9f301e636">
-  <!ENTITY npapi-sdk-size          "65 KB">
-  <!ENTITY npapi-sdk-buildsize     "520 KB">
-  <!ENTITY npapi-sdk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="npapi-sdk" xreflabel="NPAPI-SDK-&npapi-sdk-version;">
-  <?dbhtml filename="npapi-sdk.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>NPAPI-SDK-&npapi-sdk-version;</title>
-
-  <indexterm zone="npapi-sdk">
-    <primary sortas="a-NPAPI-SDK">NPAPI-SDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NPAPI-SDK</title>
-
-    <para>
-      <application>NPAPI-SDK</application> is a bundle of Netscape Plugin
-      Application Programming Interface headers by Mozilla. This package
-      provides a clear way to install those headers and depend on them.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&npapi-sdk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&npapi-sdk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &npapi-sdk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &npapi-sdk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &npapi-sdk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &npapi-sdk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url='&blfs-wiki;/NPAPI-SDK'/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NPAPI-SDK</title>
-
-    <para>
-      Install <application>NPAPI-SDK</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/npapi-sdk
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/caribou.xml
===================================================================
--- gnome/platform/caribou.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY caribou-download-http "&gnome-download-http;/caribou/0.4/caribou-&caribou-version;.tar.xz">
-  <!ENTITY caribou-download-ftp  "&gnome-download-ftp;/caribou/0.4/caribou-&caribou-version;.tar.xz">
-  <!ENTITY caribou-md5sum        "16b76cd7453b99e2871e8d4da88bf976">
-  <!ENTITY caribou-size          "420 KB">
-  <!ENTITY caribou-buildsize     "13 MB">
-  <!ENTITY caribou-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="caribou" xreflabel="Caribou-&caribou-version;">
-  <?dbhtml filename="caribou.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Caribou-&caribou-version;</title>
-
-  <indexterm zone="caribou">
-    <primary sortas="a-Caribou">Caribou</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Caribou</title>
-
-    <para>
-      <application>Caribou</application> is an input assistive technology
-      intended for switch and pointer users.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&caribou-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&caribou-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &caribou-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &caribou-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &caribou-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &caribou-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Caribou Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="libxklavier"/>,
-      <xref linkend="pygobject2"/>, and
-      <xref linkend="pygobject3"/> (needed regardless of what version of GTK is in use)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/> and
-      <xref linkend="vala"/> (with Valadoc installed)
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      For most <application>GNOME</application> users, this package is only
-      required as a compile-time dependency for other packages. If
-      you intend to use its keyboard you will require
-      <xref role="runtime" linkend="dbus-python"/>,
-      <xref role="runtime" linkend="dconf"/> and
-      <xref role="runtime" linkend="pyatspi2"/> at runtime.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/caribou"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Caribou</title>
-
-    <para>
-      Install <application>Caribou</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 ./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --disable-gtk2-module \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-gtk2-module</parameter>: Because
-      <application>GNOME</application> now uses
-      <application>GTK+-3</application>, this module has no use
-      on a <application>GNOME</application> desktop. Remove
-      this switch if you still want to build the
-      <application>GTK+-2</application> module.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          caribou (library executable),
-          antler (library executable),
-          and caribou-preferences
-        </seg>
-        <seg>
-          libcaribou.so
-        </seg>
-        <seg>
-          /usr/include/libcaribou,
-          /usr/lib/python&python2-majorver;/site-packages/caribou,
-          /usr/share/antler and
-          /usr/share/caribou
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcaribou">
-        <term><filename class="libraryfile">libcaribou.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Caribou</application> API functions.
-          </para>
-          <indexterm zone="caribou libcaribou">
-            <primary sortas="c-libcaribou">libcaribou.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ multimedia/libdriv/pulseaudio.xml	(revision 22b8124b5ef36ec992905e3fcb5a61c732ea966d)
@@ -148,5 +148,5 @@
             --disable-bluez4             \
             --disable-bluez5             \
-	    --disable-rpath              \
+            --disable-rpath              \
             --with-systemduserunitdir=no &amp;&amp;
 make</userinput></screen>
Index: tworking/mailnews/alpine.xml
===================================================================
--- networking/mailnews/alpine.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,233 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY alpine-download-http "&sources-anduin-http;/alpine/alpine-&alpine-version;.tar.xz">
-  <!ENTITY alpine-download-ftp  " ">
-  <!ENTITY alpine-md5sum        "02dad85c1be80ce020206f222ecf5ac8">
-  <!ENTITY alpine-size          "4.6 MB">
-  <!ENTITY alpine-buildsize     "122 MB">
-  <!ENTITY alpine-time          "1.0 SBU">
-]>
-
-<sect1 id="alpine" xreflabel="Alpine-&alpine-version;">
-  <?dbhtml filename="alpine.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Alpine-&alpine-version;</title>
-
-  <indexterm zone="alpine">
-    <primary sortas="a-alpine">alpine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Alpine</title>
-
-    <para><application>Alpine</application> is a text-based email client
-    developed by the University of Washington.</para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&alpine-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&alpine-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &alpine-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &alpine-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &alpine-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &alpine-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Alpine Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="openldap"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="aspell"/>,
-    <xref linkend="tcl"/>, and
-    <xref linkend="linux-pam"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/alpine"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Alpine</title>
-
-    <para>Install <application>Alpine</application> by running the following
-    commands:</para>
-
-<screen><userinput>LIBS+="-lcrypto" ./configure --prefix=/usr       \
-                             --sysconfdir=/etc   \
-                             --without-ldap      \
-                             --without-krb5      \
-                             --without-pam       \
-                             --without-tcl       \
-                             --with-ssl-dir=/usr \
-                             --with-passfile=.pine-passfile &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>LIBS+="-lcrypto"</command>: Enable linking to
-    openssl. Additional linker flags are required for 
-    <xref linkend="linux-pam"/>, <option>-lpam</option>, and for
-    <xref linkend="mitkrb"/>, <option>-lkrb5</option>.</para>
-
-    <para><parameter>--without-ldap</parameter>: Disables LDAP support.</para>
-
-    <para><parameter>--without-krb5</parameter>: Disables Kerberos support.</para>
-
-    <para><parameter>--without-pam</parameter>: Disables Linux-PAM
-    support.</para>
-
-    <para><parameter>--without-tcl</parameter>: Disables TCL support.</para>
-
-    <para><parameter>--with-ssl-dir=/usr</parameter>: Sets the root path to
-    OpenSSL libraries and include files.</para>
-
-    <para><parameter>--with-passfile=.pine-passfile</parameter>: Sets the
-    password cache file.</para>
-
-    <para><option>--without-ssl</option>: Disables OpenSSL support.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Alpine</title>
-
-    <sect3 id="alpine-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.pinerc</filename></para>
-
-      <indexterm zone="alpine alpine-config">
-        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>It is not required to manually edit any configuration files to use
-      the <application>Alpine</application> email client. Users can configure
-      <application>Alpine</application> using the graphical configuration menu,
-      which stores the changes in <filename>~/.pinerc</filename>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>alpine, pico, pilot, rpdump, and rpload</seg>
-        <seg>none</seg>
-        <seg>none</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="alpine-bin">
-        <term><command>alpine</command></term>
-        <listitem>
-          <para>is the Alpine mailer.</para>
-          <indexterm zone="alpine alpine-bin">
-            <primary sortas="b-alpine-bin">alpine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pico">
-        <term><command>pico</command></term>
-        <listitem>
-          <para>is a standalone text editor similar to the Alpine message composer.</para>
-          <indexterm zone="alpine pico">
-            <primary sortas="b-pico">pico</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pilot">
-        <term><command>pilot</command></term>
-        <listitem>
-          <para>is a standalone file system navigator.</para>
-          <indexterm zone="alpine pilot">
-            <primary sortas="b-pilot">pilot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpdump">
-        <term><command>rpdump</command></term>
-        <listitem>
-          <para>is a utility for downloading a pinerc or address book to the
-          local machine.</para>
-          <indexterm zone="alpine rpdump">
-            <primary sortas="b-rpdump">rpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpload">
-        <term><command>rpload</command></term>
-        <listitem>
-          <para> is a utility for uploading a local pinerc or address book to
-          an IMAP server.</para>
-          <indexterm zone="alpine rpload">
-            <primary sortas="b-rpload">rpload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/textweb/w3m.xml
===================================================================
--- networking/textweb/w3m.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY w3m-download-http "&sourceforge-dl;/w3m/w3m-&w3m-version;.tar.gz">
-  <!ENTITY w3m-download-ftp  " ">
-  <!ENTITY w3m-md5sum        "1b845a983a50b8dec0169ac48479eacc">
-  <!ENTITY w3m-size          "2.1 MB">
-  <!ENTITY w3m-buildsize     "26 MB">
-  <!ENTITY w3m-time          "0.3 SBU">
-]>
-
-<sect1 id="w3m" xreflabel="w3m-&w3m-version;">
-  <?dbhtml filename="w3m.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>W3m-&w3m-version;</title>
-
-  <indexterm zone="w3m">
-    <primary sortas="a-W3m">W3m</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to W3m</title>
-
-    <para><application>w3m</application> is primarily a pager but it can
-    also be used as a text-mode WWW browser.</para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&w3m-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&w3m-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &w3m-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &w3m-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &w3m-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &w3m-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/w3m-&w3m-version;-bdwgc72-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">W3m Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gc"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gpm"/>,
-<!--      <xref linkend="openssl10"/>,-->
-      <xref linkend="imlib2"/>,
-      <xref linkend="gtk2"/>,
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
-        (not recommended: obsolete, abandoned upstream,
-        <ulink url="http://bugs.debian.org/448360">buggy</ulink>, and gives no
-        additional functionality as compared to other image loading libraries),
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="compface"/>, and
-      <ulink url="http://packages.debian.org/unstable/text/nkf">nkf</ulink>,
-      a Mail User Agent, and
-      an External Browser
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/W3M"/></para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of W3m</title>
-
-    <para>Install <application>w3m</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../w3m-&w3m-version;-bdwgc72-2.patch      &amp;&amp;
-sed -i 's/file_handle/file_foo/' istream.{c,h}  &amp;&amp;
-sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
-sed -i '/USE_EGD/s/define/undef/' config.h.in   &amp;&amp;
-
-
-./configure --prefix=/usr --sysconfdir=/etc  &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D doc/keymap.default /etc/w3m/keymap &amp;&amp;
-install -v -m644    doc/menu.default /etc/w3m/menu &amp;&amp;
-install -v -m755 -d /usr/share/doc/w3m-&w3m-version; &amp;&amp;
-install -v -m644    doc/{HISTORY,READ*,keymap.*,menu.*,*.html} \
-                    /usr/share/doc/w3m-&w3m-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>patch -p1 &lt; ../w3m-&w3m-version;-bdwgc72-2.patch</command>:
-      This patch fixes compiling w3m with GC-7.2 and above installed.
-    </para>
-
-    <para><command>sed -i 's/file_handle/file_foo/' istream.{c,h}</command>:
-    This sed renames the file_handle function to avoid a clash with a glibc
-    function that has the same name, defined in
-    /usr/include/bits/fcntl.h.</para>
-
-    <para><command>sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#'
-    configure</command>: This sed fixes compiling <application>w3m</application>
-    using <xref linkend="gtk2"/> as its image library. It has no impact if
-    <xref linkend="gtk2"/> is not installed.</para>
-
-    <para>
-      <command>sed -i '/USE_EGD/s/define/undef/' config.h.in</command>: Allows
-      building against <application>openssl-1.1</application>.
-    </para>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This option puts the
-    configuration files in /etc.</para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring W3m</title>
-
-    <sect3 id="w3m-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/w3m/*</filename> and
-      <filename>~/.w3m/*</filename></para>
-
-      <indexterm zone="w3m w3m-config">
-        <primary sortas="e-etc-w3m/*">/etc/w3m/*</primary>
-      </indexterm>
-
-      <indexterm zone="w3m w3m-config">
-        <primary sortas="e-AA.w3m/*">~/.w3m/*</primary>
-      </indexterm>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>w3m and w3mman</seg>
-        <seg>None</seg>
-        <seg>/usr/libexec/w3m,
-             /usr/share/w3m, and
-             /usr/share/doc/w3m-&w3m-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="w3m-prog">
-        <term><command>w3m</command></term>
-        <listitem>
-          <para>is a text based web browser and pager.</para>
-          <indexterm zone="w3m w3m-prog">
-            <primary sortas="b-w3m">w3m</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="w3mman">
-         <!-- Don't remove the extra space, it prevent a FOP warning. -->
-        <term><command>w3mman</command> </term>
-        <listitem>
-          <para>is an interface to the on-line reference manuals in
-          <command>w3m</command>.</para>
-          <indexterm zone="w3m w3mman">
-            <primary sortas="b-w3mman">w3mman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: lib/keybinder3.xml
===================================================================
--- x/lib/keybinder3.xml	(revision f914d6bcff8fedb715efd87ed0d6906fd7244f9d)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 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;
-
-  <!ENTITY keybinder3-download-http
-           "https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v&keybinder3-version;/keybinder-3.0-&keybinder3-version;.tar.gz">
-  <!ENTITY keybinder3-download-ftp " ">
-  <!ENTITY keybinder3-md5sum        "97260321fda721fce799174ea6ba10cf">
-  <!ENTITY keybinder3-size          "370 KB">
-  <!ENTITY keybinder3-buildsize     "2.6 MB">
-  <!ENTITY keybinder3-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="keybinder3" xreflabel="keybinder-3.0-&keybinder3-version;">
-  <?dbhtml filename="keybinder-3.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>keybinder-3.0-&keybinder3-version;</title>
-
-  <indexterm zone="keybinder3">
-    <primary sortas="a-keybinder3">keybinder-3.0</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to keybinder-3.0</title>
-
-    <para>
-      The <application>keybinder-3.0</application> package contains a utility
-      library registering global <application>X</application> keyboard
-      shortcuts for <application>GTK+-3</application>.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&keybinder3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&keybinder3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &keybinder3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &keybinder3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &keybinder3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &keybinder3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">keybinder-3.0 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/keybinder-3.0"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of keybinder-3.0</title>
-
-    <para>
-      Install <application>keybinder-3.0</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libkeybinder-3.0.so
-        </seg>
-        <seg>
-          /usr/include/keybinder-3.0 and
-          /usr/share/gtk-doc/html/keybinder-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keybinder3-lib">
-        <term><filename class="libraryfile">libkeybinder-3.0.so</filename></term>
-        <listitem>
-          <para>
-            is the library that registers global <application>X</application>
-            keyboard shortcuts.
-          </para>
-          <indexterm zone="keybinder3 keybinder3-lib">
-            <primary sortas="c-keybinder3">libkeybinder-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
