Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 58720a7b9d9de28d6b8c0251f01244c5de199403)
+++ x/lib/webkitgtk2.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -7,8 +7,8 @@
   <!ENTITY webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
   <!ENTITY webkitgtk2-download-ftp  " ">
-  <!ENTITY webkitgtk2-md5sum        "79edd28d32172abc17a8861622cc274f">
+  <!ENTITY webkitgtk2-md5sum        "c2e1687bb0314a0948fbf78e2d1e931f">
   <!ENTITY webkitgtk2-size          "9.4 MB">
-  <!ENTITY webkitgtk2-buildsize     "938 MB">
-  <!ENTITY webkitgtk2-time          "77 SBU">
+  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
+  <!ENTITY webkitgtk2-time          "138 SBU (both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
 ]>
 
@@ -31,7 +31,8 @@
 
     <para>
-      The <application>WebKitGTK+</application> is the port of the portable
-      web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> platform.
+      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>
 
@@ -77,4 +78,5 @@
     <para role="required">
       <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk2"/> or
       <xref linkend="gtk3"/>,
       <xref linkend="icu"/>,
@@ -89,4 +91,10 @@
     </para>
 
+    <note><para>
+      WebKit2 links against GTK+ 2 (even if GTK+ 3 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">
@@ -94,5 +102,4 @@
       <xref linkend="geoclue"/>,
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk2"/> and
       <xref linkend="hicolor-icon-theme"/>
     </para>
@@ -115,15 +122,4 @@
     <title>Installation of WebKitGTK+</title>
 
-    <warning>
-      <para>
-        If you are building <application>WebKitGTK+</application>
-        with <command>make</command> 3.82, make sure that you have built
-        it with the following
-        <ulink url="&patch-downloads;/make/make-3.82-upstream_fixes-3.patch">
-        patch</ulink> applied or <application>WebKitGTK+</application>
-        build may fail.
-      </para>
-    </warning>
-
     <para>
       If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
@@ -131,5 +127,19 @@
     </para>
 
-<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
+<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' \
+                           GNUmakefile.in</userinput></screen>
+
+    <para>
+      Upstream standard now is to link this package against GTK+ 3. However,
+      for backward compatibility, manu users need also another instance, linked
+      to GTK+ 2. Both can be installed in the same system, without problem.
+      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 WebKitGTK+ against
+      GTK+ 3</bridgehead>
 
     <para>
@@ -138,11 +148,15 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr          \
-            --enable-introspection &amp;&amp;
+<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 source directory,
+      useable basic graphical web browsers in the build directory,
       <application>Programs/GtkLauncher</application> and
       <application>Programs/MiniBrowser</application>. If launching any one
@@ -162,17 +176,72 @@
     </para>
 
-<screen role="root"><userinput>make install                                    &amp;&amp;
-rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0    &amp;&amp;
-mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</userinput></screen>
+<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 WebKitGTK+ against
+      GTK+ 2</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 GTK+ 3, 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>
-      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</command>:
-      There is a conflict with the directory installed with same name by
-      <xref linkend="webkitgtk"/>.
-    </para>
 
     <para>
@@ -193,10 +262,4 @@
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>--libexecdir=/usr/lib/webkitgtk3</option>: This option
-    puts the package's private programs into
-    <filename class="directory">/usr/lib/webkitgtk3</filename> instead of
-    <filename class="directory">/usr/libexec</filename> in accordance with
-    the old version of the FHS used before LFS-7.5.</para>
-
   </sect2>
 
@@ -205,5 +268,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
@@ -211,18 +274,22 @@
       <seglistitem>
         <seg>
-          jsc-3
+          jsc-1, and jsc-3
         </seg>
         <seg>
+          libjavascriptcoregtk-1.0.so,
           libjavascriptcoregtk-3.0.so,
           libwebkit2gtk-3.0.so,
-          libwebkitgtk-3.0.so and
-          /usr/lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
+          libwebkitgtk-1.0.so,
+          libwebkitgtk-3.0.so, and
+          webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
         </seg>
         <seg>
+          /usr/include/webkitgtk-1.0,
           /usr/include/webkitgtk-3.0,
           /usr/lib/webkit2gtk-3.0,
-          /usr/share/gtk-doc/html/webkitgtk-2.0,
+          /usr/share/gtk-doc/html/webkit2gtk,
           /usr/share/gtk-doc/html/webkitdomgtk,
-          /usr/share/gtk-doc/html/webkit2gtk, and
+          /usr/share/gtk-doc/html/webkitgtk,
+          /usr/share/webkitgtk-1.0, and
           /usr/share/webkitgtk-3.0
         </seg>
@@ -235,4 +302,17 @@
       <?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>
@@ -244,4 +324,18 @@
           <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>
@@ -256,23 +350,22 @@
             and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
           </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-3">
+          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3">
             <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="libwebkit2gtkinjectedbundle">
-        <term><filename class="libraryfile">libwebkit2gtkinjectedbundle.so</filename></term>
+
+      <varlistentry id="libwebkitgtk-1">
+        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
         <listitem>
           <para>
             contains the <application>WebKitGTK+</application> API functions for
-            the Injected Bundle support.
-          </para>
-          <indexterm zone="webkitgtk libwebkit2gtkinjectedbundle">
-            <primary sortas="c-libwebkit2gtkinjectedbundle">libwebkit2gtkinjectedbundle.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+            <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">
@@ -283,5 +376,5 @@
             <application>GTK+ 3</application>.
           </para>
-          <indexterm zone="webkitgtk libwebkitgtk-3">
+          <indexterm zone="webkitgtk2 libwebkitgtk-3">
             <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
           </indexterm>
@@ -295,5 +388,5 @@
             contains the <application>WebKit2</application> API functions.
           </para>
-          <indexterm zone="webkitgtk libwebkit2gtk-3">
+          <indexterm zone="webkitgtk2 libwebkit2gtk-3">
             <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
           </indexterm>
