Index: gnome/add/gtkhtml.xml
===================================================================
--- gnome/add/gtkhtml.xml	(revision 742b99e018bd3e1ed5288078d2aa62bfab084741)
+++ gnome/add/gtkhtml.xml	(revision c20c54a9f5d85d6cbb5980038557370362e6779b)
@@ -5,7 +5,7 @@
   %general-entities;
 
-<!ENTITY gtkhtml-download-http "&gnome-download-http;/gtkhtml/4.2/gtkhtml-&gtkhtml-version;.tar.xz">
-<!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/4.2/gtkhtml-&gtkhtml-version;.tar.xz">
-<!ENTITY gtkhtml-md5sum        "9296c0c1863ae34409ab6c403f4f3783">
+<!ENTITY gtkhtml-download-http "&gnome-download-http;/gtkhtml/4.4/gtkhtml-&gtkhtml-version;.tar.xz">
+<!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/4.4/gtkhtml-&gtkhtml-version;.tar.xz">
+<!ENTITY gtkhtml-md5sum        "40758b7c279e1e4ac02484ff30436939">
 <!ENTITY gtkhtml-size          "1.1 MB">
 <!ENTITY gtkhtml-buildsize     "41 MB">
@@ -33,12 +33,5 @@
     lightweight HTML rendering/printing/editing engine.</para>
 
-    &lfs70_built;
-
-    <!-- Gnome-Sharp can use this package, and Beagle can use these
-         extensions, so I suppose this package is no longer
-         "Evolution specific"
-    This is an
-    <application>Evolution</application> specific application at
-    this time.</para> -->
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67,13 +60,16 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="enchant"/>,
-    <xref linkend="gnome-icon-theme"/>,
-    <xref linkend="gsettings-desktop-schemas"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="iso-codes"/></para>
+    <para role="required">
+      <xref linkend="enchant"/>,
+      <xref linkend="gnome-icon-theme"/>,
+      <xref linkend="gsettings-desktop-schemas"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="iso-codes"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libsoup"/>,
-    <xref linkend="xorg7"/></para>
+    <para role="optional">
+      <xref linkend="libsoup"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -88,5 +84,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -99,5 +95,5 @@
   </sect2>
 
-  <sect2 role="commands">
+<!--  <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -105,5 +101,5 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
@@ -111,13 +107,18 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gtkhtml-editor-test</seg>
-        <seg>libgtkhtml-4.0.so and libgtkhtml-editor-4.0.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libgtkhtml-4.0/{editor,
-        gtkhtml},share/gtkhtml-4.0/icons}</seg>
+        <seg>
+          gtkhtml-editor-test
+        </seg>
+        <seg>
+          libgtkhtml-4.0.so and libgtkhtml-editor-4.0.so
+        </seg>
+        <seg>
+          /usr/include/libgtkhtml-4.0 and /usr/share/gtkhtml-4.0
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/add/gtksourceview.xml
===================================================================
--- gnome/add/gtksourceview.xml	(revision 742b99e018bd3e1ed5288078d2aa62bfab084741)
+++ gnome/add/gtksourceview.xml	(revision c20c54a9f5d85d6cbb5980038557370362e6779b)
@@ -5,7 +5,9 @@
   %general-entities;
 
-  <!ENTITY gtksourceview-download-http "&gnome-download-http;/gtksourceview/3.2/gtksourceview-&gtksourceview-version;.tar.xz">
-  <!ENTITY gtksourceview-download-ftp  "&gnome-download-ftp;/gtksourceview/3.2/gtksourceview-&gtksourceview-version;.tar.xz">
-  <!ENTITY gtksourceview-md5sum        "ebef871b40f145c5d09a5c94b6e5ec03">
+  <!ENTITY gtksourceview-download-http 
+           "&gnome-download-http;/gtksourceview/3.4/gtksourceview-&gtksourceview-version;.tar.xz">
+  <!ENTITY gtksourceview-download-ftp  
+           "&gnome-download-ftp;/gtksourceview/3.4/gtksourceview-&gtksourceview-version;.tar.xz">
+  <!ENTITY gtksourceview-md5sum        "637a8a5b909cfd7e77ca0e414a225e24">
   <!ENTITY gtksourceview-size          "1.2 MB">
   <!ENTITY gtksourceview-buildsize     "33 MB">
@@ -31,9 +33,8 @@
 
     <para>The <application>gtksourceview</application> package contains
-    <filename>libgtksourceview</filename> libraries. This is useful for
-    extending the <application>GTK</application> text functions to include
-    syntax highlighting.</para>
+    libraries used for extending the <application>GTK</application> 
+    text functions to include syntax highlighting.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -62,10 +63,20 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="perl-xml-parser"/></para>
+    <para role="required">
+      <xref linkend="gtk3"/> and
+      <xref linkend="intltool"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if you are going to build
+      <xref linkend="gedit"/>)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -80,5 +91,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -89,5 +100,5 @@
     source tree and issue <command>./test-widget</command>. This will test the
     functionality of the
-    <filename class='libraryfile'>libgtksourceview-2.0</filename> library.</para>
+    <filename class='libraryfile'>libgtksourceview-3.0</filename> library.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -100,6 +111,6 @@
     <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"/> -->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -112,14 +123,16 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libgtksourceview-2.0.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gtksourceview-2.0/gtksourceview/completion-providers/words,
-        share/{gtk-doc/html/gtksourceview-2.0,gtksourceview-2.0/{language-specs,
-        styles}}}</seg>
+        <seg>
+          libgtksourceview-3.0.so
+        </seg>
+        <seg>
+          /usr/include/gtksourceview-3.0,
+          /usr/share/gtksourceview-3.0 and
+          /usr/share/gtk-doc/html/gtksourceview-3.0
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -130,10 +143,10 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libgtksourceview-2.0">
-        <term><filename class='libraryfile'>libgtksourceview-2.0.so</filename></term>
+      <varlistentry id="libgtksourceview-3">
+        <term><filename class='libraryfile'>libgtksourceview-3.0.so</filename></term>
         <listitem>
           <para>contains function extensions for the GtkTextView widget.</para>
-          <indexterm zone="gtksourceview libgtksourceview-2.0">
-            <primary sortas="c-libgtksourceview-2.0">libgtksourceview-2.0.so</primary>
+          <indexterm zone="gtksourceview libgtksourceview-3">
+            <primary sortas="c-libgtksourceview-3">libgtksourceview-3.0.so</primary>
           </indexterm>
         </listitem>
Index: gnome/core/libgnome-keyring.xml
===================================================================
--- gnome/core/libgnome-keyring.xml	(revision 742b99e018bd3e1ed5288078d2aa62bfab084741)
+++ gnome/core/libgnome-keyring.xml	(revision c20c54a9f5d85d6cbb5980038557370362e6779b)
@@ -5,9 +5,11 @@
   %general-entities;
 
-  <!ENTITY libgnome-keyring-download-http "&gnome-download-http;/libgnome-keyring/&gnome-version;/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
-  <!ENTITY libgnome-keyring-download-ftp  "&gnome-download-ftp;/libgnome-keyring/&gnome-version;/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
-  <!ENTITY libgnome-keyring-md5sum        "51b822605b45c8ea0f6df68fdc3ee611">
-  <!ENTITY libgnome-keyring-size          "351 KB">
-  <!ENTITY libgnome-keyring-buildsize     "8.6 MB">
+  <!ENTITY libgnome-keyring-download-http 
+           "&gnome-download-http;/libgnome-keyring/3.4/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
+  <!ENTITY libgnome-keyring-download-ftp  
+           "&gnome-download-ftp;/libgnome-keyring/3.4/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
+  <!ENTITY libgnome-keyring-md5sum        "b7c5abd89fd92344b15e7adf3079a54a">
+  <!ENTITY libgnome-keyring-size          "408 KB">
+  <!ENTITY libgnome-keyring-buildsize     "15 MB">
   <!ENTITY libgnome-keyring-time          "0.5 SBU">
 ]>
@@ -34,5 +36,5 @@
     is used by applications to integrate with the gnome keyring system.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,12 +63,22 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="libgcrypt"/>, and
-    <xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="dbus"/>,
+      <xref linkend="intltool"/>,
+      <xref linkend="libgcrypt"/> and
+      <xref linkend="pkgconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <ulink url="http://www.valgrind.org">Valgrind</ulink></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <ulink url="http://www.valgrind.org">Valgrind</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -81,5 +93,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -95,6 +107,6 @@
     <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"/> -->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -107,13 +119,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libgnome-keyring.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-keyring-1,
-        share/{gtk-doc/html/gnome-keyring,locale/fy/LC_MESSAGES}}</seg>
+        <seg>
+          libgnome-keyring.so
+        </seg>
+        <seg>
+          /usr/include/gnome-keyring-1 and
+          /usr/share/gtk-doc/html/gnome-keyring
+        </seg>
       </seglistitem>
     </segmentedlist>
