Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/genlib/libgcrypt.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,6 +7,6 @@
   <!ENTITY libgcrypt-download-http " ">
   <!ENTITY libgcrypt-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
-  <!ENTITY libgcrypt-md5sum        "3babc8af8978eeafa1bdbfef066ea943">
-  <!ENTITY libgcrypt-size          "2.5 MB">
+  <!ENTITY libgcrypt-md5sum        "67ec79bdde8fd815c9cdd55aa9555935">
+  <!ENTITY libgcrypt-size          "2.7 MB">
   <!ENTITY libgcrypt-buildsize     "46 MB (with tests and building docs)">
   <!ENTITY libgcrypt-time          "0.6 SBU (with tests and building docs)">
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/genlib/libtasn1.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,5 +7,5 @@
   <!ENTITY libtasn1-download-http "http://ftp.gnu.org/gnu/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
   <!ENTITY libtasn1-download-ftp  "ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
-  <!ENTITY libtasn1-md5sum        "12d10ca4ae0a3b95f7aa06a076da39ec">
+  <!ENTITY libtasn1-md5sum        "9a6767705725544f2b86670dcfb34107">
   <!ENTITY libtasn1-size          "1.8 MB">
   <!ENTITY libtasn1-buildsize     "11 MB (with tests)">
Index: general/genlib/libxkbcommon.xml
===================================================================
--- general/genlib/libxkbcommon.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/genlib/libxkbcommon.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,8 +7,8 @@
   <!ENTITY libxkbcommon-download-http "http://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz">
   <!ENTITY libxkbcommon-download-ftp  " ">
-  <!ENTITY libxkbcommon-md5sum        "2e1faeafcc609c30af3a561a91e84158">
-  <!ENTITY libxkbcommon-size          "604 KB">
-  <!ENTITY libxkbcommon-buildsize     "11 MB">
-  <!ENTITY libxkbcommon-time          "0.1 SBU">
+  <!ENTITY libxkbcommon-md5sum        "67a8f322b5fa32352272e811bb90dd73">
+  <!ENTITY libxkbcommon-size          "708 KB">
+  <!ENTITY libxkbcommon-buildsize     "34 MB (with tests)">
+  <!ENTITY libxkbcommon-time          "0.2 SBU (with tests)">
 ]>
 
Index: general/genlib/openobex.xml
===================================================================
--- general/genlib/openobex.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/genlib/openobex.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,7 +7,7 @@
   <!ENTITY openobex-download-http "&sourceforge-repo;/openobex/openobex-&openobex-version;-Source.tar.gz">
   <!ENTITY openobex-download-ftp  " ">
-  <!ENTITY openobex-md5sum        "3181bfed9cb7db591605391068cb0085">
-  <!ENTITY openobex-size          "136 KB">
-  <!ENTITY openobex-buildsize     "3.6 MB">
+  <!ENTITY openobex-md5sum        "f6e0b6cb7dcfd731460a7e9a91429a3a">
+  <!ENTITY openobex-size          "128 KB">
+  <!ENTITY openobex-buildsize     "3.1 MB">
   <!ENTITY openobex-time          "less than 0.1 SBU">
 ]>
@@ -131,5 +131,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-mv -fv /usr/share/doc/openobex{,-&openobex-version;}</userinput></screen>
+mv -fv /usr/share/doc/{openobex,openobex-&openobex-version;}</userinput></screen>
   </sect2>
 
Index: general/genutils/asciidoc.xml
===================================================================
--- general/genutils/asciidoc.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
+++ general/genutils/asciidoc.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -0,0 +1,141 @@
+<?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 asciidoc-download-http "http://sourceforge.net/projects/asciidoc/files/asciidoc/&asciidoc-version;/asciidoc-&asciidoc-version;.tar.gz">
+  <!ENTITY asciidoc-download-ftp  " ">
+  <!ENTITY asciidoc-md5sum        "c59018f105be8d022714b826b0be130a">
+  <!ENTITY asciidoc-size          "888 KB">
+  <!ENTITY asciidoc-buildsize     "3.9 MB">
+  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
+  <?dbhtml filename="asciidoc.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Asciidoc-&asciidoc-version;</title>
+
+  <indexterm zone="asciidoc">
+    <primary sortas="a-asciidoc">asciidoc</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Asciidoc</title>
+
+    <para>The <application>Asciidoc</application> package is a text document
+    format for writing notes, documentation, articles, books, ebooks,
+    slideshows, web pages, man pages and blogs. AsciiDoc files can be
+    translated to many formats including HTML, PDF, EPUB, and man page.  </para>
+
+    &lfs79_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&asciidoc-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&asciidoc-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &asciidoc-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &asciidoc-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &asciidoc-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &asciidoc-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Asciidoc Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="python2"/> or
+      <xref linkend="python3"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/asciidoc"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Asciidoc</title>
+
+    <para>Install <application>Asciidoc</application> by running
+    the following commands:</para>
+
+<screen><userinput>./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</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          a2x (symlink to a2x.py), 
+          a2x.py, 
+          asciidoc (symlink to asciidoc.py), and 
+          asciidoc.py
+        </seg>
+        <seg>None</seg>
+        <seg>/etc/asciidoc</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="a2x">
+        <term><command>a2x</command></term>
+        <listitem>
+          <para>is a toolchain manager for AsciiDoc 
+          (converts Asciidoc text files to other file formats).</para>
+          <indexterm zone="asciidoc a2x">
+            <primary sortas="b-a2x">a2x</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="asciidoc-prog">
+        <term><command>asciidoc</command></term>
+        <listitem>
+          <para>converts an AsciiDoc text file to HTML or DocBook</para>
+          <indexterm zone="asciidoc asciidoc-prog">
+            <primary sortas="b-asciidoc-prog">asciidoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/genutils/genutils.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -21,4 +21,5 @@
   PIN numbers and pass-phrases, and a hash generator.</para>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chrpath.xml"/>
@@ -40,5 +41,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sharutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tidy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tidy-html5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="time.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tree.xml"/>
Index: general/genutils/iso-codes.xml
===================================================================
--- general/genutils/iso-codes.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/genutils/iso-codes.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -10,7 +10,7 @@
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "01c02633ede9d6fdf4b5f99d5dbd47b2">
-  <!ENTITY iso-codes-size          "3.6 MB">
-  <!ENTITY iso-codes-buildsize     "111 MB (with tests)">
+  <!ENTITY iso-codes-md5sum        "8dbf901d2c90afd508ffbd99aed2c456">
+  <!ENTITY iso-codes-size          "3.4 MB">
+  <!ENTITY iso-codes-buildsize     "78 MB (with tests)">
   <!ENTITY iso-codes-time          "0.2 SBU (with tests)">
 ]>
Index: general/genutils/tidy-html5.xml
===================================================================
--- general/genutils/tidy-html5.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
+++ general/genutils/tidy-html5.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -0,0 +1,221 @@
+<?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 tidy-html5-download-http "https://github.com/htacg/tidy-html5/archive/&tidy-html5-version;.tar.gz">
+  <!ENTITY tidy-html5-download-ftp  " ">
+  <!ENTITY tidy-html5-md5sum        "ffbe6e8471eff90877b4d74bb714e22f">
+  <!ENTITY tidy-html5-size          "517 KB">
+  <!ENTITY tidy-html5-buildsize     "16 MB">
+  <!ENTITY tidy-html5-time          "0.1 SBU">
+]>
+
+<sect1 id="tidy-html5" xreflabel="tidy-html5-&tidy-html5-version;">
+  <?dbhtml filename="tidy-html5.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>tidy-html5-&tidy-html5-version;</title>
+
+  <indexterm zone="tidy-html5">
+    <primary sortas="a-Tidy-HTML5">Tidy HTML5</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Tidy HTML5</title>
+
+    <para>The <application>Tidy HTML5</application> package contains a
+    command line tool and libraries used to read HTML, XHTML and XML files
+    and write cleaned up markup. It detects and corrects many common coding
+    errors and strives to produce visually equivalent markup that is both
+    W3C compliant and compatible with most browsers.</para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&tidy-html5-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&tidy-html5-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &tidy-html5-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &tidy-html5-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &tidy-html5-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &tidy-html5-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>
+        The <application>Tidy HTML5</application> source tarball shown above
+        downloads with the correct name, tidy-html5-&tidy-html5-version;.tar.gz, if
+        using a browser such as Firefox. If you prefer to use a command line
+        program such as wget, you normally would obtain &tidy-html5-version;.tar.gz.
+        To obtain this package with the proper filename, run:
+
+<screen><userinput>wget -c https://github.com/htacg/tidy-html5/archive/&tidy-html5-version;.tar.gz \
+     -O tidy-html5-&tidy-html5-version;.tar.gz</userinput></screen>
+        </para>
+      </note>
+
+    <bridgehead renderas="sect3">Tidy HTML5 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="cmake"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="libxslt"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="doxygen"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/tidy"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Tidy HTML5</title>
+
+    <para>Install <application>Tidy HTML5</application> by running the following
+    commands:</para>
+
+<screen><userinput>cd build/cmake &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DBUILD_TAB2SPACE=ON        \
+      ../..    &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 -m755 tab2space /usr/bin</userinput></screen>
+
+    <para>If you wish to install the API documentation you must have <xref
+    linkend="doxygen"/> installed, then change directories into the <filename
+    class='directory'>documentation</filename> directory of the source tree and
+    issue the command <command>doxygen doxygen.cfg</command>. Then as the
+    <systemitem class="username">root</systemitem> user copy the <filename
+    class='directory'>documentation/temp/tidylib_api</filename> directory to
+    <filename
+    class='directory'>/usr/share/doc/tidy-&tidy-html5-version;.</filename></para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
+      build the release library without any debug `assert` in the code.
+    </para>
+
+    <para>
+      <parameter>-DBUILD_TAB2SPACE=ON</parameter>: This switch is used to enable
+      building the <command>tab2space</command> utility.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Tidy HTML5</title>
+
+    <sect3>
+      <title>Config Files</title>
+
+      <para>The absolute path of the file specified in
+      <envar>$HTML_TIDY</envar>.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>The default configuration options can be set in the file defined in
+      <envar>$HTML_TIDY</envar>. Additional configuration options can be passed
+      to <command>tidy</command> via command line parameters or the
+      <option>-config &lt;file&gt;</option> parameter.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+    <segtitle>Installed Programs</segtitle>
+    <segtitle>Installed Library</segtitle>
+    <segtitle>Installed Directory</segtitle>
+    <seglistitem>
+    <seg>tab2space and tidy</seg>
+    <seg>libtidy.so and libtidys.a</seg>
+    <seg>/usr/share/doc/tidy-&tidy-html5-version;</seg>
+    </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="tab2space">
+        <term><command>tab2space</command></term>
+        <listitem>
+          <para>is a utility to expand tabs and ensure consistent line
+          endings.</para>
+          <indexterm zone="tidy-html5 tab2space">
+            <primary sortas="b-tab2space">tab2space</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tidy">
+        <term><command>tidy</command></term>
+        <listitem>
+          <para>validates, corrects, and pretty-prints HTML files.</para>
+          <indexterm zone="tidy-html5 tidy">
+            <primary sortas="b-tidy">tidy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtidy">
+        <term>
+          <filename class='libraryfile'>libtidy.so and libtidys.a</filename>
+        </term>
+        <listitem>
+          <para>library provides the <application>Tidy HTML5</application> API
+          functions to <command>tidy</command> and can also be called by other
+          programs.</para>
+          <indexterm zone="tidy-html5 libtidy">
+            <primary sortas="c-libtidy">libtidy.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/tidy.xml
===================================================================
--- general/genutils/tidy.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ 	(revision )
@@ -1,221 +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 tidy-download-http "https://github.com/htacg/tidy-html5/archive/&tidy-version;.tar.gz">
-  <!ENTITY tidy-download-ftp  " ">
-  <!ENTITY tidy-md5sum        "5fd96deef635ab8cea3dc74079f54d95">
-  <!ENTITY tidy-size          "632 KB">
-  <!ENTITY tidy-buildsize     "16 MB">
-  <!ENTITY tidy-time          "0.1 SBU">
-]>
-
-<sect1 id="tidy-html" xreflabel="tidy-html5-&tidy-version;">
-  <?dbhtml filename="tidy.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>tidy-html5-&tidy-version;</title>
-
-  <indexterm zone="tidy-html">
-    <primary sortas="a-Tidy-HTML">Tidy HTML5</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tidy HTML5</title>
-
-    <para>The <application>Tidy HTML5</application> package contains a
-    command line tool and libraries used to read HTML, XHTML and XML files
-    and write cleaned up markup. It detects and corrects many common coding
-    errors and strives to produce visually equivalent markup that is both
-    W3C compliant and compatible with most browsers.</para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&tidy-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tidy-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tidy-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tidy-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tidy-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tidy-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The <application>Tidy HTML5</application> source tarball shown above
-        downloads with the correct name, tidy-html5-&tidy-version;.tar.gz, if
-        using a browser such as Firefox. If you prefer to use a command line
-        program such as wget, you normally would obtain &tidy-version;.tar.gz.
-        To obtain this package with the proper filename, run:
-
-<screen><userinput>wget -c https://github.com/htacg/tidy-html5/archive/&tidy-version;.tar.gz \
-     -O tidy-html5-&tidy-version;.tar.gz</userinput></screen>
-        </para>
-      </note>
-
-    <bridgehead renderas="sect3">Tidy HTML5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="cmake"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libxslt"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="doxygen"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/tidy"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tidy HTML5</title>
-
-    <para>Install <application>Tidy HTML5</application> by running the following
-    commands:</para>
-
-<screen><userinput>cd build/cmake &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_TAB2SPACE=ON        \
-      ../..    &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 -m755 tab2space /usr/bin</userinput></screen>
-
-    <para>If you wish to install the API documentation you must have <xref
-    linkend="doxygen"/> installed, then change directories into the <filename
-    class='directory'>documentation</filename> directory of the source tree and
-    issue the command <command>doxygen doxygen.cfg</command>. Then as the
-    <systemitem class="username">root</systemitem> user copy the <filename
-    class='directory'>documentation/temp/tidylib_api</filename> directory to
-    <filename
-    class='directory'>/usr/share/doc/tidy-&tidy-version;.</filename></para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      build the release library without any debug `assert` in the code.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TAB2SPACE=ON</parameter>: This switch is used to enable
-      building the <command>tab2space</command> utility.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Tidy HTML5</title>
-
-    <sect3>
-      <title>Config Files</title>
-
-      <para>The absolute path of the file specified in
-      <envar>$HTML_TIDY</envar>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The default configuration options can be set in the file defined in
-      <envar>$HTML_TIDY</envar>. Additional configuration options can be passed
-      to <command>tidy</command> via command line parameters or the
-      <option>-config &lt;file&gt;</option> parameter.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-    <segtitle>Installed Programs</segtitle>
-    <segtitle>Installed Library</segtitle>
-    <segtitle>Installed Directory</segtitle>
-    <seglistitem>
-    <seg>tab2space and tidy</seg>
-    <seg>libtidy.so and libtidys.a</seg>
-    <seg>/usr/share/doc/tidy-&tidy-version;</seg>
-    </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tab2space">
-        <term><command>tab2space</command></term>
-        <listitem>
-          <para>is a utility to expand tabs and ensure consistent line
-          endings.</para>
-          <indexterm zone="tidy-html tab2space">
-            <primary sortas="b-tab2space">tab2space</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tidy">
-        <term><command>tidy</command></term>
-        <listitem>
-          <para>validates, corrects, and pretty-prints HTML files.</para>
-          <indexterm zone="tidy-html tidy">
-            <primary sortas="b-tidy">tidy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtidy">
-        <term>
-          <filename class='libraryfile'>libtidy.so and libtidys.a</filename>
-        </term>
-        <listitem>
-          <para>library provides the <application>Tidy HTML5</application> API
-          functions to <command>tidy</command> and can also be called by other
-          programs.</para>
-          <indexterm zone="tidy-html libtidy">
-            <primary sortas="c-libtidy">libtidy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/graphlib/babl.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -10,7 +10,7 @@
 <!--  <!ENTITY babl-download-ftp
   "ftp://ftp.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">-->
-  <!ENTITY babl-md5sum        "b64a3b2cef5b0bb62caff0afdd32bdb8">
-  <!ENTITY babl-size          "704 KB">
-  <!ENTITY babl-buildsize     "15 MB (with tests)">
+  <!ENTITY babl-md5sum        "a1c72e5f5d55a8b736ef2fa67ddb86ec">
+  <!ENTITY babl-size          "716 KB">
+  <!ENTITY babl-buildsize     "13.1 MB (with tests)">
   <!ENTITY babl-time          "0.2 SBU (with tests)">
 ]>
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/graphlib/gegl.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY gegl-download-http "http://download.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2">
+  <!ENTITY gegl-download-http "http://download.gimp.org/pub/gegl/0.3/gegl-&gegl-version;.tar.bz2">
   <!ENTITY gegl-download-ftp " ">
 <!--  <!ENTITY gegl-download-ftp "ftp://ftp.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2">-->
-  <!ENTITY gegl-md5sum        "32b00002f1f1e316115c4ed922e1dec8">
-  <!ENTITY gegl-size          "7.2 MB">
-  <!ENTITY gegl-buildsize     "50 MB">
-  <!ENTITY gegl-time          "0.9 SBU">
+  <!ENTITY gegl-md5sum        "e6b4eb720ef541aab8c9b12b1a517a78">
+  <!ENTITY gegl-size          "5.5 MB">
+  <!ENTITY gegl-buildsize     "138 MB (additional 25 MB for tests)">
+  <!ENTITY gegl-time          "2.4 SBU (additional 1.9 SBU for tests)">
 ]>
 
@@ -72,25 +72,15 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gegl-&gegl-version;-ffmpeg2-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">gegl Dependencies</bridgehead>
-
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="babl"/> and
-      <xref linkend="glib2"/>
+      <xref linkend="json-glib"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="asciidoc"/>,
       <xref linkend="cairo"/>,
       <xref linkend="enscript"/>,
@@ -110,9 +100,9 @@
       <xref linkend="vala"/>,
       <xref linkend="w3m"/>,
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
       <ulink url="http://lensfun.berlios.de/">lensfun</ulink>,
       <ulink url="http://libopenraw.freedesktop.org/wiki/">libopenraw</ulink>,
       <ulink url="http://libspiro.sourceforge.net/">libspiro</ulink>,
-      <ulink url="http://www.cise.ufl.edu/research/sparse/umfpack/">libumfpack</ulink>, and
+      <ulink url="http://www.cise.ufl.edu/research/sparse/umfpack/">libumfpack</ulink>,
+      <ulink url="http://www.khronos.org/opencl/">OpenCL</ulink> (for tests), and
       <ulink url="http://www.openexr.org">OpenEXR</ulink>
     </para>
@@ -130,5 +120,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../gegl-&gegl-version;-ffmpeg2-1.patch &amp;&amp;
+<screen><userinput>sed -i '/check:/s/images//' tests/ff-load-save/Makefile.in &amp;&amp;
 
 ./configure --prefix=/usr &amp;&amp;
@@ -146,9 +136,14 @@
 install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/gegl &amp;&amp;
 install -d -v -m755 /usr/share/gtk-doc/html/gegl/images &amp;&amp;
-install -v -m644 docs/images/* /usr/share/gtk-doc/html/gegl/images</userinput></screen>
+install -v -m644 docs/images/*.{png,ico,svg} /usr/share/gtk-doc/html/gegl/images</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed ...</command>
+      Skip tests that fail due to missing image files.
+    </para>
 
     <para>
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/graphlib/graphite2.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -100,5 +100,5 @@
 
     <para>To build the documentation:
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
+      <xref linkend="asciidoc"/>,
       <xref linkend="doxygen"/>,
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/graphlib/librsvg.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,7 +7,7 @@
   <!ENTITY librsvg-download-http "&gnome-download-http;/librsvg/2.40/librsvg-&librsvg-version;.tar.xz">
   <!ENTITY librsvg-download-ftp  "&gnome-download-ftp;/librsvg/2.40/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-md5sum        "ad03780e12c56e52474d8edf86976c73">
-  <!ENTITY librsvg-size          "540 KB">
-  <!ENTITY librsvg-buildsize     "14 MB (with tests)">
+  <!ENTITY librsvg-md5sum        "3a66ab5b4fe1fb43b471708e4ff39a0e">
+  <!ENTITY librsvg-size          "544 KB">
+  <!ENTITY librsvg-buildsize     "11.6 MB (with tests)">
   <!ENTITY librsvg-time          "0.2 SBU (with tests)">
 ]>
Index: general/prog/dejagnu.xml
===================================================================
--- general/prog/dejagnu.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/prog/dejagnu.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,7 +7,7 @@
   <!ENTITY dejagnu-download-http "https://ftp.gnu.org/pub/gnu/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
   <!ENTITY dejagnu-download-ftp  "ftp://ftp.gnu.org/pub/gnu/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-  <!ENTITY dejagnu-md5sum        "5bda2cdb1af51a80aecce58d6e42bd2f">
-  <!ENTITY dejagnu-size          "584 KB">
-  <!ENTITY dejagnu-buildsize     "4.0 MB">
+  <!ENTITY dejagnu-md5sum        "1fdc2eb0d592c4f89d82d24dfdf02f0b">
+  <!ENTITY dejagnu-size          "512 KB">
+  <!ENTITY dejagnu-buildsize     "3.2 MB">
   <!ENTITY dejagnu-time          "less than 0.1 SBU">
 ]>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/prog/git.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -129,5 +129,5 @@
     <para>
       <xref linkend="xmlto"/> and
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> or
+      <xref linkend="asciidoc"/> or
       <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>, and also
       <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
@@ -160,6 +160,5 @@
 
     <para>
-      If you have installed <ulink
-      url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> you can
+      If you have installed <xref linkend="asciidoc"/> you can
       create the html version of the man pages and other docs:
     </para>
@@ -168,6 +167,5 @@
 
     <para>
-      If you have installed <ulink
-      url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
+      If you have installed <xref linkend="asciidoc"/> and
       <xref linkend="xmlto"/> you can create the man pages:
     </para>
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/prog/mercurial.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,8 +7,8 @@
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "4e922fcc9454d2665f20c3b9b4741add">
-  <!ENTITY mercurial-size          "4.5 MB">
-  <!ENTITY mercurial-buildsize     "54 MB (with documentation, 378 MB with docs and tests)">
-  <!ENTITY mercurial-time          "less than 0.1 SBU (with documentation, 3.4 SBU with docs and tests, using -j8)">
+  <!ENTITY mercurial-md5sum        "f47c9c76b7bf429dafecb71fa81c01b4">
+  <!ENTITY mercurial-size          "4.4 MB">
+  <!ENTITY mercurial-buildsize     "36 MB (374 MB with docs and tests)">
+  <!ENTITY mercurial-time          "less than 0.1 SBU (13 SBU with docs and tests)">
 ]>
 
@@ -107,6 +107,5 @@
 <screen><userinput>cat &gt; tests/blacklists/failed-tests &lt;&lt; "EOF"
 <literal># Test Failures
-  test-run-tests.t
-  test-highlight.t</literal>
+  test-gpg.t</literal>
 EOF
 
@@ -127,7 +126,5 @@
   rm -rf tmp &amp;&amp;
 
-  ./run-tests.py --tmpdir tmp     \
-                 test-run-tests.t \
-                 test-highlight.t &amp;&amp;
+  ./run-tests.py --tmpdir tmp test-gpg.t &amp;&amp;
 popd</userinput></screen>
 
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/prog/perl-modules.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -121,5 +121,5 @@
 
   <!ENTITY XML-LibXML-Simple-download-http "http://cpan.org/authors/id/M/MA/MARKOV/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz">
-  <!ENTITY XML-LibXML-Simple-md5sum "862fd977c97c4ec777a235522e12229d">
+  <!ENTITY XML-LibXML-Simple-md5sum "402da3e6575af4fac52dc911c9935fb0">
 
   <!ENTITY XML-LibXSLT-download-http "http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz">
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/prog/php.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -125,5 +125,5 @@
     <para role="optional">
       <xref linkend="curl"/>,
-      <xref linkend="tidy-html"/>,
+      <xref linkend="tidy-html5"/>,
       <ulink url="http://sourceforge.net/projects/caudium/">Caudium</ulink>,
       <ulink url="https://www.hyperwave.com/en/">Hyperwave</ulink>,
Index: general/prog/scons.xml
===================================================================
--- general/prog/scons.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/prog/scons.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,7 +7,7 @@
   <!ENTITY scons-download-http "&sourceforge-repo;/scons/scons-&scons-version;.tar.gz">
   <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "9a0ddf33d9839f04380e0fae87cc4b40">
-  <!ENTITY scons-size          "628 KB">
-  <!ENTITY scons-buildsize     "13 MB">
+  <!ENTITY scons-md5sum        "9e00fa0df8f5ca5c5f5975b40e0ed354">
+  <!ENTITY scons-size          "608 KB">
+  <!ENTITY scons-buildsize     "5.2 MB">
   <!ENTITY scons-time          "less than 0.1 SBU">
 ]>
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/sysutils/bluez.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,8 +7,8 @@
   <!ENTITY bluez-download-http "http://www.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz">
   <!ENTITY bluez-download-ftp  "ftp://ftp.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz">
-  <!ENTITY bluez-md5sum        "33177e5743e24b2b3738f72be64e3ffb">
-  <!ENTITY bluez-size          "1.6 MB">
-  <!ENTITY bluez-buildsize     "87 MB (with tests)">
-  <!ENTITY bluez-time          "0.7 SBU (with tests)">
+  <!ENTITY bluez-md5sum        "c0c2b8d1151c7538bf3ae7bfc78aa912">
+  <!ENTITY bluez-size          "1.3 MB">
+  <!ENTITY bluez-buildsize     "60 MB (add 13 MB for tests)">
+  <!ENTITY bluez-time          "0.7 SBU (add 0.9 SBU for tests)">
 ]>
 
Index: general/sysutils/p7zip.xml
===================================================================
--- general/sysutils/p7zip.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/sysutils/p7zip.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY p7zip-download-http "&sourceforge-repo;/project/p7zip/p7zip/&p7zip-version;/p7zip_&p7zip-version;_src_all.tar.bz2">
+  <!ENTITY p7zip-download-http "&sourceforge-repo;/p7zip/p7zip_&p7zip-version;_src_all.tar.bz2">
   <!ENTITY p7zip-download-ftp  " ">
-  <!ENTITY p7zip-md5sum        "6cba8402ccab2370d3b70c5e28b3d651">
-  <!ENTITY p7zip-size          "3.8 MB">
-  <!ENTITY p7zip-buildsize     "39 MB">
-  <!ENTITY p7zip-time          "0.8 SBU">
+  <!ENTITY p7zip-md5sum        "92cca093312b5a71a7be7dc7d1d32509">
+  <!ENTITY p7zip-size          "4.0 MB">
+  <!ENTITY p7zip-buildsize     "33 MB">
+  <!ENTITY p7zip-time          "1.2 SBU (with tests)">
 ]>
 
@@ -95,6 +95,5 @@
     </para>
 
-<screen><userinput>sed -i -e 's/chmod 555/chmod 755/' -e 's/chmod 444/chmod 644/' install.sh &amp;&amp;
-make all3</userinput></screen>
+<screen><userinput>make all3</userinput></screen>
 
     <para>
@@ -111,4 +110,6 @@
      DEST_MAN=/usr/share/man \
      DEST_SHARE_DOC=/usr/share/doc/p7zip-&p7zip-version; install</userinput></screen>
+
+    <note><para>If using DESTDIR techniques, use DEST_DIR instead.</para></note>
 
   </sect2>
Index: general/sysutils/sysstat.xml
===================================================================
--- general/sysutils/sysstat.xml	(revision 54aaa8908ae76b46bd90554ddc929639ffb4d191)
+++ general/sysutils/sysstat.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
@@ -7,7 +7,7 @@
   <!ENTITY sysstat-download-http "http://perso.wanadoo.fr/sebastien.godard/sysstat-&sysstat-version;.tar.xz">
   <!ENTITY sysstat-download-ftp  " ">
-  <!ENTITY sysstat-md5sum        "e8b615775ad98780e3f0675b91eddb19">
-  <!ENTITY sysstat-size          "316 KB">
-  <!ENTITY sysstat-buildsize     "8.0 MB">
+  <!ENTITY sysstat-md5sum        "046445d731deda7e4cae18b011629fd2">
+  <!ENTITY sysstat-size          "328 KB">
+  <!ENTITY sysstat-buildsize     "6.6 MB">
   <!ENTITY sysstat-time          "0.1 SBU">
 ]>
