Index: general/genutils/bogofilter.xml
===================================================================
--- general/genutils/bogofilter.xml	(revision bb5351185c0ed2e7805cb64c4db6fdb408861920)
+++ general/genutils/bogofilter.xml	(revision bb5351185c0ed2e7805cb64c4db6fdb408861920)
@@ -0,0 +1,268 @@
+<?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 bogofilter-download-http "&sourceforge-repo;/bogofilter/bogofilter-&bogofilter-version;.tar.gz">
+  <!ENTITY bogofilter-download-ftp  " ">
+  <!ENTITY bogofilter-md5sum        "6ce27a692d2d4881e9898f3798dcf91c">
+  <!ENTITY bogofilter-size          "1.9 MB">
+  <!ENTITY bogofilter-buildsize     "16 MB">
+  <!ENTITY bogofilter-time          "0.1 SBU">
+]>
+
+<sect1 id="bogofilter" xreflabel="Bogofilter-&bogofilter-version;" revision="systemd">
+  <?dbhtml filename="bogofilter.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Bogofilter-&bogofilter-version;</title>
+
+  <indexterm zone="bogofilter">
+    <primary sortas="a-Bogofilter">Bogofilter</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Bogofilter</title>
+
+    <para>
+      The<application>Bogofilter</application> application is a mail filter that classifies
+      mail as spam or ham (non-spam) by a statistical analysis of the message's header and
+      content (body).
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&bogofilter-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&bogofilter-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &bogofilter-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &bogofilter-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &bogofilter-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &bogofilter-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Bogofilter Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="db"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gsl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="sqlite"/>,
+      <ulink url="http://fallabs.com/qdbm/">QDBM</ulink> and
+      <ulink url="http://fallabs.com/tokyocabinet/">TokyoCabinet</ulink>
+    </para>
+
+    <note>
+      <para>
+        If you do not install the recommended <xref linkend="gsl"/> package
+        then a statically linked shipped version will be used instead.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/bogofilter"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Bogofilter</title>
+
+    <para>
+      Install <application>Bogofilter</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc/bogofilter &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This application 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>
+      <option>--with-database=</option>: This switch allows you to change
+      the default database from db to either qdbm, sqlite3 or tokyocabinet.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          bf_compact, bf_copy, bf_tar, bogofilter, bogolexer, bogotune,
+          bogoupgrade and bogoutil
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /etc/bogofilter
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bf_compact">
+        <term><command>bf_compact</command></term>
+        <listitem>
+          <para>
+            creates a more compact bogofilter working directory with a
+            dump/load cycle.
+          </para>
+          <indexterm zone="bogofilter bf_compact">
+            <primary sortas="b-bf_compact">bf_compact</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bf_copy">
+        <term><command>bf_copy</command></term>
+        <listitem>
+          <para>
+            copies a bogofilter working directory to another directory.
+          </para>
+          <indexterm zone="bogofilter bf_copy">
+            <primary sortas="b-bf_copy">bf_copy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bf_tar">
+        <term><command>bf_tar</command></term>
+        <listitem>
+          <para>
+            bundles a bogofilter working directory in tar format and
+            copies it to standard output.
+          </para>
+          <indexterm zone="bogofilter bf_tar">
+            <primary sortas="b-bf_tar">bf_tar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bogofilter-prog">
+        <term><command>bogofilter</command></term>
+        <listitem>
+          <para>
+            is a fast Bayesian spam filter.
+          </para>
+          <indexterm zone="bogofilter bogofilter-prog">
+            <primary sortas="b-bogofilter">bogofilter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bogolexer">
+        <term><command>bogolexer</command></term>
+        <listitem>
+          <para>
+            used to separate messages into tokens and to test new
+            versions of the lexer.l code.
+          </para>
+          <indexterm zone="bogofilter bogolexer">
+            <primary sortas="b-bogolexer">bogolexer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bogotune">
+        <term><command>bogotune</command></term>
+        <listitem>
+          <para>
+            tries to find optimum parameter settings for bogofilter.
+          </para>
+          <indexterm zone="bogofilter bogotune">
+            <primary sortas="b-bogotune">bogotune</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bogoupgrade">
+        <term><command>bogoupgrade</command></term>
+        <listitem>
+          <para>
+            upgrades bogofilter database to current version.
+          </para>
+          <indexterm zone="bogofilter bogoupgrade">
+            <primary sortas="b-bogoupgrade">bogoupgrade</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bogoutil">
+        <term><command>bogoutil</command></term>
+        <listitem>
+          <para>
+            dumps, loads, and maintains bogofilter database files.
+          </para>
+          <indexterm zone="bogofilter bogoutil">
+            <primary sortas="b-bogoutil">bogoutil</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genutils/genutils.xml	(revision bb5351185c0ed2e7805cb64c4db6fdb408861920)
@@ -22,4 +22,8 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
+
+  <!-- systemd only -->
+  <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"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
@@ -28,4 +32,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highlight.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
Index: general/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision bb5351185c0ed2e7805cb64c4db6fdb408861920)
+++ general/genutils/highlight.xml	(revision bb5351185c0ed2e7805cb64c4db6fdb408861920)
@@ -0,0 +1,200 @@
+<?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 highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
+  <!ENTITY highlight-download-ftp  " ">
+  <!ENTITY highlight-md5sum        "05f75d4fb18a401181e658dcaf8ff562">
+  <!ENTITY highlight-size          "608 KB">
+  <!ENTITY highlight-buildsize     "17 MB (without GUI or API docs)">
+  <!ENTITY highlight-time          "0.7 SBU (without GUI or API docs)">
+]>
+
+<sect1 id="highlight" xreflabel="Highlight-&highlight-version;" revision="systemd">
+  <?dbhtml filename="highlight.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Highlight-&highlight-version;</title>
+
+  <indexterm zone="highlight">
+    <primary sortas="a-Highlight">Highlight</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Highlight</title>
+
+    <para>
+      <application>Highlight</application> is an utility that converts
+      source code to formatted text with syntax highlighting.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&highlight-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&highlight-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &highlight-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &highlight-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &highlight-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &highlight-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Highlight Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="boost"/> and
+      <xref linkend="lua"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/> (to build the API documentation) and
+      <xref linkend="qt4"/> (to build the GUI front-en)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/highlight"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Highlight</title>
+
+    <para>
+      To build <application>Highlight</application> run the following
+      command:
+    </para>
+
+<screen><userinput>make</userinput></screen>
+
+    <para>
+      To build the <application>Qt4</application> GUI front-end, run the
+      following command:
+    </para>
+
+<screen><userinput>make gui</userinput></screen>
+
+    <para>
+      To build the API documentation, run the following command:
+    </para>
+
+<screen><userinput>make apidocs</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      To install <application>Highlight</application>, run the
+      following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To install the GUI program, run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install-gui</userinput></screen>
+
+    <para>
+      To install the API documentation, run the following command
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>cp -rv apidocs/html /usr/share/doc/highlight/apidocs</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          highlight and highlight-gui
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /etc/highlight
+          /usr/share/doc/highlight, and
+          /usr/share/highlight
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="highlight-prog">
+        <term><command>highlight</command></term>
+        <listitem>
+          <para>
+            is a universal source code to formatted text converter.
+          </para>
+          <indexterm zone="highlight highlight-prog">
+            <primary sortas="b-highlight">highlight</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="highlight-gui">
+        <term><command>highlight-gui</command></term>
+        <listitem>
+          <para>
+            is the <application>Qt4</application> interface to
+            <command>highlight</command>.
+          </para>
+          <indexterm zone="highlight highlight-gui">
+            <primary sortas="b-highlight-gui">highlight-gui</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/ibus.xml
===================================================================
--- general/genutils/ibus.xml	(revision bb5351185c0ed2e7805cb64c4db6fdb408861920)
+++ general/genutils/ibus.xml	(revision bb5351185c0ed2e7805cb64c4db6fdb408861920)
@@ -0,0 +1,237 @@
+<?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 ibus-download-http "https://github.com/ibus/ibus/releases/download/&ibus-version;/ibus-&ibus-version;.tar.gz">
+  <!ENTITY ibus-download-ftp  " ">
+  <!ENTITY ibus-md5sum        "48f158c10dcd69f3ddedc13de4991528">
+  <!ENTITY ibus-size          "2.1 MB">
+  <!ENTITY ibus-buildsize     "56 MB">
+  <!ENTITY ibus-time          "0.6 SBU">
+]>
+
+<sect1 id="ibus" xreflabel="IBus-&ibus-version;" revision="systemd">
+  <?dbhtml filename="ibus.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>IBus-&ibus-version;</title>
+
+  <indexterm zone="ibus">
+    <primary sortas="a-IBus">IBus</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to IBus</title>
+
+    <para>
+      <application>IBus</application> is an Intelligent Input Bus. It is a new
+      input framework for Linux OS. It provides full featured and user friendly
+      input method user interface.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&ibus-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&ibus-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &ibus-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &ibus-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &ibus-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &ibus-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">IBus Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dconf"/> and
+      <xref linkend="iso-codes"/>
+    </para>
+      
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="libnotify"/>, and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="dbus-python"/> and
+      <xref linkend="pygobject3"/> (both to build the Python support library),
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="python3"/>,
+      <xref linkend="pyxdg"/> (for the <command>ibus-setup</command>), and
+      <xref linkend="libxkbcommon"/> and
+      <xref linkend="wayland"/> (both to build the Wayland support programs)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/ibus"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of IBus</title>
+
+    <para>
+      Install <application>IBus</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>.
+      Some tests may fail for unknown reasons.
+    </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>
+      <option>--disable-gtk2</option>: This switch disables building
+      of the <application>GTK+ 2</application> immodule. Use it if
+      you have not installed <application>GTK+ 2</application>.
+    </para>
+
+    <para>
+      <option>--enable-python-library</option>: This switch enables
+      building of the <application>Python</application> support
+      library. Use it if have installed the optional dependencies.
+    </para>
+
+    <para>
+      <option>--enable-wayland</option>: This switch enables building
+      of the <application>Wayland</application> support programs.
+      Use it if you have installed the optional dependencies.
+    </para>
+
+    <para>
+      <option>--with-python=python3</option>: This switch makes
+      the <command>configure</command> look for
+      <application>Python 3</application>. Use it if you want
+      to build the <application>Python 3</application> support
+      library alongside the <application>Python 2</application>
+      one.
+    </para>
+
+    <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>
+          ibus, ibus-daemon, and ibus-setup
+        </seg>
+        <seg>
+          libibus-1.0.so and im-ibus.so
+          (<application>GTK+ Immodule</application>)
+        </seg>
+        <seg>
+          /etc/dconf/db/ibus.d,
+          /usr/include/ibus-1.0,
+          /usr/lib/ibus,
+          /usr/share/gtk-doc/html/ibus, and
+          /usr/share/ibus
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ibus-daemon">
+        <term><command>ibus-daemon</command></term>
+        <listitem>
+          <para>
+            is the Intelligent Input Bus Daemon.
+          </para>
+          <indexterm zone="ibus ibus-daemon">
+            <primary sortas="b-ibus-daemon">ibus-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ibus-setup">
+        <term><command>ibus-setup</command></term>
+        <listitem>
+          <para>
+            is the <application>GTK+</application> program used to configure
+            the <command>ibus-daemon</command>.
+          </para>
+          <indexterm zone="ibus ibus-setup">
+            <primary sortas="b-ibus-setup">ibus-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libibus-1.0">
+        <term><filename class="libraryfile">libibus-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>IBus</application> API functions.
+          </para>
+          <indexterm zone="ibus libibus-1.0">
+            <primary sortas="c-libibus-1.0">libibus-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
