Index: general/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ general/genlib/json-glib.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -65,8 +65,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>
-      (Required if building GNOME) and
       <xref linkend="gtk-doc"/>
     </para>
Index: general/genlib/libunique.xml
===================================================================
--- general/genlib/libunique.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ general/genlib/libunique.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libunique-download-http "&gnome-download-http;/libunique/3.0/libunique-&libunique-version;.tar.bz2">
-  <!ENTITY libunique-download-ftp  "&gnome-download-ftp;/libunique/3.0/libunique-&libunique-version;.tar.bz2">
-  <!ENTITY libunique-md5sum        "89c3f88c9bfc35b3f13fa2b7bda0c354">
-  <!ENTITY libunique-size          "335 KB">
-  <!ENTITY libunique-buildsize     "4.9 MB">
-  <!ENTITY libunique-time          "0.1 SBU">
+  <!ENTITY libunique-download-http "&gnome-download-http;/libunique/3.0/libunique-&libunique-version;.tar.xz">
+  <!ENTITY libunique-download-ftp  "&gnome-download-ftp;/libunique/3.0/libunique-&libunique-version;.tar.xz">
+  <!ENTITY libunique-md5sum        "a52dfbd0fee80f645b74227ade4f01ee">
+  <!ENTITY libunique-size          "288 KB">
+  <!ENTITY libunique-buildsize     "5.2 MB">
+  <!ENTITY libunique-time          "0.2 SBU">
 ]>
 
@@ -33,5 +33,5 @@
     library for writing single instance applications.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,10 +60,17 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk3"/></para>
+    <para role="required">
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="dbus-glib"/>,
-    <xref linkend="gobject-introspection"/>, and
-    <xref linkend="gtk-doc"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -76,8 +83,5 @@
     <para>Install <application>libunique</application> by running the following
     commands:</para>
-<!--
-<screen><userinput>sed -i '/DG_DISABLE_DEPRECATED/d' unique/Makefile.in &amp;&amp;
-./configure \-\-prefix=/usr \-\-disable-static &amp;&amp;
-sed -i 's#  -Werror ##' unique/dbus/Makefile &amp;&amp;-->
+
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
@@ -93,16 +97,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-    <!--
-    <para><command>sed -i '/DG_DISABLE_DEPRECATED/d' ...</command>:
-    <application>Libunique</application> uses functions that are deprecated in
-    the current version of <application>Glib</application>. This sed allows it
-    to compile using those deprecated functions.</para>
-
-    <para><command>sed -i 's#  -Werror ##' ...</command>: This sed disables
-    treating warnings as errors in the Makefile that deals with dbus.</para>
-    -->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -111,12 +107,14 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libunique-3.0.so</seg>
-        <seg>/usr/{include/unique-3.0/unique,share/gtk-doc/html/unique-3.0}</seg>
+        <seg>
+          libunique-3.0.so
+        </seg>
+        <seg>
+          /usr/include/unique-3.0 and /usr/share/gtk-doc/html/unique-3.0
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -137,5 +135,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ general/genlib/telepathy-glib.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -75,5 +75,4 @@
       <xref linkend="gobject-introspection"/> and
       <xref linkend="vala"/>
-      (Required if building GNOME)
     </para>
 
Index: general/genlib/telepathy-logger.xml
===================================================================
--- general/genlib/telepathy-logger.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ general/genlib/telepathy-logger.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,5 +72,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ general/graphlib/librsvg.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -66,8 +66,12 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="docbook-utils"/>,
-      <xref linkend="gobject-introspection"/> (Required if building GNOME),
       <xref linkend="gtk2"/> and
       <xref linkend="gtk-doc"/>
@@ -100,8 +104,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+    href="../../xincludes/static-libraries.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ general/sysutils/upower.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -69,8 +69,7 @@
     </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/add/accerciser.xml
===================================================================
--- gnome/add/accerciser.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/accerciser.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -78,4 +78,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/accerciser"/></para>
@@ -98,4 +103,12 @@
 
 <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/without-scrollkeeper.xml"/>
 
   </sect2>
Index: gnome/add/anjuta.xml
===================================================================
--- gnome/add/anjuta.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/anjuta.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -74,5 +74,7 @@
       <xref linkend="autogen"/>,
       <xref linkend="devhelp"/>,
-      <xref linkend="glade"/> and
+      <xref linkend="glade"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="rarian"/> and
       <xref linkend="vala"/>
     </para>
@@ -80,5 +82,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk-doc"/> and
       <xref linkend="subversion"/>
@@ -113,4 +114,7 @@
     <para><parameter>--disable-packagekit</parameter>: This parameter disables use
     of PackageKit which isn't suitable for BLFS.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/add/cheese.xml
===================================================================
--- gnome/add/cheese.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/cheese.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -65,5 +65,4 @@
       <xref linkend="gnome-desktop"/>,
       <xref linkend="gnome-video-effects"/>,
-      <xref linkend="itstool"/>,
       <xref linkend="libgee"/>,
       <xref linkend="libcanberra"/>,
@@ -71,11 +70,16 @@
       <xref linkend="mx"/>,
       <xref linkend="nautilus-sendto"/>,
-      <xref linkend="udev"/> and
-      <xref linkend="vala"/>
+      <xref linkend="udev"/>,
+      <xref linkend="vala"/> and
+      <xref linkend="yelp-xsl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> and
       <xref linkend="gtk-doc"/>
     </para>
Index: gnome/add/epiphany-extensions.xml
===================================================================
--- gnome/add/epiphany-extensions.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/epiphany-extensions.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -96,11 +96,14 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-  </sect2> -->
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+  </sect2>
 
   <sect2 role="configuration">
Index: gnome/add/file-roller.xml
===================================================================
--- gnome/add/file-roller.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/file-roller.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -125,4 +125,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/gdl.xml
===================================================================
--- gnome/add/gdl.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gdl.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -64,7 +64,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> and
       <xref linkend="gtk-doc"/>
     </para>
Index: gnome/add/gedit.xml
===================================================================
--- gnome/add/gedit.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gedit.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -64,6 +64,6 @@
       <xref linkend="gsettings-desktop-schemas"/>,
       <xref linkend="gtksourceview"/>,
-      <xref linkend="itstool"/> and
-      <xref linkend="libpeas"/>
+      <xref linkend="libpeas"/> and
+      <xref linkend="yelp-xsl"/>
     </para>
 
@@ -76,7 +76,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk-doc"/> and
       <ulink url="http://launchpad.net/libzeitgeist">libzeitgeist</ulink>
Index: gnome/add/ghex.xml
===================================================================
--- gnome/add/ghex.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/ghex.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -93,4 +93,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
Index: gnome/add/glade.xml
===================================================================
--- gnome/add/glade.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/glade.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,4 +68,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
       <xref linkend="rarian"/>
     </para>
@@ -73,5 +74,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> and
       <xref linkend="gtk-doc"/>
     </para>
@@ -102,4 +102,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/add/gnome-applets.xml
===================================================================
--- gnome/add/gnome-applets.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gnome-applets.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -126,4 +126,7 @@
     <filename class="directory">/usr/libexec</filename>.</para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
   </sect2>
 
Index: gnome/add/gnome-color-manager.xml
===================================================================
--- gnome/add/gnome-color-manager.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gnome-color-manager.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -73,4 +73,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -110,4 +115,7 @@
     <para><parameter>--disable-packagekit</parameter>: This parameter disables use
     of PackageKit which isn't suitable for BLFS.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
   </sect2>
Index: gnome/add/gnome-devel-docs.xml
===================================================================
--- gnome/add/gnome-devel-docs.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gnome-devel-docs.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -94,4 +94,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gnome-games.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -90,12 +90,12 @@
       <xref linkend="clutter-gtk"/>,
       <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="itstool"/>,
       <xref linkend="libcanberra"/>,
-      <xref linkend="librsvg"/> and
-      <xref linkend="pygobject3"/>
+      <xref linkend="librsvg"/>,
+      <xref linkend="pygobject3"/> and
+      <xref linkend="yelp-xsl"/>
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="gobject-introspection"/>
     </para>
Index: gnome/add/gnome-nettool.xml
===================================================================
--- gnome/add/gnome-nettool.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gnome-nettool.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -104,11 +104,14 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
-  </sect2> -->
+  </sect2>
 
   <sect2 role="content">
Index: gnome/add/gtkhtml.xml
===================================================================
--- gnome/add/gtkhtml.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/gtkhtml.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,6 +68,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="libsoup"/>
     </para>
Index: gnome/add/nemiver.xml
===================================================================
--- gnome/add/nemiver.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/nemiver.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -110,4 +110,7 @@
     href="../../xincludes/static-libraries.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
   </sect2>
 
Index: gnome/add/orca.xml
===================================================================
--- gnome/add/orca.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/orca.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,4 +71,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -110,15 +115,18 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>if [ ... != "/usr" ]; then ...; fi</command>: This command
+<!--    <para><command>if [ ... != "/usr" ]; then ...; fi</command>: This command
     is used to add the <application>GNOME</application> prefix
     <filename class='directory'>bin</filename> directory to the hard-coded
     <envar>PATH</envar> statement in the script if the
     <application>GNOME</application> prefix is anything other than
-    <filename class='directory'>/usr</filename>.</para> 
+    <filename class='directory'>/usr</filename>.</para> -->
 
-  </sect2> -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+  </sect2>
 
   <sect2 role="content">
Index: gnome/add/seahorse.xml
===================================================================
--- gnome/add/seahorse.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/seahorse.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -113,4 +113,7 @@
     href="../../xincludes/static-libraries.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
   </sect2>
 
Index: gnome/add/sound-juicer.xml
===================================================================
--- gnome/add/sound-juicer.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/sound-juicer.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,5 +71,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="libcanberra"/> and
-      <xref linkend="libmusicbrainz"/>
+      <xref linkend="libmusicbrainz3"/>
     </para>
 
@@ -110,14 +110,17 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/> 
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-  </sect2> -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+  </sect2>
 
   <sect2 role="configuration">
Index: gnome/add/totem.xml
===================================================================
--- gnome/add/totem.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/totem.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -141,4 +141,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/add/vinagre.xml
===================================================================
--- gnome/add/vinagre.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/add/vinagre.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -65,7 +65,7 @@
       <xref linkend="gnome-icon-theme"/>,
       <xref linkend="gtk-vnc"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libgnome-keyring"/> and
-      <xref linkend="vala"/>
+      <xref linkend="libgnome-keyring"/>,
+      <xref linkend="vala"/> and
+      <xref linkend="yelp-xsl"/>
     </para>
 
Index: gnome/core/baobab.xml
===================================================================
--- gnome/core/baobab.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/baobab.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -78,6 +78,6 @@
       <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/> and
-      <xref linkend="libgtop"/>
+      <xref linkend="libgtop"/> and
+      <xref linkend="yelp-xsl"/>
     </para>
 
Index: gnome/core/brasero.xml
===================================================================
--- gnome/core/brasero.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/brasero.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -116,4 +116,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/caribou.xml
===================================================================
--- gnome/core/caribou.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/caribou.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -73,5 +73,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
@@ -126,4 +125,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
   </sect2>
Index: gnome/core/empathy.xml
===================================================================
--- gnome/core/empathy.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/empathy.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -66,5 +66,4 @@
       <xref linkend="clutter-gst"/>,
       <xref linkend="clutter-gtk"/>,
-      <xref linkend="dbus-glib"/>,
       <xref linkend="evolution-data-server"/>,
       <xref linkend="folks"/>,
@@ -72,10 +71,11 @@
       <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="itstool"/>,
       <xref linkend="libcanberra"/>,
       <xref linkend="pulseaudio"/>,
+      <xref linkend="sound-theme-freedesktop"/>,
       <xref linkend="telepathy-farstream"/>,
-      <xref linkend="telepathy-logger"/> and
-      <xref linkend="telepathy-mission-control"/>
+      <xref linkend="telepathy-logger"/>,
+      <xref linkend="telepathy-mission-control"/> and
+      <xref linkend="yelp-xsl"/>
     </para>
 
Index: gnome/core/eog.xml
===================================================================
--- gnome/core/eog.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/eog.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,4 +71,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
       <xref linkend="rarian"/>
     </para>
@@ -77,5 +78,4 @@
     <para role="optional">
       <xref linkend="exempi"/>,
-      <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="lcms2"/>,
@@ -111,4 +111,7 @@
 <!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/epiphany.xml
===================================================================
--- gnome/core/epiphany.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/epiphany.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -74,5 +74,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="cacerts"/> and
+      <xref linkend="cacerts"/>,
+      <xref linkend="gobject-introspection"/> and
       <xref linkend="rarian"/>
     </para>
@@ -81,6 +82,5 @@
     <para role="optional">
       <xref linkend="avahi"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/> and
       <xref linkend="seed"/>
     </para>
@@ -119,4 +119,7 @@
 
     <para><option>--enable-seed</option>: Enable seed support.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/evince.xml
===================================================================
--- gnome/core/evince.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/evince.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -80,7 +80,8 @@
       <xref linkend="libgnome-keyring"/>,
       <xref linkend="libgxps"/> (required for XPS support),
-      <xref linkend="nautilus"/> (required for the Nautilus plugin) and
+      <xref linkend="nautilus"/> (required for the Nautilus plugin),
       <xref linkend="poppler"/> (required for PDF support and must be built
-      with <application>GTK+</application> support).
+      with <application>GTK+</application> support) and
+      <xref linkend="rarian"/>
     </para>
 
@@ -158,4 +159,7 @@
     Backend. Add this parameter if <application>Poppler</application> is not
     installed.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/evolution-data-server.xml
===================================================================
--- gnome/core/evolution-data-server.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/evolution-data-server.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -75,5 +75,5 @@
     </para>
 
-    <bridgehead renderas="sect4">Recommended (Required if building GNOME)</bridgehead>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="libgweather"/> and
Index: gnome/core/gcalctool.xml
===================================================================
--- gnome/core/gcalctool.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gcalctool.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -65,10 +65,5 @@
       <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gtk3"/> and
-      <xref linkend="itstool"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
+      <xref linkend="yelp-xsl"/>
     </para>
 
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gconf.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,5 +68,5 @@
     </para>
 
-    <bridgehead renderas="sect4">Recommended (Required if building GNOME)</bridgehead>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
Index: gnome/core/gcr.xml
===================================================================
--- gnome/core/gcr.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gcr.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -86,5 +86,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
@@ -108,8 +107,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gnome-keyring \
-            --with-pkcs11-modules=/usr/lib/pkcs11 \
-            --with-dbus-services=/usr/share/dbus-1/services &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/gnome-keyring &amp;&amp;
 make</userinput></screen>
 
@@ -130,16 +128,4 @@
 <!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gnome-prefix.xml">  -->
-
-    <para>
-      <parameter>--with-pkcs11-modules=/usr/lib/pkcs11</parameter>:
-      This parameter ensures that <application>p11-kit</application> modules
-      are installed in a correct location.
-    </para>
-
-    <para>
-      <parameter>--with-dbus-services=/usr/share/dbus-1/services</parameter>: 
-      This parameter ensures that <application>D-BUS</application> service
-      files are installed in a correct location.
-    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/gdm.xml
===================================================================
--- gnome/core/gdm.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gdm.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -76,4 +76,5 @@
       <xref linkend="accountsservice"/>,
       <xref linkend="dconf"/>,
+      <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="libcanberra"/>,
@@ -94,5 +95,7 @@
       <xref linkend="consolekit"/>
       (Required for Shutdown/Restart functionality),
-      <xref linkend="libxklavier"/> and
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="libxklavier"/>,
+      <xref linkend="rarian"/> and
       <xref linkend="upower"/>
     </para>
@@ -100,6 +103,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="check"/> (required to run the testsuite),
-      <xref linkend="gobject-introspection"/> and
+      <xref linkend="check"/> (required to run the testsuite) and
       <xref linkend="tcpwrappers"/>
     </para>
@@ -163,4 +165,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
   </sect2>
Index: gnome/core/gnome-bluetooth.xml
===================================================================
--- gnome/core/gnome-bluetooth.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-bluetooth.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -118,4 +118,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/gnome-control-center.xml
===================================================================
--- gnome/core/gnome-control-center.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-control-center.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -70,16 +70,16 @@
     </para>
 
+    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
+    <para role="required">
+      <xref linkend="accountsservice"/>,
+      <xref linkend="consolekit"/>,
+      <xref linkend="gnome-screensaver"/> and
+      <xref linkend="polkit-gnome"/>
+    </para>
+
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="gnome-bluetooth"/> and
       <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="accountsservice"/>,
-      <xref linkend="consolekit"/>,
-      <xref linkend="gnome-screensaver"/> and
-      <xref linkend="polkit-gnome"/>
     </para>
 
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-desktop.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,7 +72,7 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="startup-notification"/> and
-      <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="rarian"/> and
+      <xref linkend="startup-notification"/>
     </para>
 
@@ -113,4 +113,7 @@
     parameter to supply a custom name in the <quote>Distributor:</quote>
     field of the <quote>GNOME About</quote> display window.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/gnome-dictionary.xml
===================================================================
--- gnome/core/gnome-dictionary.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-dictionary.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -81,4 +81,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -115,4 +120,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-keyring.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -92,5 +92,4 @@
             --sysconfdir=/etc \
             --with-pam-dir=/lib/security \
-            --with-dbus-services=/usr/share/dbus-1/services \
             --with-root-certs=/etc/ssl/certs &amp;&amp;
 make</userinput></screen>
@@ -116,9 +115,4 @@
     specifies where the pam modules will be installed: you can omit this if you
     have not installed <application>Linux-PAM</application>.</para>
-
-    <para><parameter>--with-dbus-services=/usr/share/dbus-1/services</parameter>:
-    This parameter specifies where the <application>D-BUS</application> session
-    services directory is located: you can omit this if your GNOME_PREFIX is
-    <filename class="directory">/usr</filename>.</para>
 
     <para><parameter>--with-root-certs=/etc/ssl/certs</parameter>: This
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-menus.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -75,5 +75,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/gnome-online-accounts.xml
===================================================================
--- gnome/core/gnome-online-accounts.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-online-accounts.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -73,5 +73,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-panel.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -132,4 +132,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/gnome-screensaver.xml
===================================================================
--- gnome/core/gnome-screensaver.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-screensaver.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,6 +71,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="libgnomekbd"/>,
     </para>
Index: gnome/core/gnome-screenshot.xml
===================================================================
--- gnome/core/gnome-screenshot.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-screenshot.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -78,4 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="gtk3"/> and
       <xref linkend="libcanberra"/> (Compiled with GTK+3 support).
     </para>
Index: gnome/core/gnome-search-tool.xml
===================================================================
--- gnome/core/gnome-search-tool.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-search-tool.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -82,4 +82,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/gnome-search-tool"/>
@@ -107,4 +112,12 @@
 
 <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/without-scrollkeeper.xml"/>
+
   </sect2>
 
Index: gnome/core/gnome-settings-daemon.xml
===================================================================
--- gnome/core/gnome-settings-daemon.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-settings-daemon.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -76,9 +76,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.packagekit.org/">packagekit</ulink>
-    </para>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnome-settings-daemon"/></para>
@@ -116,8 +111,8 @@
     href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-    <para><parameter>--libexecdir=/usr/lib/gnome-settings-daemon-3.0</parameter>:
+    <para><parameter>--libexecdir=/usr/lib/gnome-settings-daemon</parameter>:
     This parameter causes the libexec files to be installed in the preferred
     location of <filename
-    class="directory">/usr/lib/gnome-settings-daemon-3.0</filename>
+    class="directory">/usr/lib/gnome-settings-daemon</filename>
     instead of <filename
     class="directory">/usr/libexec</filename>.</para>
@@ -128,9 +123,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/static-libraries.xml"/>
-
-    <para><parameter>--with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids</parameter>:
-    The <command>configure</command> script looks for
-    <filename>/usr/share/hwdata/pnp.ids</filename> and thus fails to find this required
-    file.</para>
 
   </sect2>
Index: gnome/core/gnome-system-log.xml
===================================================================
--- gnome/core/gnome-system-log.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-system-log.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -15,5 +15,4 @@
 ]>
 
-<!-- Try to keep the indentation used in this file-->
 <sect1 id="gnome-system-log" xreflabel="gnome-system-log-&gnome-system-log-version;">
   <?dbhtml filename="gnome-system-log.html"?>
@@ -82,4 +81,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/gnome-system-log"/>
Index: gnome/core/gnome-system-monitor.xml
===================================================================
--- gnome/core/gnome-system-monitor.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-system-monitor.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -102,11 +102,14 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
-  </sect2> -->
+  </sect2>
 
   <sect2 role="content">
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-terminal.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -97,14 +97,17 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-  </sect2> -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
+  </sect2>
 
   <sect2 role="content">
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-user-docs.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -65,10 +65,5 @@
     <para role="required">
       <xref linkend="gnome-doc-utils"/> and
-      <xref linkend="itstool"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
+      <xref linkend="yelp-xsl"/>
     </para>
 
Index: gnome/core/gnome-user-share.xml
===================================================================
--- gnome/core/gnome-user-share.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gnome-user-share.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -119,4 +119,7 @@
     <filename class='directory'>/usr/libexec</filename>.</para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
+
   </sect2>
 
Index: gnome/core/gtksourceview.xml
===================================================================
--- gnome/core/gtksourceview.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gtksourceview.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,6 +71,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if you are going to build
-      <xref linkend="gedit"/>)
     </para>
 
Index: gnome/core/gucharmap.xml
===================================================================
--- gnome/core/gucharmap.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/gucharmap.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,4 +72,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
       <xref linkend="rarian"/>
     </para>
@@ -77,5 +78,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> and
       <xref linkend="gtk-doc"/>
     </para>
@@ -111,4 +111,7 @@
     <para><option>--enable-introspection</option>: Use this parameter if you
     wish to enable <application>GObject introspection</application>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/core/libgnome-keyring.xml
===================================================================
--- gnome/core/libgnome-keyring.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/libgnome-keyring.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -73,5 +73,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/libgnomekbd.xml
===================================================================
--- gnome/core/libgnomekbd.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/libgnomekbd.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,5 +71,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/libgtop.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,5 +68,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/libgweather.xml
===================================================================
--- gnome/core/libgweather.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/libgweather.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,5 +72,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/libwnck.xml
===================================================================
--- gnome/core/libwnck.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/libwnck.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -67,12 +67,11 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="startup-notification"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="startup-notification"/>
+      <xref linkend="gtk-doc"/>
     </para>
 
Index: gnome/core/metacity.xml
===================================================================
--- gnome/core/metacity.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/metacity.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,4 +72,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="rarian"/> and
       <xref linkend="startup-notification"/>
     </para>
@@ -110,4 +111,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
   </sect2>
Index: gnome/core/mousetweaks.xml
===================================================================
--- gnome/core/mousetweaks.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/mousetweaks.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -96,11 +96,14 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
-  </sect2> -->
+  </sect2>
 
   <sect2 role="content">
Index: gnome/core/mutter.xml
===================================================================
--- gnome/core/mutter.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/mutter.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,4 +72,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/mutter"/></para>
@@ -100,4 +105,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
   </sect2>
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/nautilus.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,5 +68,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/network-manager-applet.xml
===================================================================
--- gnome/core/network-manager-applet.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/network-manager-applet.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -76,6 +76,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="gnome-bluetooth"/> and
       <xref linkend="mobile-broadband-provider-info"/>
Index: gnome/core/totem-pl-parser.xml
===================================================================
--- gnome/core/totem-pl-parser.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/totem-pl-parser.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,5 +72,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/vte.xml
===================================================================
--- gnome/core/vte.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/vte.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,5 +68,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/yelp.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -64,9 +64,4 @@
       <xref linkend="webkitgtk"/> and
       <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
     </para>
 
Index: gnome/core/zenity.xml
===================================================================
--- gnome/core/zenity.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ gnome/core/zenity.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,7 +68,12 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnotify"/> and
+      <xref linkend="rarian"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libnotify"/> and
       <xref linkend="webkitgtk"/>
     </para>
@@ -96,11 +101,14 @@
   </sect2>
 
-<!--  <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+    href="../../xincludes/without-scrollkeeper.xml"/>
 
-  </sect2> -->
+  </sect2>
 
   <sect2 role="content">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ introduction/welcome/changelog.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -48,4 +48,8 @@
           <para>[abenton] - Update Cairo to 1.12.2.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - Sorted out remaining GNOME dependencies.
+          GNOME 3.4 is now in the book.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,30 +71,40 @@
     <para role="required">
       <xref linkend="gstreamer"/> and
-      <xref linkend="pango"/></para>
-    
+      <xref linkend="pango"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="libogg"/>,
+      <xref linkend="libtheora"/>,
+      <xref linkend="libvorbis"/>,
+      <xref linkend="udev"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="alsa-lib"/>,
       <xref linkend="cdparanoia"/>,
-      <xref linkend="gobject-introspection"/> (required if building Gnome),
-      <xref linkend="gtk2"/> or
       <xref linkend="gtk3"/> (required to build the examples),
-      <xref linkend="libogg"/>,
-      <xref linkend="libtheora"/>,
       <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
-      <xref linkend="libvorbis"/>,
       <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-      <xref linkend="udev"/> (gudev),
-      <xref linkend="x-window-system"/>,
       <xref linkend="check"/> (required to run the unit regression tests), and
       <ulink url="http://www.valgrind.org/">Valgrind</ulink>
-         (optionally used during the unit regression tests)
+      (optionaly used during the unit regression tests)
     </para>
 
     <bridgehead renderas="sect4">Optional (Required to Rebuild the API
     Documentation)</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python2"/> (compiled against an XML parser such as
-    <xref linkend=" expat"/>).</para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="python2"/> (compiled against an XML parser such as
+      <xref linkend=" expat"/>).
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -87,10 +87,22 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cairo"/>,
+      <xref linkend="flac"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="GConf"/> and
+      <xref linkend="libsoup"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="aalib"/>,
-      <xref linkend="cairo"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="GConf"/> (Required for <xref linkend="totem"/>),
       <xref linkend="gtk3"/> (required to build the examples),
       <ulink url="http://www.jackaudio.org">JACK</ulink>,
@@ -102,14 +114,10 @@
       <xref linkend="libdv"/>,
       <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/">libiec61883</ulink>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
       <ulink url="http://downloads.us.xiph.org/releases/libshout/">libshout</ulink>,
-      <xref linkend="libsoup"/> (Required for <xref linkend="totem"/>),
       <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="speex"/>,
       <xref linkend="taglib"/>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
-      <xref linkend="x-window-system"/> and
+      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink> and
       <ulink url="http://www.wavpack.com/">WavPack</ulink>.
     </para>
Index: multimedia/libdriv/gst-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst-plugins-ugly.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ multimedia/libdriv/gst-plugins-ugly.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,33 +71,44 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gst-plugins-base"/></para>
+    <para role="required">
+      <xref linkend="gst-plugins-base"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="lame"/>,
+      <xref linkend="libdvdnav"/> and
+      <xref linkend="libdvdread"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="lame"/>,
-    <xref linkend="liba52"/>,
-    <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
-    <xref linkend="libdvdnav"/>,
-    <xref linkend="libdvdread"/>,
-    <xref linkend="libmad"/>,
-    <xref linkend="libmpeg2"/>,
-    <ulink url="http://packages.debian.org/source/sid/libsidplay">
-    libsidplay</ulink>,
-    <ulink url="http://sourceforge.net/projects/opencore-amr/">
-    OpenCore AMR</ulink>,
-    <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-    <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink> and
-    <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
+    <para role="optional">
+      <xref linkend="liba52"/>,
+      <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
+      <xref linkend="libmad"/>,
+      <xref linkend="libmpeg2"/>,
+      <ulink url="http://packages.debian.org/source/sid/libsidplay">
+      libsidplay</ulink>,
+      <ulink url="http://sourceforge.net/projects/opencore-amr/">
+      OpenCore AMR</ulink>,
+      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
+      <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink> and
+      <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
-    <para>To run the tests you need to have compiled gstreamer against libcheck,
-    and you can optionally use
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink></para>
+    <para>
+      To run the tests you need to have compiled gstreamer against libcheck,
+      and you can optionaly use
+      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+    </para>
 
     <bridgehead renderas="sect4">Optional (Required to Rebuild the API
     Documentation)</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python2"/> (compiled against an XML parser such as
-    <xref linkend=" expat"/>).</para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="python2"/> (compiled against an XML parser such as
+      <xref linkend=" expat"/>)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ multimedia/libdriv/gstreamer.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,15 +68,21 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxml2"/>, and
-    <xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="libxml2"/> and
+      <xref linkend="pkgconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gobject-introspection"/> 
-      (required if building Gnome),
+    <para role="optional">
       <xref linkend="gsl"/>,
       <xref linkend='check'/> (required to run the unit regression tests and also enables
-            <filename class='libraryfile'>libgstcheck-0.10</filename>), and
+      <filename class='libraryfile'>libgstcheck-0.10</filename>), and
       <ulink url="http://www.valgrind.org/">Valgrind</ulink>
-             (optionally used during the unit regression tests)
+      (optionaly used during the unit regression tests)
     </para>
 
@@ -85,23 +91,27 @@
     <bridgehead renderas="sect4">Optional (Required to build the API
     Documentation)</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python2"/> (compiled against an XML Parser such as
-    <xref linkend="expat"/>).  Alternatively, developers can access
-    the online API docs at <ulink
-    url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/api-index-full.html">freedesktop.org</ulink>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="python2"/> (compiled against an XML Parser such as
+      <xref linkend="expat"/>).  Alternatively, developers can access
+      the online API docs at <ulink
+      url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/api-index-full.html">
+      freedesktop.org</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional (Required to Build
     Manuals)</bridgehead>
-    <para role="optional"><xref linkend="libxslt"/>,
-    <xref linkend="texlive"/>,
-    <xref linkend="docbook-utils"/>,
-    <ulink url="http://www.xfig.org/">Transfig</ulink> (all needed
-    to build the HTML manual), plus
-    <xref linkend="gs"/>, and
-    <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>
-    to build the postscript and PDF manuals.
-    Alternatively, developers can access the online manual at <ulink
-    url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/manual/html/index.html">freedesktop.org</ulink>
+    <para role="optional">
+      <xref linkend="libxslt"/>,
+      <xref linkend="texlive"/>,
+      <xref linkend="docbook-utils"/>,
+      <ulink url="http://www.xfig.org/">Transfig</ulink> (all needed
+      to build the HTML manual), plus
+      <xref linkend="gs"/>, and
+      <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>
+      to build the postscript and PDF manuals.
+      Alternatively, developers can access the online manual at <ulink
+      url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/manual/html/index.html">
+      freedesktop.org</ulink>
     </para>
 
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ multimedia/libdriv/libcanberra.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -5,5 +5,6 @@
   %general-entities;
 
-  <!ENTITY libcanberra-download-http "http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.gz">
+  <!ENTITY libcanberra-download-http 
+           "http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.gz">
   <!ENTITY libcanberra-download-ftp  " ">
   <!ENTITY libcanberra-md5sum        "c198b4811598c4c161ff505e4531b02c">
@@ -34,5 +35,5 @@
     desktops, such as <application>GNOME</application>.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,15 +62,24 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libvorbis"/></para>
+    <para role="required">
+      <xref linkend="libvorbis"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="alsa-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gstreamer"/> and
+      <xref linkend="gtk3"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gstreamer"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="gtk3"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend='pulseaudio'/>,
-      <xref linkend="xorg7-proto"/>, and 
+      <xref linkend='pulseaudio'/> and
       <ulink url="http://tdb.samba.org/">tdb</ulink>
     </para>
@@ -87,5 +97,5 @@
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas &amp;&amp;
+            --disable-oss &amp;&amp;
 make</userinput></screen>
 
@@ -100,8 +110,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><option>--with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas</option>:
-    Omit this parameter if you are not installing
-    <application>libcanberra</application> for a GNOME installation.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -119,13 +125,15 @@
 
       <seglistitem>
-        <seg>canberra-boot and canberra-gtk-play</seg>
-        <seg>libcanberra-alsa.so, libcanberra-gstreamer.so,
-        libcanberra-gtk-module.so, libcanberra-gtk.so,
-        libcanberra-gtk3-module.so, libcanberra-gtk3.so, libcanberra-multi.so,
-        libcanberra-null.so, libcanberra-oss.so, libcanberra-pulse.so, and
-        libcanberra.so</seg>
-        <seg>/usr/{lib/{gnome-settings-daemon-3.0/gtk-modules,libcanberra-0.28},
-        share/{doc/libcanberra,gdm/autostart/LoginWindow,gnome/{autostart,
-        shutdown},gtk-doc/html/libcanberra}}</seg>
+        <seg>
+          canberra-boot and canberra-gtk-play
+        </seg>
+        <seg>
+          libcanberra-gtk.so, libcanberra-gtk3.so and
+          libcanberra.so
+        </seg>
+        <seg>
+          /usr/lib/libcanberra-0.28, /usr/share/doc/libcanberra 
+          and /usr/share/gtk-doc/html/libcanberra
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -135,14 +143,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <!--<varlistentry id="canberra-boot">
-        <term><command>canberra-boot</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="libcanberra canberra-boot">
-            <primary sortas="b-canberra-boot">canberra-boot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
 
       <varlistentry id="canberra-gtk-play">
@@ -156,50 +154,10 @@
       </varlistentry>
 
-      <varlistentry id="libcanberra-alsa">
-        <term><filename class='libraryfile'>libcanberra-alsa.so</filename></term>
-        <listitem>
-          <para>is an <application>ALSA</application> backend.</para>
-          <indexterm zone="libcanberra libcanberra-alsa">
-            <primary sortas="c-libcanberra-alsa">libcanberra-alsa.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gstreamer">
-        <term><filename class='libraryfile'>libcanberra-gstreamer.so</filename></term>
-        <listitem>
-          <para>is an <application>GStreamer</application> backend.</para>
-          <indexterm zone="libcanberra libcanberra-gstreamer">
-            <primary sortas="c-libcanberra-gstreamer">libcanberra-gstreamer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk-module">
-        <term><filename class='libraryfile'>libcanberra-gtk-module.so</filename></term>
-        <listitem>
-          <para>contains Gtk+2 module functions.</para>
-          <indexterm zone="libcanberra libcanberra-gtk-module">
-            <primary sortas="c-libcanberra-gtk-module">libcanberra-gtk-module.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libcanberra-gtk">
         <term><filename class='libraryfile'>libcanberra-gtk.so</filename></term>
         <listitem>
-          <para>contains Gtk+2 libcanberra bindings functions.</para>
+          <para>contains the libcanberra bindings for GTK+2.</para>
           <indexterm zone="libcanberra libcanberra-gtk">
             <primary sortas="c-libcanberra-gtk">libcanberra-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk3-module">
-        <term><filename class='libraryfile'>libcanberra-gtk3-module.so</filename></term>
-        <listitem>
-          <para>contains Gtk+3 module functions.</para>
-          <indexterm zone="libcanberra libcanberra-gtk3-module">
-            <primary sortas="c-libcanberra-gtk3-module">libcanberra-gtk3-module.so</primary>
           </indexterm>
         </listitem>
@@ -209,47 +167,7 @@
         <term><filename class='libraryfile'>libcanberra-gtk3.so</filename></term>
         <listitem>
-          <para>contains Gtk+3 libcanberra bindings functions.</para>
+          <para>contains the libcanberra bindings for GTK+3.</para>
           <indexterm zone="libcanberra libcanberra-gtk3">
             <primary sortas="c-libcanberra-gtk3">libcanberra-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-multi">
-        <term><filename class='libraryfile'>libcanberra-multi.so</filename></term>
-        <listitem>
-          <para>is a multi backend.</para>
-          <indexterm zone="libcanberra libcanberra-multi">
-            <primary sortas="c-libcanberra-multi">libcanberra-multi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-null">
-        <term><filename class='libraryfile'>libcanberra-null.so</filename></term>
-        <listitem>
-          <para>is a null backend.</para>
-          <indexterm zone="libcanberra libcanberra-null">
-            <primary sortas="c-libcanberra-null">libcanberra-null.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-oss">
-        <term><filename class='libraryfile'>libcanberra-oss.so</filename></term>
-        <listitem>
-          <para>is an oss backend.</para>
-          <indexterm zone="libcanberra libcanberra-oss">
-            <primary sortas="c-libcanberra-oss">libcanberra-oss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-pulse">
-        <term><filename class='libraryfile'>libcanberra-pulse.so</filename></term>
-        <listitem>
-          <para>is an <application>PulseAudio</application> backend.</para>
-          <indexterm zone="libcanberra libcanberra-pulse">
-            <primary sortas="c-libcanberra-pulse">libcanberra-pulse.so</primary>
           </indexterm>
         </listitem>
@@ -259,5 +177,5 @@
         <term><filename class='libraryfile'>libcanberra.so</filename></term>
         <listitem>
-          <para>contains general libcanberra API functions.</para>
+          <para>contains the libcanberra API functions.</para>
           <indexterm zone="libcanberra libcanberra-lib">
             <primary sortas="c-libcanberra">libcanberra.so</primary>
Index: networking/netlibs/geocode-glib.xml
===================================================================
--- networking/netlibs/geocode-glib.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ networking/netlibs/geocode-glib.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -86,5 +86,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: networking/netlibs/glib-networking.xml
===================================================================
--- networking/netlibs/glib-networking.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ networking/netlibs/glib-networking.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -67,9 +67,13 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="p11-kit"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libproxy"/> and
-      <xref linkend="p11-kit"/>
+      <xref linkend="libgcrypt"/> and
+      <xref linkend="libproxy"/>
     </para>
 
Index: networking/netlibs/libchamplain.xml
===================================================================
--- networking/netlibs/libchamplain.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ networking/netlibs/libchamplain.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -85,5 +85,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: networking/netlibs/libgdata.xml
===================================================================
--- networking/netlibs/libgdata.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ networking/netlibs/libgdata.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -64,5 +64,5 @@
     <para role="required">
       <xref linkend="liboauth"/> and
-      <xref linkend="libsoup"/> (built with GNOME support).
+      <xref linkend="libsoup"/> (built with GNOME support libraries).
     </para>
 
@@ -70,5 +70,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: networking/netlibs/librest.xml
===================================================================
--- networking/netlibs/librest.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ networking/netlibs/librest.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -69,5 +69,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ networking/netutils/networkmanager.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -95,5 +95,4 @@
       <xref linkend="dhcp-client"/> and
       <xref linkend="gobject-introspection"/>
-      (Required if building Gnome Shell).
     </para>
 
Index: postlfs/security/accountsservice.xml
===================================================================
--- postlfs/security/accountsservice.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ postlfs/security/accountsservice.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -62,10 +62,18 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/> and
-    <xref linkend="polkit"/></para>
+    <para role="required">
+      <xref linkend="dbus-glib"/> and
+      <xref linkend="polkit"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gobject-introspection"/> and
-    <xref linkend="xmlto"/></para>
+    <para role="optional">
+      <xref linkend="xmlto"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ postlfs/security/consolekit.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -10,5 +10,5 @@
   <!ENTITY consolekit-size          "416 KB">
   <!ENTITY consolekit-buildsize     "8.1 MB">
-  <!ENTITY consolekit-time          "0.1 SBU">
+  <!ENTITY consolekit-time          "0.3 SBU">
 ]>
 
@@ -62,10 +62,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-lib"/> and
-    <xref linkend="dbus-glib"/></para>
+    <para role="required">
+      <xref linkend="dbus-glib"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="linux-pam"/>
-    and <xref linkend="polkit"/></para>
+    <para role="recommended">
+      <xref linkend="linux-pam"/> and 
+      <xref linkend="polkit"/>
+    </para>
 
     <warning>
@@ -77,5 +81,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="xmlto"/></para>
+    <para role="optional">
+      <xref linkend="xmlto"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -91,6 +97,6 @@
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/ConsoleKit --localstatedir=/var \
-    --enable-pam-module &amp;&amp;
+            --localstatedir=/var --libexecdir=/usr/lib/ConsoleKit \
+            --enable-pam-module &amp;&amp;
 make</userinput></screen>
 
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ postlfs/security/polkit.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -62,16 +62,21 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="expat"/>, 
-    <xref linkend="intltool"/> and
-    <xref linkend="pkgconfig"/></para>
+      <xref linkend="intltool"/> and
+      <xref linkend="pkgconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="DocBook"/>, 
-    <xref linkend="docbook-xsl"/>, 
-    <xref linkend="gobject-introspection"/>, 
-    <xref linkend="gtk-doc"/>, 
-    <xref linkend="libxslt"/> and 
-    <xref linkend="linux-pam"/></para>
+      <xref linkend="DocBook"/>, 
+      <xref linkend="docbook-xsl"/>, 
+      <xref linkend="gtk-doc"/>, 
+      <xref linkend="libxslt"/> and 
+      <xref linkend="linux-pam"/>
+    </para>
 
     <note>
@@ -87,22 +92,10 @@
   <sect2 role="installation">
     <title>Installation of polkit</title>
-<!--
-    <para>It is a requirement to have a dedicated user and group for
-    <application>polkit</application> to function correctly. Issue the
-    following commands as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>groupadd -fg 27 polkituser &amp;&amp;
-useradd -c "Policy Kit Daemon User" -d /dev/null -u 27 \
-    -g polkituser -s /bin/false polkituser || [ $? == 9 ]</userinput></screen>
--->
 
     <para>Install <application>polkit</application> by running the following
     commands as an unprivileged user:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/polkit-1 \
-            --localstatedir=/var \
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+            --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
             --with-authfw=shadow &amp;&amp;
 make</userinput></screen>
Index: postlfs/virtualization/libosinfo.xml
===================================================================
--- postlfs/virtualization/libosinfo.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ postlfs/virtualization/libosinfo.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -80,10 +80,14 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="check"/> (required for the test suite),
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="vala"/>
+      <xref linkend="check"/> (required for the test suite) and
+      <xref linkend="gtk-doc"/>
     </para>
 
Index: postlfs/virtualization/libvirt-glib.xml
===================================================================
--- postlfs/virtualization/libvirt-glib.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ postlfs/virtualization/libvirt-glib.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -81,9 +81,14 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
+    </para>
+
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="vala"/>
+      <xref linkend="gtk-doc"/>
     </para>
 
Index: postlfs/virtualization/spice-gtk.xml
===================================================================
--- postlfs/virtualization/spice-gtk.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ postlfs/virtualization/spice-gtk.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -13,5 +13,4 @@
 ]>
 
-<!-- Try to keep the indentation used in this file-->
 <sect1 id="spice-gtk" xreflabel="spice-gtk-&spice-gtk-version;">
   <?dbhtml filename="spice-gtk.html"?>
Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/atk.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -66,7 +66,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> (required if building Gnome) and
       <xref linkend="gtk-doc"/>
     </para>
Index: x/lib/clutter-gst.xml
===================================================================
--- x/lib/clutter-gst.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/clutter-gst.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,7 +68,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> and
       <xref linkend="gtk-doc"/>
     </para>
Index: x/lib/clutter-gtk.xml
===================================================================
--- x/lib/clutter-gtk.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/clutter-gtk.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -68,7 +68,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> and
       <xref linkend="gtk-doc"/>
     </para>
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/clutter.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -87,5 +87,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: x/lib/cogl.xml
===================================================================
--- x/lib/cogl.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/cogl.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -71,5 +71,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: x/lib/gdk-pixbuf.xml
===================================================================
--- x/lib/gdk-pixbuf.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/gdk-pixbuf.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,7 +72,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> (required if building Gnome),
       <xref linkend="jasper"/> and 
       <xref linkend="gtk-doc"/>
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/gtk+3.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -83,10 +83,14 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="colord"/>,
       <xref linkend="cups"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gobject-introspection"/> (required if building Gnome) and
+      <xref linkend="docbook-utils"/> and
       <xref linkend="gtk-doc"/>.
     </para>
Index: x/lib/gtk-vnc.xml
===================================================================
--- x/lib/gtk-vnc.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/gtk-vnc.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,5 +72,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: x/lib/libnotify.xml
===================================================================
--- x/lib/libnotify.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/libnotify.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -67,7 +67,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> (Required if building GNOME) and
       <xref linkend="gtk-doc"/>
     </para>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/libxklavier.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,5 +72,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: x/lib/mx.xml
===================================================================
--- x/lib/mx.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/mx.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -72,5 +72,4 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
-      (Required if building GNOME)
     </para>
 
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/pango.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -70,7 +70,11 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> (required if building Gnome),
       <xref linkend="gtk-doc"/> and
       <ulink url="http://linux.thai.net/libthai">LibThai</ulink>
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ x/lib/webkitgtk.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -78,6 +78,4 @@
     <para role="required">
       <xref linkend="gperf"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
       <xref linkend="icu"/>,
       <xref linkend="libxslt"/>,
@@ -91,10 +89,13 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="curl"/>,
       <xref linkend="enchant"/>,
-      <xref linkend="gobject-introspection"/> (required if building
-      <application>epiphany</application>),
       <xref linkend="gtk-doc"/> and
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>.
Index: xincludes/static-libraries.xml
===================================================================
--- xincludes/static-libraries.xml	(revision 4db1ba6ec72b5174fc2521f926818f869e2c930e)
+++ xincludes/static-libraries.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -2,4 +2,7 @@
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+<!-- $LastChangedBy$
+     $Date$ -->
 
     <para>
Index: xincludes/without-scrollkeeper.xml
===================================================================
--- xincludes/without-scrollkeeper.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
+++ xincludes/without-scrollkeeper.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+<!-- $LastChangedBy$
+     $Date$ -->
+
+    <para>
+      <option>--disable-scrollkeeper</option>: Use this parameter if you
+      have installed <application>Rarian</application> but wish to disable the
+      updates to the Scrollkeeper database.
+   </para>
