Index: archive/rarian.xml
===================================================================
--- archive/rarian.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
+++ archive/rarian.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -0,0 +1,337 @@
+<?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 rarian-download-http "&gnome-download-http;/rarian/0.8/rarian-0.8.1.tar.bz2">
+  <!ENTITY rarian-download-ftp  "&gnome-download-ftp;/rarian/0.8/rarian-0.8.1.tar.bz2">
+  <!ENTITY rarian-md5sum        "75091185e13da67a0ff4279de1757b94">
+  <!ENTITY rarian-size          "317 KB">
+  <!ENTITY rarian-buildsize     "6 MB">
+  <!ENTITY rarian-time          "0.2 SBU">
+]>
+
+<sect1 id="rarian" xreflabel="Rarian-&rarian-version;">
+  <?dbhtml filename="rarian.html"?>
+
+  <sect1info>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Rarian-&rarian-version;</title>
+
+  <indexterm zone="rarian">
+    <primary sortas="a-Rarian">Rarian</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Rarian</title>
+
+    <para>
+      The <application>Rarian</application> package is a documentation
+      metadata library based on the proposed Freedesktop.org spec. <application>
+      Rarian</application> is designed to be a replacement for <application>
+      ScrollKeeper</application>.
+    </para>
+
+    &lfs110a_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&rarian-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&rarian-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &rarian-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &rarian-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &rarian-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &rarian-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Rarian Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libxslt"/> (<command>rarian-sk-extract</command> will not
+      be built without this) and
+      <xref linkend="DocBook"/> (without this, <application>Rarian
+      </application> scripts source DTDs from the net)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/rarian"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Rarian</title>
+
+    <para>
+      Install <application>Rarian</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --disable-static     \
+            --localstatedir=/var &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/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>rarian-example, rarian-sk-config, rarian-sk-extract,
+        rarian-sk-gen-uuid, rarian-sk-get-cl, rarian-sk-get-content-list,
+        rarian-sk-get-extended-content-list, rarian-sk-get-scripts,
+        rarian-sk-install, rarian-sk-migrate, rarian-sk-preinstall,
+        rarian-sk-rebuild, and rarian-sk-update</seg>
+        <seg>librarian.so</seg>
+        <seg>/usr/include/rarian, /usr/share/help, /usr/share/librarian/manual,
+        /usr/share/librarian/Templates/C, and /var/lib/rarian</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rarian-example">
+        <term><command>rarian-example</command></term>
+        <listitem>
+          <para>
+            prints a nice list of all available documents found by the
+            library
+          </para>
+          <indexterm zone="rarian rarian-example">
+            <primary sortas="b-rarian-example">rarian-example</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-config">
+        <term><command>rarian-sk-config</command></term>
+        <listitem>
+          <para>
+            emulates <command>scrollkeeper-config</command>
+          </para>
+          <indexterm zone="rarian rarian-sk-config">
+            <primary sortas="b-rarian-sk-config">rarian-sk-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-extract">
+        <term><command>rarian-sk-extract</command></term>
+        <listitem>
+          <para>
+            is a wrapper around xsltproc to mimic <command>
+            scrollkeeper-extract</command>
+          </para>
+          <indexterm zone="rarian rarian-sk-extract">
+            <primary sortas="b-rarian-sk-extract">rarian-sk-extract</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-gen-uuid">
+        <term><command>rarian-sk-gen-uuid</command></term>
+        <listitem>
+          <para>
+            generates a unique (random) uuid
+          </para>
+          <indexterm zone="rarian rarian-sk-gen-uuid">
+            <primary sortas="b-rarian-sk-gen-uuid">rarian-sk-gen-uuid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-get-cl">
+        <term><command>rarian-sk-get-cl</command></term>
+        <listitem>
+          <para>
+            gets a content list (category tree)
+          </para>
+          <indexterm zone="rarian rarian-sk-get-cl">
+            <primary sortas="b-rarian-sk-get-cl">rarian-sk-get-cl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-get-content-list">
+        <term><command>rarian-sk-get-content-list</command></term>
+        <listitem>
+          <para>
+            is a simple wrapper to make calling <command>scrollkeeper-get-cl
+            </command> easier
+          </para>
+          <indexterm zone="rarian rarian-sk-get-content-list">
+            <primary sortas="b-rarian-sk-get-content-list">
+            rarian-sk-get-content-list</primary>
+
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-get-extended-content-list">
+        <term><command>rarian-sk-get-extended-content-list</command></term>
+        <listitem>
+          <para>
+            is a simple wrapper to make calling <command>scrollkeeper-get-cl
+            </command> (extended) easier
+          </para>
+          <indexterm zone="rarian rarian-sk-get-extended-content-list">
+            <primary sortas="b-rarian-sk-get-extended-content-list">
+            rarian-sk-get-extended-content-list</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-get-scripts">
+        <term><command>rarian-sk-get-scripts</command></term>
+        <listitem>
+          <para>
+            emulates <command>
+            scrollkeeper-get-index-from-index-from-docpath</command>, <command>
+            scrollkeeper-get-toc-from-docpath</command>, and <command>
+            scrollkeeper-get-toc-from-id</command>
+          </para>
+          <indexterm zone="rarian rarian-sk-get-scripts">
+            <primary sortas="b-rarian-sk-get-scripts">rarian-sk-get-scripts</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-install">
+        <term><command>rarian-sk-install</command></term>
+        <listitem>
+          <para>
+            emulates <command>scrollkeeper-install</command> and
+            <command>scrollkeeper-uninstall</command>
+          </para>
+          <indexterm zone="rarian rarian-sk-install">
+            <primary sortas="b-rarian-sk-install">rarian-sk-install</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-migrate">
+        <term><command>rarian-sk-migrate</command></term>
+        <listitem>
+          <para>
+            takes in a directory full of omf's, reads and parses them and
+            spews out an equivalent scroll file
+          </para>
+          <indexterm zone="rarian rarian-sk-migrate">
+            <primary sortas="b-rarian-sk-migrate">rarian-sk-migrate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-preinstall">
+        <term><command>rarian-sk-preinstall</command></term>
+        <listitem>
+          <para>
+            creates the omf file by reading an existing omf file and
+            replacing the url for a resource with the url
+          </para>
+          <indexterm zone="rarian rarian-sk-preinstall">
+            <primary sortas="b-rarian-sk-preinstall">rarian-sk-preinstall</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-rebuild">
+        <term><command>rarian-sk-rebuild</command></term>
+        <listitem>
+          <para>
+            is a simple wrapper script to emulate <command>
+            scrollkeeper-rebuilddb</command>
+          </para>
+          <indexterm zone="rarian rarian-sk-rebuild">
+            <primary sortas="b-rarian-sk-rebuild">rarian-sk-rebuild</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rarian-sk-update">
+        <term><command>rarian-sk-update</command></term>
+        <listitem>
+          <para>
+            is compatible with the <command>scrollkeeper-update</command>
+            script that's required to be run when installing new omf files.  It
+            converts the omf files into new-style scrolls
+          </para>
+          <indexterm zone="rarian rarian-sk-update">
+            <primary sortas="b-rarian-sk-update">rarian-sk-update</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry id="librarian">
+        <term><filename class="libraryfile">librarian.{so,a}</filename></term>
+        <listitem>
+          <para>
+            is the API to build a list of available meta data files and
+            allows access to these
+          </para>
+          <indexterm zone="rarian librarian">
+            <primary sortas="c-librarian">librarian.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ general/genutils/genutils.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -38,5 +38,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>
Index: neral/genutils/rarian.xml
===================================================================
--- general/genutils/rarian.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ 	(revision )
@@ -1,337 +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 rarian-download-http "&gnome-download-http;/rarian/0.8/rarian-0.8.1.tar.bz2">
-  <!ENTITY rarian-download-ftp  "&gnome-download-ftp;/rarian/0.8/rarian-0.8.1.tar.bz2">
-  <!ENTITY rarian-md5sum        "75091185e13da67a0ff4279de1757b94">
-  <!ENTITY rarian-size          "317 KB">
-  <!ENTITY rarian-buildsize     "6 MB">
-  <!ENTITY rarian-time          "0.2 SBU">
-]>
-
-<sect1 id="rarian" xreflabel="Rarian-&rarian-version;">
-  <?dbhtml filename="rarian.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Rarian-&rarian-version;</title>
-
-  <indexterm zone="rarian">
-    <primary sortas="a-Rarian">Rarian</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rarian</title>
-
-    <para>
-      The <application>Rarian</application> package is a documentation
-      metadata library based on the proposed Freedesktop.org spec. <application>
-      Rarian</application> is designed to be a replacement for <application>
-      ScrollKeeper</application>.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rarian-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rarian-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rarian-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rarian-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rarian-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rarian-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Rarian Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxslt"/> (<command>rarian-sk-extract</command> will not
-      be built without this) and
-      <xref linkend="DocBook"/> (without this, <application>Rarian
-      </application> scripts source DTDs from the net)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/rarian"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rarian</title>
-
-    <para>
-      Install <application>Rarian</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --disable-static     \
-            --localstatedir=/var &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/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rarian-example, rarian-sk-config, rarian-sk-extract,
-        rarian-sk-gen-uuid, rarian-sk-get-cl, rarian-sk-get-content-list,
-        rarian-sk-get-extended-content-list, rarian-sk-get-scripts,
-        rarian-sk-install, rarian-sk-migrate, rarian-sk-preinstall,
-        rarian-sk-rebuild, and rarian-sk-update</seg>
-        <seg>librarian.so</seg>
-        <seg>/usr/include/rarian, /usr/share/help, /usr/share/librarian/manual,
-        /usr/share/librarian/Templates/C, and /var/lib/rarian</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rarian-example">
-        <term><command>rarian-example</command></term>
-        <listitem>
-          <para>
-            prints a nice list of all available documents found by the
-            library
-          </para>
-          <indexterm zone="rarian rarian-example">
-            <primary sortas="b-rarian-example">rarian-example</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-config">
-        <term><command>rarian-sk-config</command></term>
-        <listitem>
-          <para>
-            emulates <command>scrollkeeper-config</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-config">
-            <primary sortas="b-rarian-sk-config">rarian-sk-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-extract">
-        <term><command>rarian-sk-extract</command></term>
-        <listitem>
-          <para>
-            is a wrapper around xsltproc to mimic <command>
-            scrollkeeper-extract</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-extract">
-            <primary sortas="b-rarian-sk-extract">rarian-sk-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-gen-uuid">
-        <term><command>rarian-sk-gen-uuid</command></term>
-        <listitem>
-          <para>
-            generates a unique (random) uuid
-          </para>
-          <indexterm zone="rarian rarian-sk-gen-uuid">
-            <primary sortas="b-rarian-sk-gen-uuid">rarian-sk-gen-uuid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-cl">
-        <term><command>rarian-sk-get-cl</command></term>
-        <listitem>
-          <para>
-            gets a content list (category tree)
-          </para>
-          <indexterm zone="rarian rarian-sk-get-cl">
-            <primary sortas="b-rarian-sk-get-cl">rarian-sk-get-cl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-content-list">
-        <term><command>rarian-sk-get-content-list</command></term>
-        <listitem>
-          <para>
-            is a simple wrapper to make calling <command>scrollkeeper-get-cl
-            </command> easier
-          </para>
-          <indexterm zone="rarian rarian-sk-get-content-list">
-            <primary sortas="b-rarian-sk-get-content-list">
-            rarian-sk-get-content-list</primary>
-
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-extended-content-list">
-        <term><command>rarian-sk-get-extended-content-list</command></term>
-        <listitem>
-          <para>
-            is a simple wrapper to make calling <command>scrollkeeper-get-cl
-            </command> (extended) easier
-          </para>
-          <indexterm zone="rarian rarian-sk-get-extended-content-list">
-            <primary sortas="b-rarian-sk-get-extended-content-list">
-            rarian-sk-get-extended-content-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-scripts">
-        <term><command>rarian-sk-get-scripts</command></term>
-        <listitem>
-          <para>
-            emulates <command>
-            scrollkeeper-get-index-from-index-from-docpath</command>, <command>
-            scrollkeeper-get-toc-from-docpath</command>, and <command>
-            scrollkeeper-get-toc-from-id</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-get-scripts">
-            <primary sortas="b-rarian-sk-get-scripts">rarian-sk-get-scripts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-install">
-        <term><command>rarian-sk-install</command></term>
-        <listitem>
-          <para>
-            emulates <command>scrollkeeper-install</command> and
-            <command>scrollkeeper-uninstall</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-install">
-            <primary sortas="b-rarian-sk-install">rarian-sk-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-migrate">
-        <term><command>rarian-sk-migrate</command></term>
-        <listitem>
-          <para>
-            takes in a directory full of omf's, reads and parses them and
-            spews out an equivalent scroll file
-          </para>
-          <indexterm zone="rarian rarian-sk-migrate">
-            <primary sortas="b-rarian-sk-migrate">rarian-sk-migrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-preinstall">
-        <term><command>rarian-sk-preinstall</command></term>
-        <listitem>
-          <para>
-            creates the omf file by reading an existing omf file and
-            replacing the url for a resource with the url
-          </para>
-          <indexterm zone="rarian rarian-sk-preinstall">
-            <primary sortas="b-rarian-sk-preinstall">rarian-sk-preinstall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-rebuild">
-        <term><command>rarian-sk-rebuild</command></term>
-        <listitem>
-          <para>
-            is a simple wrapper script to emulate <command>
-            scrollkeeper-rebuilddb</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-rebuild">
-            <primary sortas="b-rarian-sk-rebuild">rarian-sk-rebuild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-update">
-        <term><command>rarian-sk-update</command></term>
-        <listitem>
-          <para>
-            is compatible with the <command>scrollkeeper-update</command>
-            script that's required to be run when installing new omf files.  It
-            converts the omf files into new-style scrolls
-          </para>
-          <indexterm zone="rarian rarian-sk-update">
-            <primary sortas="b-rarian-sk-update">rarian-sk-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="librarian">
-        <term><filename class="libraryfile">librarian.{so,a}</filename></term>
-        <listitem>
-          <para>
-            is the API to build a list of available meta data files and
-            allows access to these
-          </para>
-          <indexterm zone="rarian librarian">
-            <primary sortas="c-librarian">librarian.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ general/prog/git.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -9,5 +9,5 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "0990ff97af1511be0d9f0d3223dd4359">
+  <!ENTITY git-md5sum        "3462f34d9c17288eee854b7645f6a0a1">
 
   <!ENTITY git-size          "6.2 MB">
@@ -18,5 +18,5 @@
   <!-- With 2.23.0, there was a large increase in time for tests. Possibly disk related? -->
   <!-- Confirmed that it is disk related.-->
-  <!ENTITY git-time          "0.4 SBU (with parallelism=4; add 0.4 SBU for building documentation and 2.1 SBU for tests, both with parallelism=4)">
+  <!ENTITY git-time          "0.5 SBU (with parallelism=4; add 0.4 SBU for building documentation and 2.1 SBU for tests, both with parallelism=4)">
 ]>
 
Index: general/prog/jinja2.xml
===================================================================
--- general/prog/jinja2.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ general/prog/jinja2.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -7,5 +7,5 @@
   <!ENTITY Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
   <!ENTITY Jinja2-download-ftp  " ">
-  <!ENTITY Jinja2-md5sum        "25ba6ef98c164878acff1036fbd72a1d">
+  <!ENTITY Jinja2-md5sum        "059f89375d7ea60eb7013f341f0b89e7">
   <!ENTITY Jinja2-size          "264 KB">
   <!ENTITY Jinja2-buildsize     "2.3 MB">
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ general/prog/python3.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -8,8 +8,8 @@
            "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "fddb060b483bc01850a3f412eea1d954">
+  <!ENTITY python3-md5sum        "3e7035d272680f80e3ce4e8eb492d580">
   <!ENTITY python3-size          "18 MB">
-  <!ENTITY python3-buildsize     "193 MB (add 36 MB for tests)">
-  <!ENTITY python3-time          "2.4 SBU (using parallelism=4; add 1.7 SBU for tests)">
+  <!ENTITY python3-buildsize     "200 MB (add 38 MB for tests)">
+  <!ENTITY python3-time          "2.4 SBU (using parallelism=4; add 1.6 SBU for tests)">
   <!--
   Note: Size does not reflect docs that were install in LFS.
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ introduction/welcome/changelog.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -53,6 +53,57 @@
 
     <listitem>
+      <para>October 15th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt cracklib to build with Python 3.10.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt gpgme to build with Python 3.10.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 14th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to imlib2-1.7.4. Fixes
+          <ulink url="&blfs-ticket-root;15373">#15373</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to vim-8.2.3508. Fixes
+          <ulink url="&blfs-ticket-root;15671">#15671</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Jinja2-3.0.2. Fixes
+          <ulink url="&blfs-ticket-root;15645">#15645</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to python3-3.10.0. Fixes
+          <ulink url="&blfs-ticket-root;15641">#15641</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 13th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Upgrade ristretto-0.12.0. Fixes
+          <ulink url="&blfs-ticket-root;15666">#15666</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Upgrade git-2.33.1. Fixes
+          <ulink url="&blfs-ticket-root;15669">#15669</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 12th, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Archive Rarian.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to node.js-v14.18.1 (security fix). Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ packages.ent	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -65,5 +65,5 @@
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
 <!ENTITY nano-version                 "5.9">
-<!ENTITY vim-version                  "8.2.3337">
+<!ENTITY vim-version                  "8.2.3508">
 <!ENTITY vim-majmin                   "82">
 
@@ -346,5 +346,5 @@
 <!ENTITY gc-version                   "8.0.4">
 <!ENTITY gdb-version                  "11.1">
-<!ENTITY git-version                  "2.33.0">
+<!ENTITY git-version                  "2.33.1">
 <!ENTITY guile-version                "3.0.7">
 <!ENTITY librep-version               "0.92.7">
@@ -365,6 +365,6 @@
 
 <!ENTITY python3-major                "3">
-<!ENTITY python3-minor                "9">
-<!ENTITY python3-patch                "7">
+<!ENTITY python3-minor                "10">
+<!ENTITY python3-patch                "0">
 <!ENTITY python3-majorver             "&python3-major;.&python3-minor;">
 <!ENTITY python3-version              "&python3-majorver;.&python3-patch;">
@@ -564,5 +564,5 @@
 <!-- <!ENTITY funcsigs-version             "1.0.2"> -->
 <!ENTITY decorator-version            "5.0.9">
-<!ENTITY Jinja2-version               "3.0.1">
+<!ENTITY Jinja2-version               "3.0.2">
 <!-- libxml2 for Python2 shares the version of libxml2 -->
 <!ENTITY lxml-version                 "4.6.3">
@@ -760,5 +760,5 @@
 <!ENTITY gtksourceview5-version       "5.2.0">
 <!ENTITY gtk-vnc-version              "1.2.0">
-<!ENTITY imlib2-version               "1.7.2">
+<!ENTITY imlib2-version               "1.7.4">
 <!ENTITY keybinder2-version           "0.3.1">
 <!ENTITY keybinder3-version           "0.3.2">
@@ -860,5 +860,5 @@
 <!ENTITY xfce4-terminal-version       "0.8.10">
 <!ENTITY xfburn-version               "0.6.2">
-<!ENTITY ristretto-version            "0.11.0">
+<!ENTITY ristretto-version            "0.12.0">
 <!ENTITY xfce4-mixer-version          "4.10.0">
 <!ENTITY xfce4-notifyd-version        "0.6.2">
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ postlfs/editors/vim.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -9,8 +9,8 @@
   <!ENTITY vim-download-http "&sources-anduin-http;/vim/vim-&vim-version;.tar.gz">
   <!ENTITY vim-download-ftp  " ">
-  <!ENTITY vim-md5sum        "e0325a4988b1b99b9c2e46fa853c1980">
+  <!ENTITY vim-md5sum        "f6004d3e776040e2301a1967975d00d1">
   <!ENTITY vim-size          "15 MB">
   <!ENTITY vim-buildsize     "109 MB (add 61 MB for tests)">
-  <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 2.1 SBU for tests)">
+  <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 2.2 SBU for tests)">
 ]>
 
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ postlfs/security/cracklib.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -134,4 +134,6 @@
 
 <screen><userinput>sed -i '/skipping/d' util/packer.c &amp;&amp;
+
+sed -i '15209 s/.*/am_cv_python_version=&python3-majorver;/' configure &amp;&amp;
 
 PYTHON=python3 CPPFLAGS=-I/usr/include/python&python3-majorver; \
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ postlfs/security/gpgme.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -106,8 +106,16 @@
 
     <para>
-      At first, fix an issue building the package with Glibc-2.34 or later:
-    </para>
-
-<screen><userinput>sed 's/defined(__sun.*$/1/' -i src/posix-io.c</userinput></screen>
+      First, fix an issue building the package with Glibc-2.34 or later:
+    </para>
+
+<screen><userinput remap="pre">sed 's/defined(__sun.*$/1/' -i src/posix-io.c</userinput></screen>
+
+    <para>
+      Next, fix an issue building with Python 3.10 installed:
+    </para>
+
+<screen><userinput remap="pre">sed -e 's/3\.9/3\.10/'   \
+    -e '23664,+3 s/^/#/' \
+    -i configure</userinput></screen>
 
     <para>
Index: x/lib/imlib2.xml
===================================================================
--- x/lib/imlib2.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ x/lib/imlib2.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -7,5 +7,5 @@
   <!ENTITY imlib2-download-http "&sourceforge-dl;/enlightenment/imlib2-&imlib2-version;.tar.bz2">
   <!ENTITY imlib2-download-ftp  " ">
-  <!ENTITY imlib2-md5sum        "d24dc90ac08810d0a66bcd226e35a451">
+  <!ENTITY imlib2-md5sum        "373ddc1978e5aa6e3a11bdb1a9d622c6">
   <!ENTITY imlib2-size          "876 KB">
   <!ENTITY imlib2-buildsize     "11 MB">
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ x/lib/webkitgtk.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -126,5 +126,5 @@
       <ulink url="https://ccache.dev/">ccache</ulink>,
       <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
-      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>,
+      <ulink url="https://github.com/AOMediaCodec/libavif">libavif</ulink>,
       <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>, and
       <ulink url="https://github.com/flatpak/xdg-dbus-proxy">xdg-dbus-proxy</ulink>
Index: xfce/apps/ristretto.xml
===================================================================
--- xfce/apps/ristretto.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ xfce/apps/ristretto.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -6,8 +6,8 @@
 
   <!ENTITY ristretto-download-http
-           "https://archive.xfce.org/src/apps/ristretto/0.11/ristretto-&ristretto-version;.tar.bz2">
+           "https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-&ristretto-version;.tar.bz2">
   <!ENTITY ristretto-download-ftp  " ">
-  <!ENTITY ristretto-md5sum        "134d4a49a98b28ba6e91b862fb9a24cc">
-  <!ENTITY ristretto-size          "576 KB">
+  <!ENTITY ristretto-md5sum        "722e383b1ced064294146f515cbe15ff">
+  <!ENTITY ristretto-size          "586 KB">
   <!ENTITY ristretto-buildsize     "9.6 MB">
   <!ENTITY ristretto-time          "0.1 SBU">
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ xsoft/other/balsa.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -78,7 +78,7 @@
       <xref linkend="gmime3"/>,
       <xref linkend="gpgme"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="rarian"/>
+      <xref linkend="gtk3"/>, and
+      <xref linkend="libnotify"/>
+      <!--<xref linkend="rarian"/>-->
     </para>
 
Index: xsoft/other/hexchat.xml
===================================================================
--- xsoft/other/hexchat.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ xsoft/other/hexchat.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -8,6 +8,6 @@
   <!ENTITY hexchat-download-http "https://dl.hexchat.net/hexchat/hexchat-&hexchat-version;.tar.xz">
   <!ENTITY hexchat-download-ftp  " ">
-  <!ENTITY hexchat-md5sum        "9f04c48f011b646b91d03c5776fce776">
-  <!ENTITY hexchat-size          "1.2 MB">
+  <!ENTITY hexchat-md5sum        "ecf5133c369bbc88df064f8506867fb6">
+  <!ENTITY hexchat-size          "1.3 MB">
   <!ENTITY hexchat-buildsize     "21 MB">
   <!ENTITY hexchat-time          "0.1 SBU (using parallelism=4)">
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision 580ce987a3b8f9993f3939702dab2a0a7ec150ba)
+++ xsoft/other/tigervnc.xml	(revision 0b664be0f5c84976c17e77e5bfdef4b5937a3a8b)
@@ -159,5 +159,38 @@
     </para>
 
-<screen><userinput># Put code in place
+<screen revision="sysv"><userinput># Put code in place
+mkdir -p unix/xserver &amp;&amp;
+tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 \
+    --strip-components=1              \
+    -C unix/xserver                   &amp;&amp;
+( cd unix/xserver &amp;&amp;
+  patch -Np1 -i ../xserver120.patch ) &amp;&amp;
+
+# Build viewer
+cmake -G "Unix Makefiles"         \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DINSTALL_SYSTEMD_UNITS=OFF \
+      -Wno-dev . &amp;&amp;
+make &amp;&amp;
+
+# Build server
+pushd unix/xserver &amp;&amp;
+  autoreconf -fiv  &amp;&amp;
+
+  CPPFLAGS="-I/usr/include/drm"       \
+  ./configure $XORG_CONFIG            \
+      --disable-xwayland    --disable-dri        --disable-dmx         \
+      --disable-xorg        --disable-xnest      --disable-xvfb        \
+      --disable-xwin        --disable-xephyr     --disable-kdrive      \
+      --disable-devel-docs  --disable-config-hal --disable-config-udev \
+      --disable-unit-tests  --disable-selective-werror                 \
+      --disable-static      --enable-dri3                              \
+      --without-dtrace      --enable-dri2        --enable-glx          \
+      --with-pic &amp;&amp;
+  make  &amp;&amp;
+popd</userinput></screen>
+
+<screen revision="systemd"><userinput># Put code in place
 mkdir -p unix/xserver &amp;&amp;
 tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 \
