Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/genlib.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -97,7 +97,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-farstream.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-farstream.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/glib2.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.32/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/2.32/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-md5sum        "bf84fefd9c1a5b5a7a38736f4ddd674a">
-  <!ENTITY glib2-size          "5.9 MB">
-  <!ENTITY glib2-buildsize     "180 MB">
-  <!ENTITY glib2-time          "1.5 SBU (additional 4.0 SBU to run the test suite)">
+  <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.34/glib-&glib2-version;.tar.xz">
+  <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/2.34/glib-&glib2-version;.tar.xz">
+  <!ENTITY glib2-md5sum        "d80aef668f981b5dcf157633d13081c0">
+  <!ENTITY glib2-size          "6.1 MB">
+  <!ENTITY glib2-buildsize     "195 MB">
+  <!ENTITY glib2-time          "1.6 SBU (additional 5.0 SBU to run the test suite)">
 ]>
 
@@ -84,5 +84,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="pcre"/> (built with unicode properties)
+      <xref linkend="pcre"/> (built with Unicode properties)
     </para>
 
@@ -90,15 +90,6 @@
     <para role="optional">
       <xref linkend="attr"/>,
-      <xref linkend="dbus"/> (required to run the tests),
-      <xref linkend="gamin"/> and
+      <xref linkend="dbus"/> (required to run the tests) and
       <xref linkend="gtk-doc"/>
-    </para>
-
-    <para>
-      <application>Gamin</application> requires 
-      <application>GLib</application> in order to compile; therefore, 
-      you must first install <application>GLib</application>, 
-      then compile <application>Gamin</application>, and recompile
-      <application>GLib</application> against it.
     </para>
 
@@ -127,7 +118,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-pcre=system &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --with-pcre=system &amp;&amp;
 make</userinput></screen>
 
@@ -162,5 +151,5 @@
 
     <para>
-      <parameter>--with-pcre=system</parameter>: This parameter causes the
+      <parameter>--with-pcre=system</parameter>: This switch causes the
       build to use a system-provided version of the
       <application>PCRE</application> library instead of an internal
@@ -191,11 +180,16 @@
         <seg>
           libgio-2.0.so, libglib-2.0.so, libgmodule-2.0.so,
-          libgobject-2.0.so, libgthread-2.0.so and libgiofam.so
+          libgobject-2.0.so and libgthread-2.0.so
         </seg>
         <seg>
-          /usr/include/{gio-unix-2.0,glib-2.0},
-          /usr/lib/{gdbus-2.0,gio,glib-2.0},
-          /usr/share/glib-2.0 and
-          /usr/share/gtk-doc/html/{gio,glib,gobject}
+          /usr/include/gio-unix-2.0,
+          /usr/include/glib-2.0,
+          /usr/lib/gdbus-2.0,
+          /usr/lib/gio,
+          /usr/lib/glib-2.0,
+          /usr/share/glib-2.0,
+          /usr/share/gtk-doc/html/gio,
+          /usr/share/gtk-doc/html/glib and
+          /usr/share/gtk-doc/html/gobject
         </seg>
       </seglistitem>
@@ -211,5 +205,6 @@
         <listitem>
           <para>
-            is a simple used tool for working with D-Bus objects.
+            is a simple tool used for working with
+            <application>D-Bus</application> objects.
           </para>
           <indexterm zone="glib2 gdbus">
@@ -237,6 +232,6 @@
           <para>
             is used to create a giomodule.cache file in the listed directories. 
-            This file lists the implemented extension points for each module that has
-            been found.
+            This file lists the implemented extension points for each module
+            that has been found.
           </para>
           <indexterm zone="glib2 gio-querymodules">
Index: general/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/glibmm.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY glibmm-download-http "&gnome-download-http;/glibmm/2.32/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  "&gnome-download-ftp;/glibmm/2.32/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-md5sum        "8e5dd06610bd205f4c9cbc11453c0010">
-  <!ENTITY glibmm-size          "5.0 MB">
-  <!ENTITY glibmm-buildsize     "130 MB">
-  <!ENTITY glibmm-time          "1.2 SBU">
+  <!ENTITY glibmm-download-http "&gnome-download-http;/glibmm/2.33/glibmm-&glibmm-version;.tar.xz">
+  <!ENTITY glibmm-download-ftp  "&gnome-download-ftp;/glibmm/2.33/glibmm-&glibmm-version;.tar.xz">
+  <!ENTITY glibmm-md5sum        "9ea635a53d8af6abb9a5be6b29458f1d">
+  <!ENTITY glibmm-size          "5.5 MB">
+  <!ENTITY glibmm-buildsize     "135 MB">
+  <!ENTITY glibmm-time          "1.4 SBU">
 ]>
 
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs70_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -120,6 +120,8 @@
         </seg>
         <seg>
-          /usr/include/{giomm-2.4,glibmm-2.4},
-          /usr/lib/{giomm-2.4,glibmm-2.4},
+          /usr/include/giomm-2.4,
+          /usr/include/glibmm-2.4,
+          /usr/lib/giomm-2.4,
+          /usr/lib/glibmm-2.4,
           /usr/share/devhelp/books/glibmm-2.4 and
           /usr/share/doc/glibmm-2.4
@@ -133,24 +135,24 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libgiomm-2.4">
-        <term><filename class='libraryfile'>libgiomm-2.4.so</filename></term>
+      <varlistentry id="libgiomm-2">
+        <term><filename class="libraryfile">libgiomm-2.4.so</filename></term>
         <listitem>
           <para>
             contains the Gio API classes.
           </para>
-          <indexterm zone="glibmm libgiomm-2.4">
-            <primary sortas="c-libgiomm-2.4">libgiomm-2.4.so</primary>
+          <indexterm zone="glibmm libgiomm-2">
+            <primary sortas="c-libgiomm-2">libgiomm-2.4.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libglibmm-2.4">
-        <term><filename class='libraryfile'>libglibmm-2.4.so</filename></term>
+      <varlistentry id="libglibmm-2">
+        <term><filename class="libraryfile">libglibmm-2.4.so</filename></term>
         <listitem>
           <para>
             contains the <application>GLib</application> API classes.
           </para>
-          <indexterm zone="glibmm libglibmm-2.4">
-            <primary sortas="c-libglibmm-2.4">libglibmm-2.4.so</primary>
+          <indexterm zone="glibmm libglibmm-2">
+            <primary sortas="c-libglibmm-2">libglibmm-2.4.so</primary>
           </indexterm>
         </listitem>
Index: general/genlib/gobject-introspection.xml
===================================================================
--- general/genlib/gobject-introspection.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/gobject-introspection.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -6,11 +6,11 @@
 
   <!ENTITY gobject-introspection-download-http 
-           "&gnome-download-http;/gobject-introspection/1.32/gobject-introspection-&gobject-introspection-version;.tar.xz">
+           "&gnome-download-http;/gobject-introspection/1.34/gobject-introspection-&gobject-introspection-version;.tar.xz">
   <!ENTITY gobject-introspection-download-ftp  
-           "&gnome-download-ftp;/gobject-introspection/1.32/gobject-introspection-&gobject-introspection-version;.tar.xz">
-  <!ENTITY gobject-introspection-md5sum        "7bbdb696c37bb98aef5af02c4b8975e3">
+           "&gnome-download-ftp;/gobject-introspection/1.34/gobject-introspection-&gobject-introspection-version;.tar.xz">
+  <!ENTITY gobject-introspection-md5sum        "0902ae3b31871ea00167720e06acaa40">
   <!ENTITY gobject-introspection-size          "1.1 MB">
   <!ENTITY gobject-introspection-buildsize     "40 MB">
-  <!ENTITY gobject-introspection-time          "0.6 SBU">
+  <!ENTITY gobject-introspection-time          "0.3 SBU">
 ]>
 
@@ -98,7 +98,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-tests \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -117,10 +115,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-tests</parameter>: This parameter disable test
-      libraries. Remove the parameter if you have <application>Cairo</application>
-      installed and would like the tests to be performed.
-    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -150,6 +142,8 @@
         <seg>
           /usr/include/gobject-introspection-1.0,
-          /usr/lib/{girepository-1.0,gobject-introspection},
-          /usr/share/{gir-1.0,gobject-introspection-1.0} and
+          /usr/lib/girepository-1.0,
+          /usr/lib/gobject-introspection,
+          /usr/share/gir-1.0,
+          /usr/share/gobject-introspection-1.0 and
           /usr/share/gtk-doc/html/gi
         </seg>
@@ -200,5 +194,5 @@
 
       <varlistentry id="libgirepository-1.0">
-        <term><filename class='libraryfile'>libgirepository-1.0.so</filename></term>
+        <term><filename class="libraryfile">libgirepository-1.0.so</filename></term>
         <listitem>
           <para>
Index: general/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/json-glib.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY json-glib-download-http "&gnome-download-http;/json-glib/0.14/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-download-ftp  "&gnome-download-ftp;/json-glib/0.14/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-md5sum        "2a22832c4654156a35b38ee027f6f065">
-  <!ENTITY json-glib-size          "435 KB">
-  <!ENTITY json-glib-buildsize     "9.8 MB">
-  <!ENTITY json-glib-time          "0.1 SBU">
+  <!ENTITY json-glib-download-http "&gnome-download-http;/json-glib/0.15/json-glib-&json-glib-version;.tar.xz">
+  <!ENTITY json-glib-download-ftp  "&gnome-download-ftp;/json-glib/0.15/json-glib-&json-glib-version;.tar.xz">
+  <!ENTITY json-glib-md5sum        "494332526f87956d05f32a9b12f3f286">
+  <!ENTITY json-glib-size          "452 KB">
+  <!ENTITY json-glib-buildsize     "11 MB">
+  <!ENTITY json-glib-time          "0.2 SBU">
 ]>
 
@@ -149,5 +149,5 @@
 
       <varlistentry id="libjson-glib-1">
-        <term><filename class='libraryfile'>libjson-glib-1.0.so</filename></term>
+        <term><filename class="libraryfile">libjson-glib-1.0.so</filename></term>
         <listitem>
           <para>
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/libgsf.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -7,8 +7,8 @@
   <!ENTITY libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
   <!ENTITY libgsf-download-ftp  "&gnome-download-ftp;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
-  <!ENTITY libgsf-md5sum        "3e71b5af1999e62495c6750e51dbbe02">
-  <!ENTITY libgsf-size          "504 KB">
-  <!ENTITY libgsf-buildsize     "13 MB">
-  <!ENTITY libgsf-time          "0.5 SBU">
+  <!ENTITY libgsf-md5sum        "2dd29e9d2bb22a6dfe55761188636c5d">
+  <!ENTITY libgsf-size          "512 KB">
+  <!ENTITY libgsf-buildsize     "14 MB">
+  <!ENTITY libgsf-time          "0.1 SBU">
 ]>
 
@@ -111,8 +111,5 @@
 
     <para>
-      Running <command>make check</command> will build a battery of test
-      programs which are built using the just-created
-      <filename class="libraryfile">libgsf-1</filename> library. All the programs
-      should build successfully with no errors displayed.
+      To test the results, issue: <command>make check</command>.
     </para>
 
Index: general/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/libsigc++.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -7,7 +7,7 @@
   <!ENTITY libsigc-download-http "&gnome-download-http;/libsigc++/2.2/libsigc++-&libsigc-version;.tar.xz">
   <!ENTITY libsigc-download-ftp  "&gnome-download-ftp;/libsigc++/2.2/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-md5sum        "73419b477f3bb9ddb9905c88a92f4b4c">
-  <!ENTITY libsigc-size          "2.8 MB">
-  <!ENTITY libsigc-buildsize     "32 MB">
+  <!ENTITY libsigc-md5sum        "815d0c6d61601f51bbcaeef6826606b0">
+  <!ENTITY libsigc-size          "3.2 MB">
+  <!ENTITY libsigc-buildsize     "36 MB">
   <!ENTITY libsigc-time          "less than 0.1 SBU">
 ]>
Index: general/genlib/telepathy-farstream.xml
===================================================================
--- general/genlib/telepathy-farstream.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/telepathy-farstream.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -8,7 +8,7 @@
            "http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-&telepathy-farstream-version;.tar.gz">
   <!ENTITY telepathy-farstream-download-ftp  " ">
-  <!ENTITY telepathy-farstream-md5sum        "52d110f8a9f27bce0a6c2c07e18aee56">
-  <!ENTITY telepathy-farstream-size          "644 KB">
-  <!ENTITY telepathy-farstream-buildsize     "7.0 MB">
+  <!ENTITY telepathy-farstream-md5sum        "d154350f9f1e3bdba87617c0668481a5">
+  <!ENTITY telepathy-farstream-size          "584 KB">
+  <!ENTITY telepathy-farstream-buildsize     "6.0 MB">
   <!ENTITY telepathy-farstream-time          "0.1 SBU">
 ]>
@@ -84,8 +84,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://gstreamer.freedesktop.org/src/gst-python/">
-      GStreamer Python Bindings</ulink>,
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="pygobject3"/>
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -103,7 +100,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-python \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -122,11 +117,4 @@
     <title>Command Explanations</title>
 
-    <para>
-      <option>--disable-python</option>: This switch disables
-      building of the <application>Python</application> bindings.
-      Remove if you have optional <application>Python</application>
-      bindings installed.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -141,10 +129,10 @@
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          libtelepathy-farstream.so and tpfarstream.so (Python Module)
+          libtelepathy-farstream.so
         </seg>
         <seg>
@@ -164,5 +152,5 @@
         <listitem>
           <para>
-            contains the <application>Telepathy Farstream</application> API functions.
+            contains <application>Telepathy Farstream</application> API functions.
           </para>
           <indexterm zone="telepathy-farstream libtelepathy-farstream">
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/telepathy-glib.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -8,8 +8,8 @@
            "http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
   <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "034ec8e4c3a60d4ba1da67952ef3ee2f">
-  <!ENTITY telepathy-glib-size          "3.4 MB">
-  <!ENTITY telepathy-glib-buildsize     "165 MB">
-  <!ENTITY telepathy-glib-time          "2.0 SBU">
+  <!ENTITY telepathy-glib-md5sum        "fbe730cc897c2d6cbf6a165d6cc63cdd">
+  <!ENTITY telepathy-glib-size          "3.6 MB">
+  <!ENTITY telepathy-glib-buildsize     "185 MB">
+  <!ENTITY telepathy-glib-time          "1.2 SBU">
 ]>
 
@@ -32,13 +32,13 @@
 
     <para>
-      The <application>Telepathy GLib</application> package is a library for
-      GLib based <application>Telepathy</application> components. Telepathy is a
-      <application>D-Bus</application> framework for unifying real time
-      communication, including instant messaging, voice calls and video calls. It
-      abstracts differences between protocols to provide a unified interface for
-      applications.
+      The <application>Telepathy GLib</application> contains a library used by
+      <application>GLib</application> based <application>Telepathy</application>
+      components. Telepathy is a <application>D-Bus</application> framework for
+      unifying real time communication, including instant messaging, voice calls
+      and video calls. It abstracts differences between protocols to provide a
+      unified interface for applications.
     </para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,7 +80,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libxslt"/> and
-      <xref linkend="python2"/>
+      <xref linkend="dbus-glib"/> and
+      <xref linkend="libxslt"/>
     </para>
 
@@ -110,5 +109,4 @@
 
 <screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/telepathy \
             --enable-vala-bindings \
             --disable-static &amp;&amp;
@@ -131,11 +129,5 @@
 
     <para>
-      <parameter>--libexecdir=/usr/lib/telepathy</parameter>:
-      This parameter prevents creating of
-      <filename class="directory">/usr/libexec</filename> directory.
-    </para>
-
-    <para>
-      <option>--enable-vala-bindings</option>: This option enables
+      <option>--enable-vala-bindings</option>: This switch enables
       building of the Vala bindings. Remove if you don't have 
       <xref linkend="vala"/> installed.
@@ -162,6 +154,5 @@
         </seg>
         <seg>
-          /usr/include/telepathy-1.0/telepathy-glib,
-          /usr/lib/telepathy and
+          /usr/include/telepathy-1.0 and
           /usr/share/gtk-doc/html/telepathy-glib
         </seg>
@@ -175,5 +166,5 @@
 
       <varlistentry id="libtelepathy-glib">
-        <term><filename class='libraryfile'>libtelepathy-glib.so</filename></term>
+        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
         <listitem>
           <para>
Index: general/genlib/telepathy-mission-control.xml
===================================================================
--- general/genlib/telepathy-mission-control.xml	(revision 39e4c863e5115f19eac3afb8a22983a96d6aac06)
+++ general/genlib/telepathy-mission-control.xml	(revision d3e019dc9ee15f481e9391af1a5faeeeae5f5ba7)
@@ -8,8 +8,8 @@
            "http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
   <!ENTITY telepathy-mission-control-download-ftp  " ">
-  <!ENTITY telepathy-mission-control-md5sum        "79449fd2e1b02fc6cb5c6adc447e2bb6">
-  <!ENTITY telepathy-mission-control-size          "1012 KB">
-  <!ENTITY telepathy-mission-control-buildsize     "26 MB">
-  <!ENTITY telepathy-mission-control-time          "0.4 SBU">
+  <!ENTITY telepathy-mission-control-md5sum        "3af60fa448b8fd56b65fac185a41f288">
+  <!ENTITY telepathy-mission-control-size          "1.0 MB">
+  <!ENTITY telepathy-mission-control-buildsize     "23 MB">
+  <!ENTITY telepathy-mission-control-time          "0.3 SBU">
 ]>
 
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -115,5 +115,5 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      This package does not come with a testsuite.
     </para>
 
@@ -128,11 +128,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/telepathy</parameter>:
-      This parameter ensures <filename>mission-control-5</filename>
-      is installed in a location conforming with the FHS instead of
-      <filename class="directory">/usr/libexec/</filename>.
-    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -160,5 +153,6 @@
         </seg>
         <seg>
-          /usr/include/mission-control-5.5 and 
+          /usr/include/mission-control-5.5,
+          /usr/lib/telepathy and 
           /usr/share/gtk-doc/html/mission-control-plugins
         </seg>
@@ -211,5 +205,5 @@
 
       <varlistentry id="libmission-control-plugins">
-        <term><filename class='libraryfile'>libmission-control-plugins.so</filename></term>
+        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
         <listitem>
           <para>
