Index: general.ent
===================================================================
--- general.ent	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ general.ent	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -146,5 +146,5 @@
 
 <!ENTITY acl-version                  "2.2.51">
-<!ENTITY attr-version                 "2.4.46">
+<!ENTITY attr-version                 "2.4.47">
 <!ENTITY consolekit-version           "0.4.6">
 <!ENTITY cracklib-version             "2.8.22">
@@ -300,4 +300,5 @@
 <!ENTITY librsvg-version              "2.36.4">
 <!ENTITY libtiff-version              "4.0.3">
+<!ENTITY libwebp-version              "0.3.0">
 <!ENTITY openjpeg-version             "1.5.1">
 <!ENTITY pixman-version               "0.30.0">
@@ -524,12 +525,12 @@
 <!ENTITY util-macros-version          "1.17">
 <!ENTITY makedepend-version           "1.0.4">
-<!ENTITY libXau-version               "1.0.7">
+<!ENTITY libXau-version               "1.0.8">
 <!ENTITY libXdmcp-version             "1.1.1">
 <!ENTITY libpthread-stubs-version     "0.3">
 <!ENTITY xcb-proto-version            "1.8">
-<!ENTITY libxcb-version               "1.9">
+<!ENTITY libxcb-version               "1.9.1">
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.3">
-<!ENTITY xkeyboard-config-version     "2.8">
+<!ENTITY xkeyboard-config-version     "2.9">
 <!ENTITY mesalib-version              "9.1.3">
 <!ENTITY glu-version                  "9.0.0">
@@ -538,8 +539,8 @@
 <!ENTITY xcb-util-renderutil-version  "0.3.8">
 <!ENTITY printproto-version           "1.0.5">
-<!ENTITY libXp-version                "1.0.1">
+<!ENTITY libXp-version                "1.0.2">
 <!ENTITY xorg-server-version          "1.14.1">
 <!ENTITY twm-version                  "1.0.7">
-<!ENTITY xterm-version                "291">
+<!ENTITY xterm-version                "293">
 <!ENTITY xclock-version               "1.0.6">
 <!ENTITY xinit-version                "1.3.2">
@@ -579,4 +580,5 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.10.2">
+<!ENTITY webkitgtk2-version           "2.0.2">
 <!ENTITY xulrunner-version            "21.0">
 
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ general/graphlib/graphlib.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -42,4 +42,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librsvg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtiff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwebp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
Index: general/graphlib/libwebp.xml
===================================================================
--- general/graphlib/libwebp.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
+++ general/graphlib/libwebp.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -0,0 +1,189 @@
+<?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 libwebp-download-http "https://webp.googlecode.com/files/libwebp-&libwebp-version;.tar.gz">
+  <!ENTITY libwebp-download-ftp  " ">
+  <!ENTITY libwebp-md5sum        "4183f4f51ada98976f14e7bd51f30938">
+  <!ENTITY libwebp-size          "784 KB">
+  <!ENTITY libwebp-buildsize     "12 MB">
+  <!ENTITY libwebp-time          "0.3 SBU">
+]>
+
+<sect1 id="libwebp" xreflabel="libwebp-&libwebp-version;">
+  <?dbhtml filename="libwebp.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libwebp-&libwebp-version;</title>
+
+  <indexterm zone="libwebp">
+    <primary sortas="a-libwebp">libwebp</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libwebp</title>
+
+    <para>
+      The <application>libwebp</application> package contains a library
+      and support programs to encode and decode images in WebP format.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libwebp-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libwebp-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libwebp-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libwebp-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libwebp-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libwebp-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libwebp Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/> and
+      <xref linkend="libtiff"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="giflib"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libwebp"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libwebp</title>
+
+    <para>
+      Install <application>libwebp</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          cwebp and dwebp
+        </seg>
+        <seg>
+          libwebp.so
+        </seg>
+        <seg>
+          /usr/include/webp
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cwebp">
+        <term><command>cwebp</command></term>
+        <listitem>
+          <para>
+            compresses an image using the WebP format.
+          </para>
+          <indexterm zone="libwebp cwebp">
+            <primary sortas="b-cwebp">cwebp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dwebp">
+        <term><command>dwebp</command></term>
+        <listitem>
+          <para>
+            decompresses WebP files into PNG, PAM, PPM or PGM images.
+          </para>
+          <indexterm zone="libwebp dwebp">
+            <primary sortas="b-dwebp">dwebp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebp-lib">
+        <term><filename class="libraryfile">libwebp.so</filename></term>
+        <listitem>
+          <para>
+            contains the API functions for WebP encoding and decoding.
+          </para>
+          <indexterm zone="libwebp libwebp-lib">
+            <primary sortas="c-libwebp">libwebp.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ gnome/core/yelp.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="webkitgtk"/> and
+      <xref linkend="webkitgtk2"/> and
       <xref linkend="yelp-xsl"/>
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ introduction/welcome/changelog.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -46,6 +46,21 @@
 
     <listitem>
+      <para>June 6th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Added libwebp 0.3.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - WebKitGTK+ 2.0.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 5th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[igor] - attr-2.4.47.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Nmap-6.25.</para>
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ networking/netprogs/wget.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -104,4 +104,11 @@
             --with-ssl=openssl &amp;&amp;
 make</userinput></screen>
+
+    <note>
+      <para><command>make</command> will fail if you have installed Perl version 
+      5.18.0 or later as the <command>pod2man</command> script was changed. This
+      is actually only a warning, and not a fatal error. Running
+      <command>make</command> a second time will terminate correctly.</para>
+    </note>
 
     <para>
Index: postlfs/security/attr.xml
===================================================================
--- postlfs/security/attr.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ postlfs/security/attr.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,6 +7,6 @@
   <!ENTITY attr-download-http "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
   <!ENTITY attr-download-ftp  " ">
-  <!ENTITY attr-md5sum        "db557c17fdfa4f785333ecda08654010">
-  <!ENTITY attr-size          "332 KB">
+  <!ENTITY attr-md5sum        "84f58dec00b60f2dc8fd1c9709291cc7">
+  <!ENTITY attr-size          "336 KB">
   <!ENTITY attr-buildsize     "3.5 MB">
   <!ENTITY attr-time          "0.1 SBU">
@@ -72,5 +72,5 @@
 INSTALL_USER=root  \
 INSTALL_GROUP=root \
-./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib --disable-static &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -85,7 +85,6 @@
 <!-- Package uses DIST_ROOT instead of DESTDIR -->
 <screen role="root"><userinput>make install install-dev install-lib &amp;&amp;
-chmod -v 0755 /lib/libattr.so.1.1.0           &amp;&amp;
-rm -v /lib/libattr.{a,la,so}                  &amp;&amp;
-sed -i 's@/lib@/usr/lib@' /usr/lib/libattr.la &amp;&amp;
+chmod -v 755 /usr/lib/libattr.so.1.1.0 &amp;&amp;
+mv -v /usr/lib/libattr.so.* /lib &amp;&amp;
 ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
 
@@ -101,8 +100,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
-    <para><command>sed -i ... /usr/lib/libattr.la</command>: This command
-    corrects the location of the installed library as referenced
-    in the libtool archive.</para>
 
   </sect2>
Index: x/installing/libXau.xml
===================================================================
--- x/installing/libXau.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/libXau.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,7 +7,7 @@
   <!ENTITY libXau-download-http "http://xorg.freedesktop.org/releases/individual/lib/libXau-&libXau-version;.tar.bz2">
   <!ENTITY libXau-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libXau-&libXau-version;.tar.bz2">
-  <!ENTITY libXau-md5sum        "2d241521df40d27034413436d1a1465c">
-  <!ENTITY libXau-size          "268 KB">
-  <!ENTITY libXau-buildsize     "2.3 MB">
+  <!ENTITY libXau-md5sum        "685f8abbffa6d145c0f930f00703b21b">
+  <!ENTITY libXau-size          "289 KB">
+  <!ENTITY libXau-buildsize     "2.6 MB">
   <!ENTITY libXau-time          "less than 0.1 SBU">
 ]>
Index: x/installing/libXdmcp.xml
===================================================================
--- x/installing/libXdmcp.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/libXdmcp.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -91,10 +91,10 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>None</seg>
         <seg>libXdmcp.so</seg>
-        <seg>None</seg>
+        <seg><envar>$XORG_PREFIX</envar>/share/doc/libXdmcp</seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/libXp.xml
===================================================================
--- x/installing/libXp.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/libXp.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,7 +7,7 @@
   <!ENTITY libXp-download-http "http://xorg.freedesktop.org/releases/individual/lib/libXp-&libXp-version;.tar.bz2">
   <!ENTITY libXp-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libXp-&libXp-version;.tar.bz2">
-  <!ENTITY libXp-md5sum        "7ae1d63748e79086bd51a633da1ff1a9">
-  <!ENTITY libXp-size          "300 KB">
-  <!ENTITY libXp-buildsize     "6.3 MB">
+  <!ENTITY libXp-md5sum        "bb038577c7f4e42a1b675fa6451bc4aa">
+  <!ENTITY libXp-size          "292 KB">
+  <!ENTITY libXp-buildsize     "4.9 MB">
   <!ENTITY libXp-time          "less than 0.1 SBU">
 ]>
Index: x/installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/libxcb.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,7 +7,7 @@
   <!ENTITY libxcb-download-http "http://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2">
   <!ENTITY libxcb-download-ftp  " ">
-  <!ENTITY libxcb-md5sum        "2b05856e9d1cb37836aae7406f2f4ce2">
-  <!ENTITY libxcb-size          "380 KB">
-  <!ENTITY libxcb-buildsize     "40 MB">
+  <!ENTITY libxcb-md5sum        "ed632cb0dc31b6fbd7ea5c0f931cf5a4">
+  <!ENTITY libxcb-size          "365 KB">
+  <!ENTITY libxcb-buildsize     "39 MB">
   <!ENTITY libxcb-time          "0.3 SBU">
 ]>
Index: x/installing/makedepend.xml
===================================================================
--- x/installing/makedepend.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/makedepend.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -92,7 +92,11 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>makedepend</seg>
+        <seg>None</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/mesalib.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -372,5 +372,5 @@
 
     <segmentedlist>
-      <segtitle>Optionally Installed Programs</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
@@ -388,5 +388,4 @@
         <seg>
           /usr/include/EGL,
-          /usr/include/GL,
           /usr/include/GLES,
           /usr/include/GLES2,
Index: x/installing/util-macros.xml
===================================================================
--- x/installing/util-macros.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/util-macros.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -69,8 +69,7 @@
     commands:</para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
+<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -80,3 +79,20 @@
   </sect2>
 
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg><envar>$XORG_PREFIX</envar>/share/util-macros</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
 </sect1>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/x7app.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,7 +7,7 @@
   <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
   <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
-  <!ENTITY x7apps-size          "4.8 MB">
-  <!ENTITY x7apps-buildsize     "39.2 MB">
-  <!ENTITY x7apps-time          "1.5 SBU">
+  <!ENTITY x7apps-size          "4.9 MB">
+  <!ENTITY x7apps-buildsize     "51 MB">
+  <!ENTITY x7apps-time          "1.9 SBU">
 
   <!ENTITY bdftopcf-version                "1.0.4">
@@ -41,6 +41,6 @@
   <!ENTITY xauth-md5sum                    "cbcbd8f2156a53b609800bec4c6b6c0e">
 
-  <!ENTITY xbacklight-version              "1.1.2">
-  <!ENTITY xbacklight-md5sum               "c9891d6a3f3129d56cede72daa0ba26c">
+  <!ENTITY xbacklight-version              "1.2.0">
+  <!ENTITY xbacklight-md5sum               "04189c90850c36592b9f2b358f8581e4">
 
   <!ENTITY xcmsdb-version                  "1.0.4">
@@ -50,6 +50,6 @@
   <!ENTITY xcursorgen-md5sum               "09f56978a62854534deacc8aa8ff3031">
 
-  <!ENTITY xdpyinfo-version                "1.3.0">
-  <!ENTITY xdpyinfo-md5sum                 "1ef08f4c8d0e669c2edd49e4a1bf650d">
+  <!ENTITY xdpyinfo-version                "1.3.1">
+  <!ENTITY xdpyinfo-md5sum                 "cacc0733f16e4f2a97a5c430fcc4420e">
 
   <!ENTITY xdriinfo-version                "1.0.4">
@@ -86,4 +86,7 @@
   <!ENTITY xlsclients-md5sum               "760099f0af112401735801e3b9aa8595">
 
+  <!ENTITY xmessage-version                "1.0.4">
+  <!ENTITY xmessage-md5sum                 "2dd5ae46fa18abc9331bc26250a25005">
+
   <!ENTITY xmodmap-version                 "1.0.7">
   <!ENTITY xmodmap-md5sum                  "d9b65f6881afe0d6d9863b30e1081bde">
@@ -101,6 +104,6 @@
   <!ENTITY xrdb-md5sum                     "ed2e48cf33584455d74615ad4bbe4246">
 
-  <!ENTITY xrefresh-version                "1.0.4">
-  <!ENTITY xrefresh-md5sum                 "2f63f88ad0dcecd33c8cf000f38e9250">
+  <!ENTITY xrefresh-version                "1.0.5">
+  <!ENTITY xrefresh-md5sum                 "a896382bc53ef3e149eaf9b13bc81d42">
 
   <!ENTITY xset-version                    "1.2.2">
@@ -116,6 +119,6 @@
   <!ENTITY xwd-md5sum                      "2113126f9ac9c02bb8547c112c5d037e">
 
-  <!ENTITY xwininfo-version                "1.1.2">
-  <!ENTITY xwininfo-md5sum                 "9e8b58c8aa6172e87ab4f9cf3612fedd">
+  <!ENTITY xwininfo-version                "1.1.3">
+  <!ENTITY xwininfo-md5sum                 "b777bafb674555e48fd8437618270931">
 
   <!ENTITY xwud-version                    "1.0.4">
@@ -215,4 +218,5 @@
 &xlsatoms-md5sum;  xlsatoms-&xlsatoms-version;.tar.bz2
 &xlsclients-md5sum;  xlsclients-&xlsclients-version;.tar.bz2
+&xmessage-md5sum;  xmessage-&xmessage-version;.tar.bz2
 &xmodmap-md5sum;  xmodmap-&xmodmap-version;.tar.bz2
 &xpr-md5sum;  xpr-&xpr-version;.tar.bz2
@@ -290,10 +294,10 @@
       <seglistitem>
 
-        <seg>bdftopcf, iceauth, luit, mkfontdir,mkfontscale, sessreg,
-        setxkbmap, smproxy, x11perf, x11perfcomp, xauth,
+        <seg>bdftopcf, iceauth, luit, mkfontdir, mkfontscale, sessreg,
+        setxkbmap, smproxy, x11perf, x11perfcomp, xauth, xbacklight,
         xcmsdb, xcursorgen, xdpr, xdpyinfo, xdriinfo, xev, xgamma, xhost,
         xkbbell, xkbcomp, xkbevd, xkbvleds, xkbwatch, xkill, xlsatoms,
-        xlsclients, xmodmap, xpr, xprop, xrandr, xrdb, xrefresh, xset,
-        xsetroot, xvinfo, xwd, xwininfo, and xwud</seg>
+        xlsclients, xmessage, xmodmap, xpr, xprop, xrandr, xrdb, xrefresh,
+        xset, xsetroot, xvinfo, xwd, xwininfo, and xwud</seg>
         <seg>None</seg>
         <seg>None</seg>
@@ -428,4 +432,14 @@
       </varlistentry>
 
+      <varlistentry id="xbacklight-x7">
+        <term><command>xbacklight</command></term>
+        <listitem>
+          <para>adjusts backlight brightness using RandR extension.</para>
+          <indexterm zone="xorg7-app xbacklight-x7">
+            <primary sortas="b-xbacklight">xbacklight</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="xcmsdb-x7">
         <term><command>xcmsdb</command></term>
@@ -591,4 +605,14 @@
       </varlistentry>
 
+      <varlistentry id="xmessage-x7">
+        <term><command>xmessage</command></term>
+        <listitem>
+          <para>displays a message or query in a window.</para>
+          <indexterm zone="xorg7-app xmessage-x7">
+            <primary sortas="b-xmessage">xmessage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="xmodmap-x7">
         <term><command>xmodmap</command></term>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/x7driver.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -44,5 +44,5 @@
   <!ENTITY xorg-vmmouse-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-wacom-driver-version "0.20.0">
+  <!ENTITY xorg-wacom-driver-version "0.21.0">
 
   <!ENTITY xorg-wacom-driver-download-http "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
@@ -80,12 +80,12 @@
   <!ENTITY xorg-fbdev-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-intel-driver-version "2.21.7">
+  <!ENTITY xorg-intel-driver-version "2.21.8">
 
   <!ENTITY xorg-intel-driver-download-http "&xorg-download-http;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
   <!ENTITY xorg-intel-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
-  <!ENTITY xorg-intel-driver-md5sum        "c3a8b542fc4787ad17a5f0567a3429fd">
+  <!ENTITY xorg-intel-driver-md5sum        "34de8dbd2bee0546c54c7834a03e0962">
   <!ENTITY xorg-intel-driver-size          "1.7 MB">
-  <!ENTITY xorg-intel-driver-buildsize     "70 MB">
-  <!ENTITY xorg-intel-driver-time          "0.6 SBU">
+  <!ENTITY xorg-intel-driver-buildsize     "67 MB">
+  <!ENTITY xorg-intel-driver-time          "0.5 SBU">
 
   <!ENTITY xorg-mach64-driver-version "6.9.4">
@@ -116,12 +116,12 @@
   <!ENTITY xorg-nouveau-driver-time          "0.2 SBU">
 
-  <!ENTITY xorg-openchrome-driver-version "0.3.2">
+  <!ENTITY xorg-openchrome-driver-version "0.3.3">
 
   <!ENTITY xorg-openchrome-driver-download-http "&xorg-download-http;/driver/xf86-video-openchrome-&xorg-openchrome-driver-version;.tar.bz2">
   <!ENTITY xorg-openchrome-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-openchrome-&xorg-openchrome-driver-version;.tar.bz2">
-  <!ENTITY xorg-openchrome-driver-md5sum        "172509a5a7ab5c89ff09501d733cf5f6">
-  <!ENTITY xorg-openchrome-driver-size          "508 KB">
+  <!ENTITY xorg-openchrome-driver-md5sum        "f21abcdf87f73b5b547491281e894c87">
+  <!ENTITY xorg-openchrome-driver-size          "507 KB">
   <!ENTITY xorg-openchrome-driver-buildsize     "14 MB">
-  <!ENTITY xorg-openchrome-driver-time          "0.2 SBU">
+  <!ENTITY xorg-openchrome-driver-time          "0.1 SBU">
 
   <!ENTITY xorg-r128-driver-version "6.9.1">
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/x7lib.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,5 +7,5 @@
   <!ENTITY x7libs-download-http "http://xorg.freedesktop.org/releases/individual/lib/">
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
-  <!ENTITY x7libs-size          "12.1 MB">
+  <!ENTITY x7libs-size          "13 MB">
   <!ENTITY x7libs-buildsize     "280 MB">
   <!ENTITY x7libs-time          "3.7 SBU">
@@ -14,12 +14,12 @@
   <!ENTITY xtrans-md5sum                   "84c66908cf003ad8c272b0eecbdbaee3">
 
-  <!ENTITY libX11-version                  "1.5.0">
-  <!ENTITY libX11-md5sum                   "78b4b3bab4acbdf0abcfca30a8c70cc6">
-
-  <!ENTITY libXext-version                 "1.3.1">
-  <!ENTITY libXext-md5sum                  "71251a22bc47068d60a95f50ed2ec3cf">
-
-  <!ENTITY libFS-version                   "1.0.4">
-  <!ENTITY libFS-md5sum                    "645f83160cf7b562734e2038045106d1">
+  <!ENTITY libX11-version                  "1.6.0">
+  <!ENTITY libX11-md5sum                   "f7c7a614f5c609e759dadb99436eb9c1">
+
+  <!ENTITY libXext-version                 "1.3.2">
+  <!ENTITY libXext-md5sum                  "4376101e51bb2c6c44d9ab14344e85ad">
+
+  <!ENTITY libFS-version                   "1.0.5">
+  <!ENTITY libFS-md5sum                    "e3c77ca27942ebc5eb2ca99f29363515">
 
   <!ENTITY libICE-version                  "1.0.8">
@@ -32,6 +32,6 @@
   <!ENTITY libXScrnSaver-md5sum            "7a773b16165e39e938650bcc9027c1d5">
 
-  <!ENTITY libXt-version                   "1.1.3">
-  <!ENTITY libXt-md5sum                    "a6f137ae100e74ebe3b71eb4a38c40b3">
+  <!ENTITY libXt-version                   "1.1.4">
+  <!ENTITY libXt-md5sum                    "03149823ae57bb02d0cec90d5b97d56c">
 
   <!ENTITY libXmu-version                  "1.1.1">
@@ -44,6 +44,6 @@
   <!ENTITY libXaw-md5sum                   "f39942f2cab379fc9b4c3731bf191b84">
 
-  <!ENTITY libXfixes-version               "5.0">
-  <!ENTITY libXfixes-md5sum                "678071bd7f9f7467e2fc712d81022318">
+  <!ENTITY libXfixes-version               "5.0.1">
+  <!ENTITY libXfixes-md5sum                "b985b85f8b9386c85ddcfe1073906b4d">
 
   <!ENTITY libXcomposite-version           "0.4.4">
@@ -53,12 +53,12 @@
   <!ENTITY libXrender-md5sum               "ee62f4c7f0f16ced4da63308963ccad2">
 
-  <!ENTITY libXcursor-version              "1.1.13">
-  <!ENTITY libXcursor-md5sum               "52efa81b7f26c8eda13510a2fba98eea">
+  <!ENTITY libXcursor-version              "1.1.14">
+  <!ENTITY libXcursor-md5sum               "1e7c17afbbce83e2215917047c57d1b3">
 
   <!ENTITY libXdamage-version              "1.1.4">
   <!ENTITY libXdamage-md5sum               "0cf292de2a9fa2e9a939aefde68fd34f">
 
-  <!ENTITY libfontenc-version              "1.1.1">
-  <!ENTITY libfontenc-md5sum               "a2a861f142c3b4367f14fc14239fc1f7">
+  <!ENTITY libfontenc-version              "1.1.2">
+  <!ENTITY libfontenc-md5sum               "ad2919764933e075bb0361ad5caa3d19">
 
   <!ENTITY libXfont-version                "1.4.5">
@@ -71,30 +71,30 @@
   <!ENTITY libXi-md5sum                    "24d71afed1b86c60d4eb361628d7f47b">
 
-  <!ENTITY libXinerama-version             "1.1.2">
-  <!ENTITY libXinerama-md5sum              "cb45d6672c93a608f003b6404f1dd462">
-
-  <!ENTITY libXrandr-version               "1.4.0">
-  <!ENTITY libXrandr-md5sum                "0c843636124cc1494e3d87df16957672">
-
-  <!ENTITY libXres-version                 "1.0.6">
-  <!ENTITY libXres-md5sum                  "80d0c6d8522fa7a645e4f522e9a9cd20">
-
-  <!ENTITY libXtst-version                 "1.2.1">
-  <!ENTITY libXtst-md5sum                  "e8abc5c00c666f551cf26aa53819d592">
-
-  <!ENTITY libXv-version                   "1.0.7">
-  <!ENTITY libXv-md5sum                    "5e1ac203ccd3ce3e89755ed1fbe75b0b">
+  <!ENTITY libXinerama-version             "1.1.3">
+  <!ENTITY libXinerama-md5sum              "9336dc46ae3bf5f81c247f7131461efd">
+
+  <!ENTITY libXrandr-version               "1.4.1">
+  <!ENTITY libXrandr-md5sum                "8dbac4e972348dcbd3a0673ce2e37919">
+
+  <!ENTITY libXres-version                 "1.0.7">
+  <!ENTITY libXres-md5sum                  "45ef29206a6b58254c81bea28ec6c95f">
+
+  <!ENTITY libXtst-version                 "1.2.2">
+  <!ENTITY libXtst-md5sum                  "25c6b366ac3dc7a12c5d79816ce96a59">
+
+  <!ENTITY libXv-version                   "1.0.8">
+  <!ENTITY libXv-md5sum                    "224dadca53d9c88f8a2b8945babcea70">
 
   <!ENTITY libXvMC-version                 "1.0.7">
   <!ENTITY libXvMC-md5sum                  "3340c99ff556ea2457b4be47f5cb96fa">
 
-  <!ENTITY libXxf86dga-version             "1.1.3">
-  <!ENTITY libXxf86dga-md5sum              "b7f38465c46e7145782d37dbb9da8c09">
-
-  <!ENTITY libXxf86vm-version              "1.1.2">
-  <!ENTITY libXxf86vm-md5sum               "ffd93bcedd8b2b5aeabf184e7b91f326">
-
-  <!ENTITY libdmx-version                  "1.1.2">
-  <!ENTITY libdmx-md5sum                   "782ced3a9e754dfeb53a8a006a75eb1a">
+  <!ENTITY libXxf86dga-version             "1.1.4">
+  <!ENTITY libXxf86dga-md5sum              "d7dd9b9df336b7dd4028b6b56542ff2c">
+
+  <!ENTITY libXxf86vm-version              "1.1.3">
+  <!ENTITY libXxf86vm-md5sum               "e46f6ee4f4567349a3189044fe1bb712">
+
+  <!ENTITY libdmx-version                  "1.1.3">
+  <!ENTITY libdmx-md5sum                   "ba983eba5a9f05d152a0725b8e863151">
 
   <!ENTITY libpciaccess-version            "0.13.1">
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/x7proto.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -80,6 +80,6 @@
   <!ENTITY xineramaproto-md5sum            "9959fe0bfb22a0e7260433b8d199590a">
 
-  <!ENTITY xproto-version                  "7.0.23">
-  <!ENTITY xproto-md5sum                   "d4d241a4849167e4e694fe73371c328c">
+  <!ENTITY xproto-version                  "7.0.24">
+  <!ENTITY xproto-md5sum                   "9c0203c3bee4bac432ec504dc45712ed">
 
 ]>
@@ -137,6 +137,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"> <xref linkend="fop"/> and <xref linkend="xmlto"/>
-    (to build additional documentation)</para>
+    <para role="optional"><xref linkend="fop"/>, <xref linkend="xmlto"/> and
+    <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> (to build
+    additional documentation)</para>
 
     <note><para>There is a reciprocal dependency with <xref linkend="fop"/>. If
@@ -237,11 +238,14 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
         <seg>
           <envar>$XORG_PREFIX</envar>/include/GL,
           <envar>$XORG_PREFIX</envar>/include/X11,
-          <envar>$XORG_PREFIX</envar>/lib/pkgconfig,
           <envar>$XORG_PREFIX</envar>/share/doc/bigreqsproto,
           <envar>$XORG_PREFIX</envar>/share/doc/compositeproto,
@@ -250,5 +254,4 @@
           <envar>$XORG_PREFIX</envar>/share/doc/fixesproto,
           <envar>$XORG_PREFIX</envar>/share/doc/fontsproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/inputproto,
           <envar>$XORG_PREFIX</envar>/share/doc/kbproto,
           <envar>$XORG_PREFIX</envar>/share/doc/randrproto,
Index: x/installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xbitmaps.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -102,10 +102,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/include/X11/bitmaps
-        </seg>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg><envar>$XORG_PREFIX</envar>/include/X11/bitmaps</seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xcb-proto.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -92,7 +92,11 @@
 
     <segmentedlist>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
         <seg><envar>$XORG_PREFIX</envar>/share/xcb</seg>
       </seglistitem>
Index: x/installing/xcb-util-image.xml
===================================================================
--- x/installing/xcb-util-image.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xcb-util-image.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -111,8 +111,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
         <seg>libxcb-image.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/xcb-util-renderutil.xml
===================================================================
--- x/installing/xcb-util-renderutil.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xcb-util-renderutil.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -110,8 +110,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
         <seg>libxcb-render-util.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/xcb-util.xml
===================================================================
--- x/installing/xcb-util.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xcb-util.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -96,7 +96,5 @@
 make</userinput></screen>
 
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
+    <para>This package does not come with a test suite.</para>
 
     <para>
@@ -112,8 +110,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
         <seg>libxcb-util.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/xcursor-themes.xml
===================================================================
--- x/installing/xcursor-themes.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xcursor-themes.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -110,7 +110,11 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
         <seg>
           <envar>$XORG_PREFIX</envar>/share/icons/handhelds,
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xkeyboard-config.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,6 +7,6 @@
   <!ENTITY xkeyboard-config-download-http "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   <!ENTITY xkeyboard-config-download-ftp  "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "e66d567d85a954d589c5723fb0e1f3dd">
-  <!ENTITY xkeyboard-config-size          "844 KB">
+  <!ENTITY xkeyboard-config-md5sum        "9b1280d8ba40274a0f1567c94fca7501">
+  <!ENTITY xkeyboard-config-size          "891 KB">
   <!ENTITY xkeyboard-config-buildsize     "18 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
@@ -122,7 +122,11 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
         <seg>
           <envar>$XORG_PREFIX</envar>/share/X11/xkb
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/installing/xterm.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -7,7 +7,7 @@
   <!ENTITY xterm-download-http " ">
   <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-md5sum        "9925cd564c84746442e640f0e32f0493">
-  <!ENTITY xterm-size          "1 MB">
-  <!ENTITY xterm-buildsize     "14 MB">
+  <!ENTITY xterm-md5sum        "f9dc37486d5f1e550b6dc2e26a8a0439">
+  <!ENTITY xterm-size          "1.1 MB">
+  <!ENTITY xterm-buildsize     "13 MB">
   <!ENTITY xterm-time          "0.2 SBU">
 ]>
@@ -105,8 +105,4 @@
     <filename class="directory">/usr</filename>.</para>
 
-    <para><parameter>--with-app-defaults=...</parameter>: Sets the location
-    for the <filename class="directory">app-defaults</filename>
-    directory.</para>
-
     <para><parameter>--enable-luit</parameter>: Enables the luit filter for
     translation between Unicode (used by xterm internally in the configuration
@@ -117,4 +113,8 @@
     <para><parameter>--enable-wide-chars</parameter>: Adds support for wide
     characters.</para>
+
+    <para><parameter>--with-app-defaults=...</parameter>: Sets the location
+    for the <filename class="directory">app-defaults</filename>
+    directory.</para>
 
     <para><command>make install-ti</command>: This command installs corrected
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/lib/cairo.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -105,4 +105,5 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="libdrm"/>,
+      <xref linkend="LZO"/>,
       <xref linkend="mesalib"/>,
       <xref linkend="qt4"/>,
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/lib/lib.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -57,4 +57,5 @@
   <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="webkitgtk.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="xulrunner.xml"/>
 
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/lib/webkitgtk.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -9,5 +9,5 @@
   <!ENTITY webkitgtk-md5sum        "7b1a652af1eb11bee5bf7209e9ff67e6">
   <!ENTITY webkitgtk-size          "8.3 MB">
-  <!ENTITY webkitgtk-buildsize     "800 MB (650 MB for GTK+2 version)">
+  <!ENTITY webkitgtk-buildsize     "650 MB">
   <!ENTITY webkitgtk-time          "55 SBU">
 ]>
@@ -31,7 +31,7 @@
 
     <para>
-      The <application>WebKitGTK+</application> package is the port of the
-      portable web rendering engine <application>WebKit</application> to the
-      <application>GTK+</application> platform.
+      The <application>WebKitGTK+</application> is the port of the portable
+      web rendering engine <application>WebKit</application> to the
+      <application>GTK+ 2</application> platform.
     </para>
 
@@ -84,14 +84,10 @@
     <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
 
-    <!-- webkitgtk 2.0.2 requires libwebp -->
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="gperf"/>,
-      <xref linkend="gst10-plugins-base"/> or
       <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk3"/> or
       <xref linkend="gtk2"/>,
       <xref linkend="icu"/>,
-      <xref linkend="libxslt"/>,
       <xref linkend="libsoup"/>,
       <xref linkend="mesalib"/>,
@@ -103,6 +99,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="geoclue"/> and
-      <xref linkend="gobject-introspection"/>
+      <xref linkend="enchant"/> and
+      <xref linkend="geoclue"/>
     </para>
 
@@ -110,5 +106,5 @@
     <para role="optional">
       <xref linkend="curl"/>,
-      <xref linkend="enchant"/>,
+      <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk-doc"/> and
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
@@ -148,7 +144,7 @@
 <screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &amp;&amp;
 ./configure --prefix=/usr \
-            --libexecdir=/usr/lib/WebKitGTK \
-            --with-gstreamer=1.0 \
-            --enable-introspection &amp;&amp;
+            --libexecdir=/usr/lib/webkitgtk2 \
+            --with-gtk=2.0 \
+            --disable-webkit2 &amp;&amp;
 make</userinput></screen>
 
@@ -168,17 +164,8 @@
 
     <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>
-      <parameter>--with-gstreamer=1.0</parameter>: This switch forces use of
-      <application>GStreamer</application> 1.0 series which
-      <application>GNOME</application> 3.6 uses. Remove if you don't want
-      to install <application>GStreamer</application> 1.0 or you don't
-      want to install <application>GNOME</application>.
+      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
+      force <application>WebKitGTK+</application> to compile against
+      <application>GTK+ 2</application>, even if
+      <application>GTK+ 3</application> is also installed.
     </para>
 
@@ -189,16 +176,4 @@
     </para>
 
-    <para>
-      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
-      force <application>WebKitGTK+</application> to compile against
-      <application>GTK+ 2</application>, even if
-      <application>GTK+ 3</application> is also installed. With
-      <application>GTK+ 2</application>, everything
-      <application>WebKitGTK+</application> installs is suffixed with 1.0. When it
-      is compiled against <application>GTK+ 3</application> everything it
-      installs is suffixed with 3.0. Both versions can be installed alongside
-      one another with no namespace conflicts.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
@@ -211,20 +186,17 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          jsc-1 or jsc-3
+          jsc-1
         </seg>
         <seg>
-          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so or
-          libjavascriptcoregtk-3.0.so, libwebkit2gtk-3.0.so and
-          libwebkit-3.0.so
+          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so
         </seg>
         <seg>
-          /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
-          /usr/include/webkit-3.0, /usr/lib/WebKit and
-          /usr/share/webkit-3.0
+          /usr/include/webkit-1.0, /usr/share/webkit-1.0 and
+          /usr/lib/webkitgtk2
         </seg>
       </seglistitem>
@@ -236,6 +208,6 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="jsc">
-        <term><command>jsc-1</command> or <command>jsc-3</command></term>
+      <varlistentry id="jsc-1">
+        <term><command>jsc-1</command></term>
         <listitem>
           <para>
@@ -243,6 +215,6 @@
             outside of the context of a web browser.
           </para>
-          <indexterm zone="webkitgtk jsc">
-            <primary sortas="b-jsc">jsc</primary>
+          <indexterm zone="webkitgtk jsc-1">
+            <primary sortas="b-jsc-1">jsc-1</primary>
           </indexterm>
         </listitem>
@@ -276,43 +248,4 @@
       </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="webkitgtk libjavascriptcoregtk-3">
-            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.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="webkitgtk 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="webkitgtk libwebkit2gtk-3">
-            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
+++ x/lib/webkitgtk2.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -0,0 +1,259 @@
+<?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        "a4024f4b33d829ec1034179e94f9cab6">
+  <!ENTITY webkitgtk2-size          "9.4 MB">
+  <!ENTITY webkitgtk2-buildsize     "900 MB">
+  <!ENTITY webkitgtk2-time          "60 SBU">
+]>
+
+<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> platform.
+    </para>
+
+    &lfs73_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="gperf"/>,
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="libsecret"/>,
+      <xref linkend="libsoup"/>,
+      <xref linkend="libwebp"/>,
+      <xref linkend="mesalib"/>,
+      <xref linkend="ruby"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="udev"/> or
+      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="which"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="enchant"/>,
+      <xref linkend="geoclue"/> and
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> 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>
+
+    <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 will fail.
+      </para>
+    </warning>
+
+    <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 -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
+
+    <para>
+      Install <application>WebKitGTK+</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/webkitgtk3 \
+            --enable-introspection &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--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 Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          jsc-3
+        </seg>
+        <seg>
+          libjavascriptcoregtk-3.0.so, libwebkit2gtk-3.0.so and
+          libwebkit-3.0.so
+        </seg>
+        <seg>
+          /usr/include/webkit-3.0, /usr/lib/webkitgtk3 and
+          /usr/share/webkit-3.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <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-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="webkitgtk libjavascriptcoregtk-3">
+            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.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="webkitgtk 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="webkitgtk libwebkit2gtk-3">
+            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/wm/fluxbox.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -65,7 +65,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="fribidi"/>,
-      <xref linkend="imlib2"/> (if you wish to use other image formats in addition to XPM) and
-      <ulink url="http://xorg.freedesktop.org/releases/individual/app/">xmessage</ulink> (runtime only)
+      <xref linkend="fribidi"/> and
+      <xref linkend="imlib2"/> (if you wish to use other image formats in addition to XPM)
     </para>
 
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ x/wm/openbox.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -100,8 +100,8 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                         /
-            --libexecdir=/usr/lib/openbox         /
-            --sysconfdir=/etc                     /
-            --docdir=/usr/share/doc/openbox-&openbox-version; /
+<screen><userinput>./configure --prefix=/usr                         \
+            --libexecdir=/usr/lib/openbox         \
+            --sysconfdir=/etc                     \
+            --docdir=/usr/share/doc/openbox-&openbox-version; \
             --disable-static                      &amp;&amp;
 make</userinput></screen>
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ xfce/apps/midori.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -76,6 +76,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="webkitgtk"/> (configured --with-gtk=2.0) or
-      <xref linkend="webkitgtk"/> (configured --with-gtk=3.0) and
+      <xref linkend="webkitgtk"/> or
+      <xref linkend="webkitgtk2"/> and
       <xref linkend="vala"/>
     </para>
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ xsoft/office/gnucash.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -120,10 +120,7 @@
       <xref linkend="libgnomeui"/>,
       <xref linkend="gnome-vfs"/>,
-      <xref linkend="slib"/> and
-      <xref linkend="goffice"/>.
-    </para>
-    <para role="required">
-      <!-- needs gtkhtml-3 <xref linkend="gtkhtml"/> or -->
-      <xref linkend="webkitgtk"/> (configured <option>--with-gtk=2.0</option>).
+      <xref linkend="slib"/>,
+      <xref linkend="goffice"/> and
+      <xref linkend="webkitgtk"/>
     </para>
 
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
+++ xsoft/other/gimp.xml	(revision 5b00a2a66e636a38362d53364e6bcb4cefea7c70)
@@ -146,7 +146,5 @@
       <command>sendmail</command> program),
       <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev),
-      <xref linkend="webkitgtk"/> (this must be compiled with the
-      <application>GTK+ 2</application> backend for the
-      <application>Gimp</application> to use it as its help browser) and
+      <xref linkend="webkitgtk"/> and
       <xref linkend="gtk-doc"/>
     </para>
