Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ gnome/applications/applications.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -29,9 +29,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cheese.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-calculator.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-color-manager.xml"/>
Index: ome/applications/epiphany.xml
===================================================================
--- gnome/applications/epiphany.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ 	(revision )
@@ -1,183 +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 epiphany-download-http
-           "&gnome-download-http;/epiphany/&gnome-minor-22;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-download-ftp
-           "&gnome-download-ftp;/epiphany/&gnome-minor-22;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "e08762c6bb01c4d291b3d22c7adb1a65">
-  <!ENTITY epiphany-size          "2.2 MB">
-  <!ENTITY epiphany-buildsize     "64 MB"> 
-  <!ENTITY epiphany-time          "0.7 SBU"> 
-]>
-
-<sect1 id="epiphany" xreflabel="Epiphany-&epiphany-version;">
-  <?dbhtml filename="epiphany.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Epiphany-&epiphany-version;</title>
-
-  <indexterm zone="epiphany">
-    <primary sortas="a-Epiphany">Epiphany</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Epiphany</title>
-
-    <para>
-      <application>Epiphany</application> is a simple yet powerful
-      <application>GNOME</application> web browser targeted at non-technical
-      users. Its principles are simplicity and standards compliance.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&epiphany-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&epiphany-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &epiphany-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &epiphany-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &epiphany-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &epiphany-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Epiphany Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="avahi"/>,
-      <xref linkend="gcr"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="libwnck"/>, and
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nss"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lsb-release"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="gnome-keyring"/> (for storing passwords) and
-      <xref linkend="seahorse"/> (for managing stored passwords)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/epiphany"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Epiphany</title>
-
-    <para>
-      Install <application>Epiphany</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-<!-- We will see if this happens to improve with a new release. If it doesn't,
-recommend changing to "This package does not have a working test suite." -->
-
-    <para>
-      An already active graphical session with a bus address is necessary
-      to execute the test suite.  Some tests may fail for unknown reasons.
-      To test the results, run:
-    </para>
-
-<screen><userinput>make -k check</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          epiphany and ephy-profile-migrator
-        </seg>
-        <seg>
-          libephywebextension.so
-        </seg>
-        <seg>
-          /usr/{lib,share,share/help/*}/epiphany
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="epiphany-prog">
-        <term><command>epiphany</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> web browser based on
-            the <application>WebKit2</application> rendering engine.
-          </para>
-          <indexterm zone="epiphany epiphany-prog">
-            <primary sortas="b-epiphany">epiphany</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gedit.xml
===================================================================
--- gnome/applications/gedit.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ 	(revision )
@@ -1,187 +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 gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-22;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-22;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "2f41105c5a87a5b4e4a82934cf7e01b7">
-  <!ENTITY gedit-size          "2.8 MB">
-  <!ENTITY gedit-buildsize     "93 MB">
-  <!ENTITY gedit-time          "0.9 SBU">
-]>
-
-<sect1 id="gedit" xreflabel="Gedit-&gedit-version;">
-  <?dbhtml filename="gedit.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Gedit-&gedit-version;</title>
-
-  <indexterm zone="gedit">
-    <primary sortas="a-Gedit">Gedit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gedit</title>
-
-    <para>
-      The <application>Gedit</application> package contains a lightweight
-      UTF-8 text editor for the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gedit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gedit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gedit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gedit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gedit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gedit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gedit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtksourceview"/>,
-      <xref linkend="itstool"/>, and
-      <xref linkend="libpeas"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gvfs"/> (runtime),
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libsoup"/>, and
-      <xref linkend="pygobject3"/>
-      (<application>Python</application> 3 module)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="vala"/>,
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gspell/">gspell</ulink>, and
-      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gedit"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gedit</title>
-
-    <para>
-      Install <application>Gedit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-spell &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-spell</parameter>: Use this switch to disable
-      spell-checking capability. It is required if
-      <application>gspell</application> is not installed.
-    </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 Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gedit and
-          gnome-text-editor (symlink to gedit)
-        </seg>
-        <seg>
-          libgedit.so
-        </seg>
-        <seg>
-          /usr/include/gedit-3.14 and
-          /usr/{lib,libexec,share,share/gtk-doc/html,share/help/*}/gedit
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gedit-prog">
-        <term><command>gedit</command></term>
-        <listitem>
-          <para>
-            is a lightweight text editor integrated with the
-            <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="gedit gedit-prog">
-            <primary sortas="b-gedit">gedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ introduction/welcome/changelog.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -47,4 +47,9 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Move editors and graphical browser to dedicated
+          chapters. Fixes
+          <ulink url="&blfs-ticket-root;8971">#8971</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to krb5-1.15.1. Fixes
           <ulink url="&blfs-ticket-root;8961">#8961</ulink>.</para>
Index: e/kf5-apps/kate5.xml
===================================================================
--- kde/kf5-apps/kate5.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ 	(revision )
@@ -1,184 +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 kate5-download-http "&kf5apps-download-http;/kate-&kf5apps-version;.tar.xz">
-  <!ENTITY kate5-download-ftp  " ">
-  <!ENTITY kate5-md5sum        "3c3c582cb26b355192165ed1ec1b3d7b">
-  <!ENTITY kate5-size          "1.8 MB">
-  <!ENTITY kate5-buildsize     "37 MB">
-  <!ENTITY kate5-time          "2.4 SBU">
-]>
-
-<sect1 id="kate5" xreflabel="Kate-&kf5apps-version;">
-  <?dbhtml filename="kate5.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kate-&kf5apps-version;</title>
-
-  <indexterm zone="kate5">
-    <primary sortas="a-Kate">Kate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kate</title>
-
-    <para>
-      The <application>Kate</application> package contains an advanced
-      KF5 based graphical text editor.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kate5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kate5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kate5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kate5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kate5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kate5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf5-frameworks"/>,
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://libgit2.github.com/">libgit2</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/kate5"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kate</title>
-
-    <para>
-      Install <application>Kate</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX  \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DLIB_INSTALL_DIR=lib               \
-      -DBUILD_TESTING=OFF                 \
-      -Wno-dev .. &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>
-          kate and kwrite
-        </seg>
-        <seg>
-          libkdeinit5_kate.so and libkdeinit5_kwrite.so
-        </seg>
-        <seg>
-          $KF5_PREFIX/lib/plugins/ktexteditor,
-          $KF5_PREFIX/lib/plugins/plasma/dataengine,
-          $KF5_PREFIX/share/doc/HTML/*/{kate,katepart,kwrite},
-          $KF5_PREFIX/share/{kateproject,katexmltools},
-          $KF5_PREFIX/share/kxmlgui5/{kate,katebuild,katecloseexceptplugin},
-          $KF5_PREFIX/share/kxmlgui5/{katectags,katefiletree,kategdb},
-          $KF5_PREFIX/share/kxmlgui5/{katekonsole,kateopenheaderplugin},
-          $KF5_PREFIX/share/kxmlgui5/{kateproject,katesearch,katesnippets},
-          $KF5_PREFIX/share/kxmlgui5/{katesql,katesymbolviewer,katexmltools},
-          $KF5_PREFIX/share/kxmlgui5/{kwrite,tabswitcher} and
-          $KF5_PREFIX/share/plasma/plasmoids/org.kde.plasma.katesessions
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kate5-prog">
-        <term><command>kate</command></term>
-        <listitem>
-          <para>
-            is an advanced text editor for kde.
-          </para>
-          <indexterm zone="kate5 kate5-prog">
-            <primary sortas="b-kate">kate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwrite5">
-        <term><command>kwrite</command></term>
-        <listitem>
-          <para>
-            is a text editor for KDE, that is a light version of
-            <command>kate</command>.
-          </para>
-          <indexterm zone="kate5 kwrite5">
-            <primary sortas="b-kwrite">kwrite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: kde/kf5-apps/kf5-apps.xml
===================================================================
--- kde/kf5-apps/kf5-apps.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ kde/kf5-apps/kf5-apps.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -17,5 +17,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ark5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate5.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate5.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenlive5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmix5.xml"/>
Index: lxqt/apps/apps.xml
===================================================================
--- lxqt/apps/apps.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ lxqt/apps/apps.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -26,8 +26,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qupzilla.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxdm.xml"/>-->
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/>-->
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>-->
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qupzilla.xml"/>-->
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxdm.xml"/>-->
 
 </chapter>
Index: qt/apps/juffed.xml
===================================================================
--- lxqt/apps/juffed.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ 	(revision )
@@ -1,246 +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 juffed-download-http "&sources-anduin-http;/juffed/juffed-&juffed-version;.tar.xz">
-  <!ENTITY juffed-download-ftp  " ">
-  <!ENTITY juffed-md5sum        "5d211f5aadcb3d7365b5a6127d3d275f">
-  <!ENTITY juffed-size          "1.3 MB">
-  <!ENTITY juffed-buildsize     "22 MB">
-  <!ENTITY juffed-time          "0.8 SBU">
-]>
-
-<sect1 id="juffed" xreflabel="juffed-&juffed-version;">
-  <?dbhtml filename="juffed.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>juffed-&juffed-version;</title>
-
-  <indexterm zone="juffed">
-    <primary sortas="a-juffed">juffed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JuffEd</title>
-
-    <para>
-      The <application>JuffEd</application> package is a Qt based editor with
-      support for multiple tabs. It is simple and clear, but very powerful.
-      It supports language syntax highlighting, auto-indents in accordance with
-      file type, code blocks folding, matching braces highlighting with instant
-      jumps between them, powerful search and replacing text using regular
-      expressions (including multiline ones) with the opportunity to use
-      matches \1, \2, &hellip; in substitutions, a terminal emulator, saving
-      named sessions and many other features.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&juffed-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&juffed-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &juffed-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &juffed-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &juffed-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &juffed-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      The source tarball shown above was created by the BLFS team by cloning
-      the source code repository, finding the correct version to rename
-      accordingly the source code directory, removing <filename
-      class="directory">.git</filename> directory and <filename
-      class="directory">.gitignore</filename> file, and finally making the
-      compressed tarball. No other modification has been made.
-    </para>
-
-    <bridgehead renderas="sect3">JuffEd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qscintilla"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="qtermwidget"/> (for the terminal)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="desktop-file-utils"/> and
-      <ulink url="http://cihar.com/software/enca/">Enca</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/juffed"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JuffEd</title>
-
-    <para>
-      For compilation with <application>Qt4</application>, see <quote>Command
-      Explanations</quote> below. Install
-      <application>JuffEd</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i 's/"64"/""/' cmake/LibSuffix.cmake &amp;&amp;
-
-mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TERMINAL=ON                 \
-      -DUSE_QT5=true                      \
-      ..       &amp;&amp;
-
-LIBRARY_PATH=$LXQT_PREFIX/lib make</userinput></screen>
-
-    <para>
-      The choice of <filename class="directory">/usr</filename> prefix is due
-      to the general characteristics of this program, which can be used
-      without <application>LXQt</application>.
-    </para>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... LibSuffix.cmake</command>: Removes the 64 from /lib64.
-    </para>
-
-    <para>
-      <envar>LIBRARY_PATH=$LXQT_PREFIX/lib</envar>: This environment
-      variable is needed for the linker to find a required library.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TERMINAL=ON</parameter>: This switch is used in order
-      to enable building the terminal. Toggle to <quote>OFF</quote> or remove
-      the switch, if you do not wish it.
-    </para>
-
-    <para>
-      <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
-      build this application linked to <application>Qt5</application>. Toggle
-      to <quote>false</quote>, if you prefer to use
-      <application>Qt4</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          juffed
-        </seg>
-        <seg>
-          libjuff.so,
-          libjuffed-engine-qsci.so and
-          plugins under /usr/lib/juffed/plugins
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/juffed
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="juffed-prog">
-        <term><command>juffed</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt</application> based text editor.
-          </para>
-          <indexterm zone="juffed juffed-prog">
-            <primary sortas="b-juffed">juffed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjuff">
-        <term><filename class="libraryfile">libjuff.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JuffEd</application> API functions.
-          </para>
-          <indexterm zone="juffed libjuff">
-            <primary sortas="c-libjuff">libjuff.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjuffed-engine-qsci">
-        <term><filename class="libraryfile">libjuffed-engine-qsci.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>QScintilla</application> bindings.
-          </para>
-          <indexterm zone="juffed libjuffed-engine-qsci">
-            <primary sortas="c-libjuffed-engine-qsci">libjuffed-engine-qsci.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/qscintilla.xml
===================================================================
--- lxqt/apps/qscintilla.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ 	(revision )
@@ -1,199 +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 qscintilla-download-http "&sourceforge-repo;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
-  <!ENTITY qscintilla-download-ftp  " ">
-  <!ENTITY qscintilla-md5sum        "a61eb0d598b6787de18450574c2ad3b4">
-  <!ENTITY qscintilla-size          "2.5 MB">
-  <!ENTITY qscintilla-buildsize     "27 MB (with documentation)">
-  <!ENTITY qscintilla-time          "1.5 SBU (with documentation)">
-]>
-
-<sect1 id="qscintilla" xreflabel="qscintilla-&qscintilla-version;">
-  <?dbhtml filename="qscintilla.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>QScintilla-gpl-&qscintilla-version;</title>
-
-  <indexterm zone="qscintilla">
-    <primary sortas="a-qscintilla">qscintilla</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QScintilla</title>
-
-    <para>
-      <application>QScintilla</application> is a port to
-      <application>Qt</application> of <ulink
-      url="http://www.scintilla.org/">Scintilla</ulink>. As well as features
-      found in standard text editing components, it includes features
-      especially useful when editing and debugging source code: language
-      syntax styling, error indicators, code completion, call tips, code
-      folding, margins can contain markers like those used in debuggers to
-      indicate breakpoints and the current line, recordable macros, multiple
-      views and, of course, printing.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qscintilla-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qscintilla-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qscintilla-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qscintilla-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qscintilla-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qscintilla-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">QScintilla Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="chrpath"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink
-      url="http://riverbankcomputing.co.uk/software/pyqt/intro">PyQt</ulink>
-      (for <application>Python</application> <application>Qt</application>
-      bindings)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qscintilla"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QScintilla</title>
-
-    <note>
-      <para>
-        The instructions in this page are just for the
-        <application>QScintilla</application> application. Code is included in
-        the tarball for  <application>QScintilla Qt Designer</application>
-        plugin and <application>Python</application> bindings.
-      </para>
-    </note>
-
-    <para>
-      Install <application>QScintilla</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd Qt4Qt5             &amp;&amp;
-qmake qscintilla.pro  &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;
-
-ln -sfv libqscintilla2_qt5.so.13.0.0 $QT5DIR/lib/libqt5scintilla2.so</userinput></screen>
-
-    <para>
-      If you wish to install the documentation, issue, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html &amp;&amp;
-install -v -m644    ../doc/html-Qt4Qt5/* \
-                    $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
-
-  </sect2>
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -sfv ...</command>: This command creates a compatibility 
-      symlink needed by some programs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $QT5DIR/lib/libqt5scintilla2.so (link to libqscintilla2_qt5.so) and
-          $QT5DIR/lib/libqscintilla2_qt5.so
-        </seg>
-        <seg>
-          $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqscintilla2_qt5">
-        <term><filename class="libraryfile">libqscintilla2_qt5.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>QScintilla</application>
-            <application>Qt5</application> API functions.
-          </para>
-          <indexterm zone="qscintilla libqscintilla2_qt5">
-            <primary sortas="c-libqscintilla2_qt5.so">libqscintilla2_qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/qupzilla.xml
===================================================================
--- lxqt/apps/qupzilla.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ 	(revision )
@@ -1,223 +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;
-
-  <!-- https://github.com/QupZilla/qupzilla/tags 
-       https://github.com/QupZilla/qupzilla/releases/download/v2.0.0/QupZilla-2.0.0.tar.xz
-  -->
-  <!ENTITY qupzilla-download-http "https://github.com/QupZilla/qupzilla/releases/download/v&qupzilla-version;/QupZilla-&qupzilla-version;.tar.xz">
-  <!ENTITY qupzilla-download-ftp  " ">
-  <!ENTITY qupzilla-md5sum        "13ae89c42b1a6d67de51724591e6c814">
-  <!ENTITY qupzilla-size          "2.7 MB">
-  <!ENTITY qupzilla-buildsize     "75 MB">
-  <!ENTITY qupzilla-time          "4.2 SBU">
-]>
-
-<sect1 id="qupzilla" xreflabel="QupZilla-&qupzilla-version;">
-  <?dbhtml filename="qupzilla.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>QupZilla-&qupzilla-version;</title>
-
-  <indexterm zone="qupzilla">
-    <primary sortas="a-QupZilla">QupZilla</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QupZilla</title>
-
-    <para>
-      <application>QupZilla</application> is a fast, feature-rich and
-      lightweight <application>QtWebEngine</application> based browser,
-      originally intended only for educational purposes.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qupzilla-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qupzilla-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qupzilla-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qupzilla-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qupzilla-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qupzilla-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">QupZilla Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openssl"/>, and
-      <xref linkend="qt5"/> (with qtwebengine)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/>,
-<!--      <xref linkend="kdelibs"/> (KWallet plugin), -->
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>, and
-      <ulink url="&gnome-download-ftp;/libgnome-keyring/">libgnome-keyring</ulink> (Gnome-Keyring plugin)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qupzilla"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QupZilla</title>
-
-    <para>
-      Install <application>QupZilla</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export QUPZILLA_PREFIX=$LXQT_PREFIX &amp;&amp;
-qmake                       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The <command>export</command> command is used for configuring the build.
-      Alternatively, you can add the environment variable to
-      <filename>src/defines.pri</filename>. 
-    </para>
-
-    <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>
-
-    <para>
-      If <xref linkend="desktop-file-utils"/> and <xref linkend="xdg-utils"/>
-      are installed, run as, the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>xdg-icon-resource forceupdate --theme hicolor &amp;&amp;
-update-desktop-database -q</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <note>
-      <para>
-        If you wish to use any of the following variables, they need to be
-        exported.  You can add them to the <command>export</command> block in
-        the main instructions.  Alternatively, instead of exporting, they can
-        be added, one at a line, to <filename>src/defines.pri</filename>.
-      </para>
-    </note>
-
-    <para>
-      <envar>CONFIG += debug</envar>: Use if you want to build QupZilla with
-      debugging symbols.
-    </para>
-
-    <para>
-      <envar>GNOME_INTEGRATION=true</envar>: Enables Gnome integration, this
-      meaning the build of Gnome-Keyring Password plugin, which provides
-      support for storing passwords in Gnome-Keyring.
-    </para>
-
-    <para>
-      <envar>KDE_INTEGRATION=true</envar>: Enables KDE integration, this
-      meaning the build of KWallet Password plugin, which provides support for
-      storing passwords in KWallet.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          qupzilla
-        </seg>
-        <seg>
-          libQupZilla.so and plugins under $LXQT_PREFIX/lib/qupzilla/
-        </seg>
-        <seg>
-          $LXQT_PREFIX/{lib,share}/qupzilla
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qupzilla-prog">
-        <term><command>qupzilla</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>QtWebEngine</application> web browser.
-          </para>
-          <indexterm zone="qupzilla qupzilla-prog">
-            <primary sortas="b-qupzilla">qupzilla</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQupZilla">
-        <term><filename class="libraryfile">libQupZilla.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libQupZilla</application> API functions.
-          </para>
-          <indexterm zone="qupzilla libQupZilla">
-            <primary sortas="c-libQupZilla">libQupZilla.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/editors/editors.xml
===================================================================
--- postlfs/editors/editors.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ postlfs/editors/editors.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -24,5 +24,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="emacs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="joe.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nano.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
Index: postlfs/editors/gedit.xml
===================================================================
--- postlfs/editors/gedit.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
+++ postlfs/editors/gedit.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -0,0 +1,187 @@
+<?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 gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-22;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-22;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "2f41105c5a87a5b4e4a82934cf7e01b7">
+  <!ENTITY gedit-size          "2.8 MB">
+  <!ENTITY gedit-buildsize     "93 MB">
+  <!ENTITY gedit-time          "0.9 SBU">
+]>
+
+<sect1 id="gedit" xreflabel="Gedit-&gedit-version;">
+  <?dbhtml filename="gedit.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Gedit-&gedit-version;</title>
+
+  <indexterm zone="gedit">
+    <primary sortas="a-Gedit">Gedit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gedit</title>
+
+    <para>
+      The <application>Gedit</application> package contains a lightweight
+      UTF-8 text editor for the <application>GNOME</application> Desktop.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gedit-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gedit-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gedit-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gedit-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gedit-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gedit-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gedit Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gsettings-desktop-schemas"/>,
+      <xref linkend="gtksourceview"/>,
+      <xref linkend="itstool"/>, and
+      <xref linkend="libpeas"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gvfs"/> (runtime),
+      <xref linkend="iso-codes"/>,
+      <xref linkend="libsoup"/>, and
+      <xref linkend="pygobject3"/>
+      (<application>Python</application> 3 module)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="vala"/>,
+      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gspell/">gspell</ulink>, and
+      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gedit"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gedit</title>
+
+    <para>
+      Install <application>Gedit</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-spell &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-spell</parameter>: Use this switch to disable
+      spell-checking capability. It is required if
+      <application>gspell</application> is not installed.
+    </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 Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gedit and
+          gnome-text-editor (symlink to gedit)
+        </seg>
+        <seg>
+          libgedit.so
+        </seg>
+        <seg>
+          /usr/include/gedit-3.14 and
+          /usr/{lib,libexec,share,share/gtk-doc/html,share/help/*}/gedit
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gedit-prog">
+        <term><command>gedit</command></term>
+        <listitem>
+          <para>
+            is a lightweight text editor integrated with the
+            <application>GNOME</application> Desktop.
+          </para>
+          <indexterm zone="gedit gedit-prog">
+            <primary sortas="b-gedit">gedit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/editors/juffed.xml
===================================================================
--- postlfs/editors/juffed.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
+++ postlfs/editors/juffed.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -0,0 +1,246 @@
+<?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 juffed-download-http "&sources-anduin-http;/juffed/juffed-&juffed-version;.tar.xz">
+  <!ENTITY juffed-download-ftp  " ">
+  <!ENTITY juffed-md5sum        "5d211f5aadcb3d7365b5a6127d3d275f">
+  <!ENTITY juffed-size          "1.3 MB">
+  <!ENTITY juffed-buildsize     "22 MB">
+  <!ENTITY juffed-time          "0.8 SBU">
+]>
+
+<sect1 id="juffed" xreflabel="juffed-&juffed-version;">
+  <?dbhtml filename="juffed.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>juffed-&juffed-version;</title>
+
+  <indexterm zone="juffed">
+    <primary sortas="a-juffed">juffed</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to JuffEd</title>
+
+    <para>
+      The <application>JuffEd</application> package is a Qt based editor with
+      support for multiple tabs. It is simple and clear, but very powerful.
+      It supports language syntax highlighting, auto-indents in accordance with
+      file type, code blocks folding, matching braces highlighting with instant
+      jumps between them, powerful search and replacing text using regular
+      expressions (including multiline ones) with the opportunity to use
+      matches \1, \2, &hellip; in substitutions, a terminal emulator, saving
+      named sessions and many other features.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&juffed-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&juffed-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &juffed-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &juffed-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &juffed-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &juffed-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para>
+      The source tarball shown above was created by the BLFS team by cloning
+      the source code repository, finding the correct version to rename
+      accordingly the source code directory, removing <filename
+      class="directory">.git</filename> directory and <filename
+      class="directory">.gitignore</filename> file, and finally making the
+      compressed tarball. No other modification has been made.
+    </para>
+
+    <bridgehead renderas="sect3">JuffEd Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="qscintilla"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="qtermwidget"/> (for the terminal)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="desktop-file-utils"/> and
+      <ulink url="http://cihar.com/software/enca/">Enca</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/juffed"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of JuffEd</title>
+
+    <para>
+      For compilation with <application>Qt4</application>, see <quote>Command
+      Explanations</quote> below. Install
+      <application>JuffEd</application> by running the following commands:
+    </para>
+
+<screen><userinput>sed -i 's/"64"/""/' cmake/LibSuffix.cmake &amp;&amp;
+
+mkdir -v build &amp;&amp;
+cd       build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
+      -DCMAKE_BUILD_TYPE=Release          \
+      -DBUILD_TERMINAL=ON                 \
+      -DUSE_QT5=true                      \
+      ..       &amp;&amp;
+
+LIBRARY_PATH=$LXQT_PREFIX/lib make</userinput></screen>
+
+    <para>
+      The choice of <filename class="directory">/usr</filename> prefix is due
+      to the general characteristics of this program, which can be used
+      without <application>LXQt</application>.
+    </para>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed ... LibSuffix.cmake</command>: Removes the 64 from /lib64.
+    </para>
+
+    <para>
+      <envar>LIBRARY_PATH=$LXQT_PREFIX/lib</envar>: This environment
+      variable is needed for the linker to find a required library.
+    </para>
+
+    <para>
+      <parameter>-DBUILD_TERMINAL=ON</parameter>: This switch is used in order
+      to enable building the terminal. Toggle to <quote>OFF</quote> or remove
+      the switch, if you do not wish it.
+    </para>
+
+    <para>
+      <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
+      build this application linked to <application>Qt5</application>. Toggle
+      to <quote>false</quote>, if you prefer to use
+      <application>Qt4</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          juffed
+        </seg>
+        <seg>
+          libjuff.so,
+          libjuffed-engine-qsci.so and
+          plugins under /usr/lib/juffed/plugins
+        </seg>
+        <seg>
+          /usr/{include,lib,share}/juffed
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="juffed-prog">
+        <term><command>juffed</command></term>
+        <listitem>
+          <para>
+            is a <application>Qt</application> based text editor.
+          </para>
+          <indexterm zone="juffed juffed-prog">
+            <primary sortas="b-juffed">juffed</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjuff">
+        <term><filename class="libraryfile">libjuff.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>JuffEd</application> API functions.
+          </para>
+          <indexterm zone="juffed libjuff">
+            <primary sortas="c-libjuff">libjuff.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjuffed-engine-qsci">
+        <term><filename class="libraryfile">libjuffed-engine-qsci.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>QScintilla</application> bindings.
+          </para>
+          <indexterm zone="juffed libjuffed-engine-qsci">
+            <primary sortas="c-libjuffed-engine-qsci">libjuffed-engine-qsci.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/editors/kate5.xml
===================================================================
--- postlfs/editors/kate5.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
+++ postlfs/editors/kate5.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -0,0 +1,184 @@
+<?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 kate5-download-http "&kf5apps-download-http;/kate-&kf5apps-version;.tar.xz">
+  <!ENTITY kate5-download-ftp  " ">
+  <!ENTITY kate5-md5sum        "3c3c582cb26b355192165ed1ec1b3d7b">
+  <!ENTITY kate5-size          "1.8 MB">
+  <!ENTITY kate5-buildsize     "37 MB">
+  <!ENTITY kate5-time          "2.4 SBU">
+]>
+
+<sect1 id="kate5" xreflabel="Kate-&kf5apps-version;">
+  <?dbhtml filename="kate5.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Kate-&kf5apps-version;</title>
+
+  <indexterm zone="kate5">
+    <primary sortas="a-Kate">Kate</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Kate</title>
+
+    <para>
+      The <application>Kate</application> package contains an advanced
+      KF5 based graphical text editor.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&kate5-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&kate5-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &kate5-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &kate5-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &kate5-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &kate5-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Kate Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="kf5-frameworks"/>,
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="https://libgit2.github.com/">libgit2</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/kate5"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Kate</title>
+
+    <para>
+      Install <application>Kate</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX  \
+      -DCMAKE_BUILD_TYPE=Release          \
+      -DLIB_INSTALL_DIR=lib               \
+      -DBUILD_TESTING=OFF                 \
+      -Wno-dev .. &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>
+          kate and kwrite
+        </seg>
+        <seg>
+          libkdeinit5_kate.so and libkdeinit5_kwrite.so
+        </seg>
+        <seg>
+          $KF5_PREFIX/lib/plugins/ktexteditor,
+          $KF5_PREFIX/lib/plugins/plasma/dataengine,
+          $KF5_PREFIX/share/doc/HTML/*/{kate,katepart,kwrite},
+          $KF5_PREFIX/share/{kateproject,katexmltools},
+          $KF5_PREFIX/share/kxmlgui5/{kate,katebuild,katecloseexceptplugin},
+          $KF5_PREFIX/share/kxmlgui5/{katectags,katefiletree,kategdb},
+          $KF5_PREFIX/share/kxmlgui5/{katekonsole,kateopenheaderplugin},
+          $KF5_PREFIX/share/kxmlgui5/{kateproject,katesearch,katesnippets},
+          $KF5_PREFIX/share/kxmlgui5/{katesql,katesymbolviewer,katexmltools},
+          $KF5_PREFIX/share/kxmlgui5/{kwrite,tabswitcher} and
+          $KF5_PREFIX/share/plasma/plasmoids/org.kde.plasma.katesessions
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="kate5-prog">
+        <term><command>kate</command></term>
+        <listitem>
+          <para>
+            is an advanced text editor for kde.
+          </para>
+          <indexterm zone="kate5 kate5-prog">
+            <primary sortas="b-kate">kate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kwrite5">
+        <term><command>kwrite</command></term>
+        <listitem>
+          <para>
+            is a text editor for KDE, that is a light version of
+            <command>kate</command>.
+          </para>
+          <indexterm zone="kate5 kwrite5">
+            <primary sortas="b-kwrite">kwrite</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ x/lib/lib.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -66,4 +66,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/>
Index: x/lib/qscintilla.xml
===================================================================
--- x/lib/qscintilla.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
+++ x/lib/qscintilla.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -0,0 +1,199 @@
+<?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 qscintilla-download-http "&sourceforge-repo;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
+  <!ENTITY qscintilla-download-ftp  " ">
+  <!ENTITY qscintilla-md5sum        "a61eb0d598b6787de18450574c2ad3b4">
+  <!ENTITY qscintilla-size          "2.5 MB">
+  <!ENTITY qscintilla-buildsize     "27 MB (with documentation)">
+  <!ENTITY qscintilla-time          "1.5 SBU (with documentation)">
+]>
+
+<sect1 id="qscintilla" xreflabel="qscintilla-&qscintilla-version;">
+  <?dbhtml filename="qscintilla.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>QScintilla-gpl-&qscintilla-version;</title>
+
+  <indexterm zone="qscintilla">
+    <primary sortas="a-qscintilla">qscintilla</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to QScintilla</title>
+
+    <para>
+      <application>QScintilla</application> is a port to
+      <application>Qt</application> of <ulink
+      url="http://www.scintilla.org/">Scintilla</ulink>. As well as features
+      found in standard text editing components, it includes features
+      especially useful when editing and debugging source code: language
+      syntax styling, error indicators, code completion, call tips, code
+      folding, margins can contain markers like those used in debuggers to
+      indicate breakpoints and the current line, recordable macros, multiple
+      views and, of course, printing.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qscintilla-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qscintilla-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qscintilla-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qscintilla-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qscintilla-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qscintilla-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">QScintilla Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="chrpath"/> and
+      <xref linkend="qt5"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink
+      url="http://riverbankcomputing.co.uk/software/pyqt/intro">PyQt</ulink>
+      (for <application>Python</application> <application>Qt</application>
+      bindings)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/qscintilla"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of QScintilla</title>
+
+    <note>
+      <para>
+        The instructions in this page are just for the
+        <application>QScintilla</application> application. Code is included in
+        the tarball for  <application>QScintilla Qt Designer</application>
+        plugin and <application>Python</application> bindings.
+      </para>
+    </note>
+
+    <para>
+      Install <application>QScintilla</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>cd Qt4Qt5             &amp;&amp;
+qmake qscintilla.pro  &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;
+
+ln -sfv libqscintilla2_qt5.so.13.0.0 $QT5DIR/lib/libqt5scintilla2.so</userinput></screen>
+
+    <para>
+      If you wish to install the documentation, issue, as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 -d $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html &amp;&amp;
+install -v -m644    ../doc/html-Qt4Qt5/* \
+                    $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
+
+  </sect2>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>ln -sfv ...</command>: This command creates a compatibility 
+      symlink needed by some programs.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          $QT5DIR/lib/libqt5scintilla2.so (link to libqscintilla2_qt5.so) and
+          $QT5DIR/lib/libqscintilla2_qt5.so
+        </seg>
+        <seg>
+          $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libqscintilla2_qt5">
+        <term><filename class="libraryfile">libqscintilla2_qt5.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>QScintilla</application>
+            <application>Qt5</application> API functions.
+          </para>
+          <indexterm zone="qscintilla libqscintilla2_qt5">
+            <primary sortas="c-libqscintilla2_qt5.so">libqscintilla2_qt5.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xfce/apps/apps.xml
===================================================================
--- xfce/apps/apps.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ xfce/apps/apps.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -21,5 +21,5 @@
   </para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parole.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mousepad.xml"/>
Index: ce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ 	(revision )
@@ -1,212 +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 midori-download-http
-           "http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
-  <!ENTITY midori-download-ftp  " ">
-  <!ENTITY midori-md5sum        "fcc03ef759fce4fe9f2446d9da4a065e">
-  <!ENTITY midori-size          "1.4 MB">
-  <!ENTITY midori-buildsize     "91 MB">
-  <!ENTITY midori-time          "0.8 SBU">
-]>
-
-<sect1 id="midori" xreflabel="Midori-&midori-version;">
-  <?dbhtml filename="midori.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Midori-&midori-version;</title>
-
-  <indexterm zone="midori">
-    <primary sortas="a-Midori">Midori</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Midori</title>
-
-    <para>
-      <application>Midori</application> is a lightweight web browser that uses
-      <application>WebKitGTK+</application>.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&midori-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&midori-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &midori-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &midori-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &midori-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &midori-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Midori Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="gcr"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <!--<xref linkend="webkitgtk2"/>, and -->
-      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.11</ulink> , and 
-      <phrase revision="sysv"><ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink></phrase>
-      <phrase revision="systemd"><xref linkend="libzeitgeist"/></phrase>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/midori"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Midori</title>
-
-    <para>
-      Install <application>Midori</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DUSE_ZEITGEIST=OFF         \
-      -DHALF_BRO_INCOM_WEBKIT2=ON \
-      -DUSE_GTK3=1                \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-    used to apply a higher level of compiler optimizations.</para>
-
-    <para>
-      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
-      Zeitgeist is installed.
-    </para>
-
-    <para>
-      <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
-      linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x. Strictly
-      speaking, <xref linkend="webkitgtk"/> is not required and Midori could
-      be linked to WebKitGTK+-2.4.x. The former used to be considered <quote>
-      experimental</quote> by upstream, but now is considered stable. However
-      the syntax has not yet been updated.
-    </para>
-
-    <para>
-      <parameter>-DUSE_GTK3=1</parameter>: Using this switch allows linking to
-      WebkitGTK+ built against <application>GTK+ 3</application>.
-    </para>
-
-    <para>
-      <option>-DUSE_APIDOCS=1</option>: Use this switch if
-      <application>GTK-Doc</application> is installed and you
-      wish to build and install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          midori
-        </seg>
-        <seg>
-          libmidori-core.so
-        </seg>
-        <seg>
-          /{etc/xdg,/usr/{lib,share}}/midori and
-          /usr/share/doc/midori-&midori-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="midori-prog">
-        <term><command>midori</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>WebKitGTK+</application> browser.
-          </para>
-          <indexterm zone="midori midori-prog">
-            <primary sortas="b-midori">midori</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/graphweb/epiphany.xml
===================================================================
--- xsoft/graphweb/epiphany.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
+++ xsoft/graphweb/epiphany.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -0,0 +1,183 @@
+<?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 epiphany-download-http
+           "&gnome-download-http;/epiphany/&gnome-minor-22;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-download-ftp
+           "&gnome-download-ftp;/epiphany/&gnome-minor-22;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "e08762c6bb01c4d291b3d22c7adb1a65">
+  <!ENTITY epiphany-size          "2.2 MB">
+  <!ENTITY epiphany-buildsize     "64 MB"> 
+  <!ENTITY epiphany-time          "0.7 SBU"> 
+]>
+
+<sect1 id="epiphany" xreflabel="Epiphany-&epiphany-version;">
+  <?dbhtml filename="epiphany.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Epiphany-&epiphany-version;</title>
+
+  <indexterm zone="epiphany">
+    <primary sortas="a-Epiphany">Epiphany</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Epiphany</title>
+
+    <para>
+      <application>Epiphany</application> is a simple yet powerful
+      <application>GNOME</application> web browser targeted at non-technical
+      users. Its principles are simplicity and standards compliance.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&epiphany-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&epiphany-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &epiphany-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &epiphany-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &epiphany-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &epiphany-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Epiphany Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="avahi"/>,
+      <xref linkend="gcr"/>,
+      <xref linkend="gnome-desktop"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend="libwnck"/>, and
+      <xref linkend="webkitgtk"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="nss"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="lsb-release"/>
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="gnome-keyring"/> (for storing passwords) and
+      <xref linkend="seahorse"/> (for managing stored passwords)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/epiphany"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Epiphany</title>
+
+    <para>
+      Install <application>Epiphany</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+<!-- We will see if this happens to improve with a new release. If it doesn't,
+recommend changing to "This package does not have a working test suite." -->
+
+    <para>
+      An already active graphical session with a bus address is necessary
+      to execute the test suite.  Some tests may fail for unknown reasons.
+      To test the results, run:
+    </para>
+
+<screen><userinput>make -k check</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          epiphany and ephy-profile-migrator
+        </seg>
+        <seg>
+          libephywebextension.so
+        </seg>
+        <seg>
+          /usr/{lib,share,share/help/*}/epiphany
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="epiphany-prog">
+        <term><command>epiphany</command></term>
+        <listitem>
+          <para>
+            is a <application>GNOME</application> web browser based on
+            the <application>WebKit2</application> rendering engine.
+          </para>
+          <indexterm zone="epiphany epiphany-prog">
+            <primary sortas="b-epiphany">epiphany</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision 002a1090ada12b1dff624d0e2b95b49c7d293403)
+++ xsoft/graphweb/graphweb.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -20,6 +20,9 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chromium.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qupzilla.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seamonkey.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="galeon.xml"/> -->
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konq.xml"/> -->
Index: xsoft/graphweb/midori.xml
===================================================================
--- xsoft/graphweb/midori.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
+++ xsoft/graphweb/midori.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -0,0 +1,212 @@
+<?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 midori-download-http
+           "http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
+  <!ENTITY midori-download-ftp  " ">
+  <!ENTITY midori-md5sum        "fcc03ef759fce4fe9f2446d9da4a065e">
+  <!ENTITY midori-size          "1.4 MB">
+  <!ENTITY midori-buildsize     "91 MB">
+  <!ENTITY midori-time          "0.8 SBU">
+]>
+
+<sect1 id="midori" xreflabel="Midori-&midori-version;">
+  <?dbhtml filename="midori.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Midori-&midori-version;</title>
+
+  <indexterm zone="midori">
+    <primary sortas="a-Midori">Midori</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Midori</title>
+
+    <para>
+      <application>Midori</application> is a lightweight web browser that uses
+      <application>WebKitGTK+</application>.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&midori-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&midori-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &midori-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &midori-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &midori-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &midori-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Midori Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>,
+      <xref linkend="gcr"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="librsvg"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <!--<xref linkend="webkitgtk2"/>, and -->
+      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.11</ulink> , and 
+      <phrase revision="sysv"><ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink></phrase>
+      <phrase revision="systemd"><xref linkend="libzeitgeist"/></phrase>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/midori"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Midori</title>
+
+    <para>
+      Install <application>Midori</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DUSE_ZEITGEIST=OFF         \
+      -DHALF_BRO_INCOM_WEBKIT2=ON \
+      -DUSE_GTK3=1                \
+      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
+      ..  &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a working test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+    used to apply a higher level of compiler optimizations.</para>
+
+    <para>
+      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
+      Zeitgeist is installed.
+    </para>
+
+    <para>
+      <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
+      linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x. Strictly
+      speaking, <xref linkend="webkitgtk"/> is not required and Midori could
+      be linked to WebKitGTK+-2.4.x. The former used to be considered <quote>
+      experimental</quote> by upstream, but now is considered stable. However
+      the syntax has not yet been updated.
+    </para>
+
+    <para>
+      <parameter>-DUSE_GTK3=1</parameter>: Using this switch allows linking to
+      WebkitGTK+ built against <application>GTK+ 3</application>.
+    </para>
+
+    <para>
+      <option>-DUSE_APIDOCS=1</option>: Use this switch if
+      <application>GTK-Doc</application> is installed and you
+      wish to build and install the API documentation.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          midori
+        </seg>
+        <seg>
+          libmidori-core.so
+        </seg>
+        <seg>
+          /{etc/xdg,/usr/{lib,share}}/midori and
+          /usr/share/doc/midori-&midori-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="midori-prog">
+        <term><command>midori</command></term>
+        <listitem>
+          <para>
+            is a lightweight <application>WebKitGTK+</application> browser.
+          </para>
+          <indexterm zone="midori midori-prog">
+            <primary sortas="b-midori">midori</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/graphweb/qupzilla.xml
===================================================================
--- xsoft/graphweb/qupzilla.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
+++ xsoft/graphweb/qupzilla.xml	(revision b49da0a825b64b8c459d7c09a3312f9be3208e92)
@@ -0,0 +1,223 @@
+<?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;
+
+  <!-- https://github.com/QupZilla/qupzilla/tags 
+       https://github.com/QupZilla/qupzilla/releases/download/v2.0.0/QupZilla-2.0.0.tar.xz
+  -->
+  <!ENTITY qupzilla-download-http "https://github.com/QupZilla/qupzilla/releases/download/v&qupzilla-version;/QupZilla-&qupzilla-version;.tar.xz">
+  <!ENTITY qupzilla-download-ftp  " ">
+  <!ENTITY qupzilla-md5sum        "13ae89c42b1a6d67de51724591e6c814">
+  <!ENTITY qupzilla-size          "2.7 MB">
+  <!ENTITY qupzilla-buildsize     "75 MB">
+  <!ENTITY qupzilla-time          "4.2 SBU">
+]>
+
+<sect1 id="qupzilla" xreflabel="QupZilla-&qupzilla-version;">
+  <?dbhtml filename="qupzilla.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>QupZilla-&qupzilla-version;</title>
+
+  <indexterm zone="qupzilla">
+    <primary sortas="a-QupZilla">QupZilla</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to QupZilla</title>
+
+    <para>
+      <application>QupZilla</application> is a fast, feature-rich and
+      lightweight <application>QtWebEngine</application> based browser,
+      originally intended only for educational purposes.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qupzilla-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qupzilla-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qupzilla-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qupzilla-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qupzilla-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qupzilla-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">QupZilla Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="openssl"/>, and
+      <xref linkend="qt5"/> (with qtwebengine)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gdb"/>,
+<!--      <xref linkend="kdelibs"/> (KWallet plugin), -->
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>, and
+      <ulink url="&gnome-download-ftp;/libgnome-keyring/">libgnome-keyring</ulink> (Gnome-Keyring plugin)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/qupzilla"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of QupZilla</title>
+
+    <para>
+      Install <application>QupZilla</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>export QUPZILLA_PREFIX=$LXQT_PREFIX &amp;&amp;
+qmake                       &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      The <command>export</command> command is used for configuring the build.
+      Alternatively, you can add the environment variable to
+      <filename>src/defines.pri</filename>. 
+    </para>
+
+    <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>
+
+    <para>
+      If <xref linkend="desktop-file-utils"/> and <xref linkend="xdg-utils"/>
+      are installed, run as, the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>xdg-icon-resource forceupdate --theme hicolor &amp;&amp;
+update-desktop-database -q</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <note>
+      <para>
+        If you wish to use any of the following variables, they need to be
+        exported.  You can add them to the <command>export</command> block in
+        the main instructions.  Alternatively, instead of exporting, they can
+        be added, one at a line, to <filename>src/defines.pri</filename>.
+      </para>
+    </note>
+
+    <para>
+      <envar>CONFIG += debug</envar>: Use if you want to build QupZilla with
+      debugging symbols.
+    </para>
+
+    <para>
+      <envar>GNOME_INTEGRATION=true</envar>: Enables Gnome integration, this
+      meaning the build of Gnome-Keyring Password plugin, which provides
+      support for storing passwords in Gnome-Keyring.
+    </para>
+
+    <para>
+      <envar>KDE_INTEGRATION=true</envar>: Enables KDE integration, this
+      meaning the build of KWallet Password plugin, which provides support for
+      storing passwords in KWallet.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          qupzilla
+        </seg>
+        <seg>
+          libQupZilla.so and plugins under $LXQT_PREFIX/lib/qupzilla/
+        </seg>
+        <seg>
+          $LXQT_PREFIX/{lib,share}/qupzilla
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="qupzilla-prog">
+        <term><command>qupzilla</command></term>
+        <listitem>
+          <para>
+            is a lightweight <application>QtWebEngine</application> web browser.
+          </para>
+          <indexterm zone="qupzilla qupzilla-prog">
+            <primary sortas="b-qupzilla">qupzilla</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libQupZilla">
+        <term><filename class="libraryfile">libQupZilla.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libQupZilla</application> API functions.
+          </para>
+          <indexterm zone="qupzilla libQupZilla">
+            <primary sortas="c-libQupZilla">libQupZilla.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
