Index: archive/webkitgtk2.xml
===================================================================
--- archive/webkitgtk2.xml	(revision 7551c54272a06c0c53b4ae8756d883bd8f863c02)
+++ archive/webkitgtk2.xml	(revision 7551c54272a06c0c53b4ae8756d883bd8f863c02)
@@ -0,0 +1,400 @@
+<?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 webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
+  <!ENTITY webkitgtk2-download-ftp  " ">
+  <!ENTITY webkitgtk2-md5sum        "1b3f18d4087dfc648e8060c14e16e202">
+  <!ENTITY webkitgtk2-size          "9.4 MB">
+  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
+  <!ENTITY webkitgtk2-time          "50 SBU (using parallelism=4, both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
+]>
+
+<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
+  <?dbhtml filename="webkitgtk2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>WebKitGTK+-&webkitgtk2-version;</title>
+
+  <indexterm zone="webkitgtk2">
+    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to WebKitGTK+</title>
+
+    <para>
+      The <application>WebKitGTK+</application> is the port of the portable web
+      rendering engine <application>WebKit</application> to the
+      <application>GTK+ 3</application> and/or <application>GTK+
+      2</application> platforms.
+    </para>
+
+    &lfs79_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&webkitgtk2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&webkitgtk2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &webkitgtk2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &webkitgtk2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &webkitgtk2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &webkitgtk2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk2"/> or
+      <xref linkend="gtk3"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="libgudev"/>,
+      <xref linkend="libsecret"/>,
+      <xref linkend="libsoup"/>,
+      <xref linkend="libwebp"/>,
+      <xref linkend="mesa"/>,
+      <xref linkend="ruby"/>,
+      <xref linkend="sqlite"/> and
+      <xref linkend="which"/>
+    </para>
+
+    <note><para>
+      <application>WebKit2</application> links against<application>GTK+
+      2</application> (even if <application>GTK+ 3</application> is being
+      used), in order to be able to use NPAPI plugins such as Adobe Flash.
+    </para></note>
+
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="enchant"/>,
+      <xref linkend="geoclue"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="hicolor-icon-theme"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="llvm"/>,
+      <ulink url="http://freedesktop.org/wiki/Software/GeoClue/">GeoClue2</ulink>, and
+      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of WebKitGTK+</title>
+
+    <para>
+      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
+      cause <command>make install</command> to fail:
+    </para>
+
+<screen><userinput>sed -e '/generate-gtkdoc --rebase/s:^:# :' \
+    -i GNUmakefile.in</userinput></screen>
+
+    <para>
+      Upstream standard now is to link this package against <application>GTK+
+      3</application>. However, for backward compatibility, many users need
+      also another instance, linked to  <application>GTK+ 2</application>. Both
+      can be installed in the same system, without any problems.  However, some
+      packages can alternatively be linked to either one. Here, both build
+      methods are presented and recommended to be built, but if you know which
+      one you need, just jump to the respective part.
+    </para>
+
+<!-- ==== WebKitGTK+ against GTK+ 3 ====== -->
+    <bridgehead renderas="sect3">Build and install
+    <application>WebKitGTK+</application> against <application>GTK+
+    3</application></bridgehead>
+
+    <para>
+      Install <application>WebKitGTK+</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>mkdir -vp build-3           &amp;&amp;
+cp -a Documentation build-3 &amp;&amp;
+cd build-3                  &amp;&amp;
+
+../configure --prefix=/usr --enable-introspection &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite. However, there are two
+      useable basic graphical web browsers in the build directory,
+      <application>Programs/GtkLauncher</application> and
+      <application>Programs/MiniBrowser</application>. If launching any one
+      fails, there is a problem with the build.
+    </para>
+
+    <note><para>
+      When installing, the Makefile does some additional compiling and linking.
+      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
+      variables need to be defined for the root user.  If using sudo to assume
+      root, use the -E option to pass your current environment variables for the
+      install process.
+    </para></note>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Finally, leave the buid directory:
+    </para>
+
+<screen><userinput>cd ..</userinput></screen>
+
+<!-- ==== WebKitGTK+ against GTK+ 2 ====== -->
+    <bridgehead renderas="sect3">Build and install
+    <application>WebKitGTK+</application> against <application>GTK+
+    2</application></bridgehead>
+
+    <para>
+      Install <application>WebKitGTK+</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>mkdir -vp build-1</userinput></screen>
+
+    <para>
+      If you have built and installed the package against <application>GTK+
+      3</application>. skip the following command, because the previous
+      docummentation also applies here:
+    </para>
+
+<screen><userinput>cp -a Documentation build-1</userinput></screen>
+
+    <para>
+      Now, change into the build directory and effectively start the build and
+      install:
+    </para>
+
+<screen><userinput>cd build-1  &amp;&amp;
+
+../configure --prefix=/usr  \
+             --with-gtk=2.0 \
+             --disable-webkit2 &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite. However, there is one
+      useable basic graphical web browser in the build directory,
+      <application>Programs/GtkLauncher</application>. If launching it
+      fails, there is a problem with the build.
+    </para>
+
+    <note><para>
+      When installing, the Makefile does some additional compiling and linking.
+      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
+      variables need to be defined for the root user.  If using sudo to assume
+      root, use the -E option to pass your current environment variables for the
+      install process.
+    </para></note>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Finally, leave the buid directory:
+    </para>
+
+<screen><userinput>cd ..</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--enable-introspection</option>: This switch enables support for
+      <application>Gobject Introspection</application> and is required for a
+      <application>GNOME</application> Desktop. Remove if you don't have
+      <application>Gobject Introspection</application> installed or you don't
+      want to install <application>GNOME</application>.
+    </para>
+
+    <para>
+      <option>--disable-geolocation</option>: Use this option if you did not
+      install <xref linkend="geoclue"/> or <command>configure</command> will
+      fail.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          jsc-1 and jsc-3
+        </seg>
+        <seg>
+          libjavascriptcoregtk-{1,3}.0.so,
+          libwebkit2gtk-3.0.so, and
+          libwebkitgtk-{1,3}.0.so
+        </seg>
+        <seg>
+          /usr/include/webkitgtk-{1,3}.0,
+          /usr/lib/webkit2gtk-3.0,
+          /usr/share/gtk-doc/html/webkit{2,dom,}gtk, and
+          /usr/share/webkitgtk-{1,3}.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="jsc-1">
+        <term><command>jsc-1</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that allows you to run JavaScript programs
+            outside of the context of a web browser.
+          </para>
+          <indexterm zone="webkitgtk2 jsc-1">
+            <primary sortas="b-jsc-1">jsc-1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jsc-3">
+        <term><command>jsc-3</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that allows you to run JavaScript programs
+            outside of the context of a web browser.
+          </para>
+          <indexterm zone="webkitgtk2 jsc-3">
+            <primary sortas="b-jsc-3">jsc-3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-1">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains core JavaScript API functions used by
+            <command>jsc-1</command> and <filename
+            class="libraryfile">libwebkitgtk-1.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1">
+            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-3">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains core JavaScript API functions used by
+            <command>jsc-3</command> and <filename
+            class="libraryfile">libwebkitgtk-3.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3">
+            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebkitgtk-1">
+        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>WebKitGTK+</application> API functions for
+            <application>GTK+ 2</application>.
+          </para>
+          <indexterm zone="webkitgtk2 libwebkitgtk-1">
+            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebkitgtk-3">
+        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>WebKitGTK+</application> API functions for
+            <application>GTK+ 3</application>.
+          </para>
+          <indexterm zone="webkitgtk2 libwebkitgtk-3">
+            <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebkit2gtk-3">
+        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>WebKit2</application> API functions.
+          </para>
+          <indexterm zone="webkitgtk2 libwebkit2gtk-3">
+            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a5fc81ec1cd137e1aadb0533c3ada77e2f14d769)
+++ introduction/welcome/changelog.xml	(revision 7551c54272a06c0c53b4ae8756d883bd8f863c02)
@@ -49,4 +49,9 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Archive WebKitGTK+-2.4. Add comment to 
+          GIMP to provide help via a web browser.  Fixes 
+          <ulink url="&blfs-ticket-root;7684">#7684</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to gegl-0.3.6. Fixes
           <ulink url="&blfs-ticket-root;7692">#7692</ulink>.</para>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision a5fc81ec1cd137e1aadb0533c3ada77e2f14d769)
+++ x/lib/lib.xml	(revision 7551c54272a06c0c53b4ae8756d883bd8f863c02)
@@ -59,5 +59,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
 
Index: lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision a5fc81ec1cd137e1aadb0533c3ada77e2f14d769)
+++ 	(revision )
@@ -1,400 +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 webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
-  <!ENTITY webkitgtk2-download-ftp  " ">
-  <!ENTITY webkitgtk2-md5sum        "1b3f18d4087dfc648e8060c14e16e202">
-  <!ENTITY webkitgtk2-size          "9.4 MB">
-  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
-  <!ENTITY webkitgtk2-time          "50 SBU (using parallelism=4, both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
-]>
-
-<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
-  <?dbhtml filename="webkitgtk2.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>WebKitGTK+-&webkitgtk2-version;</title>
-
-  <indexterm zone="webkitgtk2">
-    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WebKitGTK+</title>
-
-    <para>
-      The <application>WebKitGTK+</application> is the port of the portable web
-      rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> and/or <application>GTK+
-      2</application> platforms.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk2"/> or
-      <xref linkend="gtk3"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="which"/>
-    </para>
-
-    <note><para>
-      <application>WebKit2</application> links against<application>GTK+
-      2</application> (even if <application>GTK+ 3</application> is being
-      used), in order to be able to use NPAPI plugins such as Adobe Flash.
-    </para></note>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="llvm"/>,
-      <ulink url="http://freedesktop.org/wiki/Software/GeoClue/">GeoClue2</ulink>, and
-      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK+</title>
-
-    <para>
-      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
-      cause <command>make install</command> to fail:
-    </para>
-
-<screen><userinput>sed -e '/generate-gtkdoc --rebase/s:^:# :' \
-    -i GNUmakefile.in</userinput></screen>
-
-    <para>
-      Upstream standard now is to link this package against <application>GTK+
-      3</application>. However, for backward compatibility, many users need
-      also another instance, linked to  <application>GTK+ 2</application>. Both
-      can be installed in the same system, without any problems.  However, some
-      packages can alternatively be linked to either one. Here, both build
-      methods are presented and recommended to be built, but if you know which
-      one you need, just jump to the respective part.
-    </para>
-
-<!-- ==== WebKitGTK+ against GTK+ 3 ====== -->
-    <bridgehead renderas="sect3">Build and install
-    <application>WebKitGTK+</application> against <application>GTK+
-    3</application></bridgehead>
-
-    <para>
-      Install <application>WebKitGTK+</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -vp build-3           &amp;&amp;
-cp -a Documentation build-3 &amp;&amp;
-cd build-3                  &amp;&amp;
-
-../configure --prefix=/usr --enable-introspection &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there are two
-      useable basic graphical web browsers in the build directory,
-      <application>Programs/GtkLauncher</application> and
-      <application>Programs/MiniBrowser</application>. If launching any one
-      fails, there is a problem with the build.
-    </para>
-
-    <note><para>
-      When installing, the Makefile does some additional compiling and linking.
-      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
-      variables need to be defined for the root user.  If using sudo to assume
-      root, use the -E option to pass your current environment variables for the
-      install process.
-    </para></note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, leave the buid directory:
-    </para>
-
-<screen><userinput>cd ..</userinput></screen>
-
-<!-- ==== WebKitGTK+ against GTK+ 2 ====== -->
-    <bridgehead renderas="sect3">Build and install
-    <application>WebKitGTK+</application> against <application>GTK+
-    2</application></bridgehead>
-
-    <para>
-      Install <application>WebKitGTK+</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -vp build-1</userinput></screen>
-
-    <para>
-      If you have built and installed the package against <application>GTK+
-      3</application>. skip the following command, because the previous
-      docummentation also applies here:
-    </para>
-
-<screen><userinput>cp -a Documentation build-1</userinput></screen>
-
-    <para>
-      Now, change into the build directory and effectively start the build and
-      install:
-    </para>
-
-<screen><userinput>cd build-1  &amp;&amp;
-
-../configure --prefix=/usr  \
-             --with-gtk=2.0 \
-             --disable-webkit2 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there is one
-      useable basic graphical web browser in the build directory,
-      <application>Programs/GtkLauncher</application>. If launching it
-      fails, there is a problem with the build.
-    </para>
-
-    <note><para>
-      When installing, the Makefile does some additional compiling and linking.
-      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
-      variables need to be defined for the root user.  If using sudo to assume
-      root, use the -E option to pass your current environment variables for the
-      install process.
-    </para></note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, leave the buid directory:
-    </para>
-
-<screen><userinput>cd ..</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-introspection</option>: This switch enables support for
-      <application>Gobject Introspection</application> and is required for a
-      <application>GNOME</application> Desktop. Remove if you don't have
-      <application>Gobject Introspection</application> installed or you don't
-      want to install <application>GNOME</application>.
-    </para>
-
-    <para>
-      <option>--disable-geolocation</option>: Use this option if you did not
-      install <xref linkend="geoclue"/> or <command>configure</command> will
-      fail.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          jsc-1 and jsc-3
-        </seg>
-        <seg>
-          libjavascriptcoregtk-{1,3}.0.so,
-          libwebkit2gtk-3.0.so, and
-          libwebkitgtk-{1,3}.0.so
-        </seg>
-        <seg>
-          /usr/include/webkitgtk-{1,3}.0,
-          /usr/lib/webkit2gtk-3.0,
-          /usr/share/gtk-doc/html/webkit{2,dom,}gtk, and
-          /usr/share/webkitgtk-{1,3}.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jsc-1">
-        <term><command>jsc-1</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk2 jsc-1">
-            <primary sortas="b-jsc-1">jsc-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsc-3">
-        <term><command>jsc-3</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk2 jsc-3">
-            <primary sortas="b-jsc-3">jsc-3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-1">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc-1</command> and <filename
-            class="libraryfile">libwebkitgtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1">
-            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-3">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc-3</command> and <filename
-            class="libraryfile">libwebkitgtk-3.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3">
-            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1">
-        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkitgtk-1">
-            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-3">
-        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 3</application>.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkitgtk-3">
-            <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkit2gtk-3">
-        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit2</application> API functions.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkit2gtk-3">
-            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision a5fc81ec1cd137e1aadb0533c3ada77e2f14d769)
+++ xfce/apps/midori.xml	(revision 7551c54272a06c0c53b4ae8756d883bd8f863c02)
@@ -92,5 +92,6 @@
     <para role="optional">
       <xref linkend="gtk-doc"/>,
-      <xref linkend="webkitgtk2"/>, and
+      <!--<xref linkend="webkitgtk2"/>, and -->
+      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.x</ulink>, and
       <ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink>
     </para>
@@ -103,13 +104,4 @@
   <sect2 role="installation">
     <title>Installation of Midori</title>
-<!--
-    <note>
-      <para>
-        The tarball was not created from a directory, thus it is better to create a directory to uncompress it:
-      </para>
-<screen><userinput>mkdir -v midori-&midori-version; &amp;&amp;
-tar -xf midori_&midori-version;_all_.tar.bz2 -C midori-&midori-version; &amp;&amp;
-cd midori-&midori-version;</userinput></screen>
-    </note>-->
 
     <para>
@@ -154,7 +146,7 @@
     <para>
       <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
-      linkend="webkitgtk"/> instead of <xref linkend="webkitgtk2"/>. Strictly
+      linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x.. Strictly
       speaking, <xref linkend="webkitgtk"/> is not required and Midori could
-      be linked to <xref linkend="webkitgtk2"/>. The former is deemed <quote>
+      be linked to WebKitGTK+-2.4.x. The former is deemed <quote>
       experimental</quote> by upstream, but seems to work well. The latter is
       an older API and less secure.
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision a5fc81ec1cd137e1aadb0533c3ada77e2f14d769)
+++ xsoft/other/gimp.xml	(revision 7551c54272a06c0c53b4ae8756d883bd8f863c02)
@@ -113,20 +113,4 @@
         </para>
       </listitem>
-<!--      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/gimp-&gimp-version;-device_info-1.patch"/>
-        </para>
-      </listitem>-->
-<!--      <listitem>
-        <para>
-          Compressed Patch MD5 sum: 5312793a67132131a6e3360e76f392e4
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-         Compressed Patch size: 486 KB
-        </para>
-      </listitem> -->
     </itemizedlist>
 
@@ -162,6 +146,7 @@
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
-      <xref linkend="webkitgtk2"/> (required for the help-plugin) and
-      <xref linkend="gtk-doc"/>, and
+      <xref linkend="gtk-doc"/>, 
+      <!--xref linkend="webkitgtk2"/> (required for the help-plugin) and-->
+      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.x</ulink> (required for the help-plugin), and
       <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
     </para>
@@ -233,19 +218,4 @@
     </para>
 
-<!--    <para>
-      Alternatively, if you wish to build languages including Catalan,
-      apply the patch:
-    </para>
-
-<screen role="nodump"><userinput>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz \
- | patch -p1 &amp;&amp;
-./autogen.sh -prefix=/usr &amp;&amp;</userinput></screen>
-
-    <para>
-      Again, you can specify a subset of languages by specifying
-      <envar>ALL_LINGUAS</envar> in front of <command>./autogen.sh</command>, but
-      this time including &quot;ca&quot;.
-    </para>
- -->
     <para>
       Now build the help files:
@@ -287,19 +257,4 @@
     you have not installed <application>PyGTK</application>.</para>
 
-<!--<para>
-      <command>./autogen.sh</command> <parameter>-prefix=/usr</parameter>: In this case, using
-      <command>autoreconf</command> to regenerate <filename>configure</filename>
-      does not work, because of how the gimp-help developers chose to address
-      problems with the autotools.
-    </para>
-
-    <para>
-      <command>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz</command>:
-      this patch is large, so it has been compressed with
-      <application>xz</application>. You are encouraged to be suspicious of
-      all patches until you have looked at them. Use <command>view</command>
-      to read the compressed patch before you apply it.
-    </para>
--->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
@@ -336,4 +291,11 @@
       </para>
 
+      <para>
+        The GIMP uses either a plugin or a browser for its help system.  The
+        depedency to build the plugin, WebKitGTK+-2.4.x, has been deprecated
+        and is no longer in BLFS.  To set up the help system to work with the
+        default browser, use Edit -> Preferences -> Help System and select 'Web
+        Browser' for the 'Help Browser to use' setting.
+      </para>
     </sect3>
 
