Index: general/genlib/exempi.xml
===================================================================
--- general/genlib/exempi.xml	(revision 55ff8f4b25dbbe08b039f0a81b95e7bf4a00a1db)
+++ general/genlib/exempi.xml	(revision 4e143323b05d3bd0658f52586da00d356473a362)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY exempi-download-http "http://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.gz">
+  <!ENTITY exempi-download-http "http://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.bz2">
   <!ENTITY exempi-download-ftp  " ">
-  <!ENTITY exempi-md5sum        "62ecb5a01387b9f940a5429b3df67e65">
+  <!ENTITY exempi-md5sum        "f46d96975613593ee17aaf48cd350228">
   <!ENTITY exempi-size          "3.3 MB">
-  <!ENTITY exempi-buildsize     "184 MB">
+  <!ENTITY exempi-buildsize     "140 MB">
   <!ENTITY exempi-time          "1.0 SBU">
 ]>
 
-<sect1 id="exempi" xreflabel="exempi-&exempi-version;">
+<sect1 id="exempi" xreflabel="Exempi-&exempi-version;">
   <?dbhtml filename="exempi.html"?>
 
@@ -21,17 +21,17 @@
   </sect1info>
 
-  <title>exempi-&exempi-version;</title>
+  <title>Exempi-&exempi-version;</title>
 
   <indexterm zone="exempi">
-    <primary sortas="a-exempi">exempi</primary>
+    <primary sortas="a-Exempi">Exempi</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to exempi</title>
+    <title>Introduction to Exempi</title>
 
     <para><application>Exempi</application> is an implementation of XMP (Adobe's
     Extensible Metadata Platform).</para>
 
-    &lfs70_built;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,8 +57,10 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">exempi Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Exempi Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="boost"/></para>
+    <para role="required">
+      <xref linkend="boost"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -68,10 +70,10 @@
 
   <sect2 role="installation">
-    <title>Installation of exempi</title>
+    <title>Installation of Exempi</title>
 
-    <para>Install <application>exempi</application> by running the following
+    <para>Install <application>Exempi</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -87,6 +89,6 @@
     <title>Command Explanations</title>
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -96,12 +98,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libexempi.{so,a}</seg>
-        <seg>/usr/include/exempi-2.0/exempi</seg>
+        <seg>exempi</seg>
+        <seg>libexempi.so</seg>
+        <seg>/usr/include/exempi-2.0</seg>
       </seglistitem>
     </segmentedlist>
@@ -113,9 +115,9 @@
 
       <varlistentry id="libexempi">
-        <term><filename class='libraryfile'>libexempi.{so,a}</filename></term>
+        <term><filename class="libraryfile">libexempi.so</filename></term>
         <listitem>
-          <para>is a library to parse XMP metadata.</para>
+          <para>is a library used to parse XMP metadata.</para>
           <indexterm zone="exempi libexempi">
-            <primary sortas="c-libexempi">libexempi.{so,a}</primary>
+            <primary sortas="c-libexempi">libexempi.so</primary>
           </indexterm>
         </listitem>
Index: general/genlib/libatomic_ops.xml
===================================================================
--- general/genlib/libatomic_ops.xml	(revision 55ff8f4b25dbbe08b039f0a81b95e7bf4a00a1db)
+++ general/genlib/libatomic_ops.xml	(revision 4e143323b05d3bd0658f52586da00d356473a362)
@@ -8,7 +8,7 @@
     "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-&libatomic_ops-version;.tar.gz">
   <!ENTITY libatomic_ops-download-ftp  " ">
-  <!ENTITY libatomic_ops-md5sum        "890acdc83a7cd10e2e9536062d3741c8">
+  <!ENTITY libatomic_ops-md5sum        "e6997db4875909e11b514cd5c3caa3cf">
   <!ENTITY libatomic_ops-size          "228 KB">
-  <!ENTITY libatomic_ops-buildsize     "4.5 MB">
+  <!ENTITY libatomic_ops-buildsize     "5.0 MB">
   <!ENTITY libatomic_ops-time          "0.1 SBU">
 ]>
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,10 +82,13 @@
 sed -i 's#pkgdata#doc#' doc/Makefile.am &amp;&amp;
 autoreconf -i &amp;&amp;
-./configure --prefix=/usr --disable-static \
-  --docdir=/usr/share/doc/libatomic_ops-&libatomic_ops-version; &amp;&amp;
+./configure --prefix=/usr \
+            --docdir=/usr/share/doc/libatomic_ops-&libatomic_ops-version; \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>The checks for this package will fail until after
-    installation.</para>
+    <para>
+      To check the results, issue 
+      <command>LD_LIBRARY_PATH=../src/.libs make check</command>.
+    </para>
 
     <para>
@@ -94,6 +97,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-    
-    <para>To check the results, issue <command>make check</command>.</para>
   
   </sect2>
@@ -116,8 +117,4 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <para>
-      <option>--docdir=/usr/share/doc/libatomic_ops-&libatomic_ops-version;</option>:
-      This option installs the documentation in a versioned directory.
-    </para>
   </sect2>
 
@@ -131,8 +128,9 @@
       <seglistitem>
         <seg>
-          libatomic_ops.so and
-          libatomic_ops_gpl.so
+          libatomic_ops.so and libatomic_ops_gpl.so
         </seg>
-        <seg>/usr/include/libatomic_ops</seg>
+        <seg>
+          /usr/include/libatomic_ops
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -144,7 +142,7 @@
 
       <varlistentry id="libatomic_ops-lib">
-        <term><filename class='libraryfile'>libatomic_ops{,_gpl}.so</filename></term>
+        <term><filename class='libraryfile'>libatomic_ops.so</filename></term>
         <listitem>
-          <para>contain functions for atomic memory operations.</para>
+          <para>contains functions for atomic memory operations.</para>
           <indexterm zone="libatomic_ops libatomic_ops-lib">
             <primary sortas="c-libatomic_ops">libatomic_ops.so</primary>
@@ -152,5 +150,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 55ff8f4b25dbbe08b039f0a81b95e7bf4a00a1db)
+++ general/genlib/libical.xml	(revision 4e143323b05d3bd0658f52586da00d356473a362)
@@ -33,5 +33,5 @@
     iCalendar protocols and data formats.</para>
 
-    &lfs70_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/gc.xml
===================================================================
--- general/prog/gc.xml	(revision 55ff8f4b25dbbe08b039f0a81b95e7bf4a00a1db)
+++ general/prog/gc.xml	(revision 4e143323b05d3bd0658f52586da00d356473a362)
@@ -6,10 +6,10 @@
 
   <!ENTITY gc-download-http
-    "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-&gc-version;.tar.gz">
+           "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-&gc-version;.tar.gz">
   <!ENTITY gc-download-ftp  " ">
-  <!ENTITY gc-md5sum        "edd99c64174a1f3b10a474b3e4c74634">
-  <!ENTITY gc-size          "1.2 MB">
-  <!ENTITY gc-buildsize     "12 MB">
-  <!ENTITY gc-time          "0.3 SBU">
+  <!ENTITY gc-md5sum        "91340b28c61753a789eb6077675d87d2">
+  <!ENTITY gc-size          "1.3 MB">
+  <!ENTITY gc-buildsize     "13 MB">
+  <!ENTITY gc-time          "0.2 SBU">
 ]>
 
@@ -116,11 +116,12 @@
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <parameter>--enable-cplusplus</parameter>: This parameter enables the
       building and installing the C++ library along with the standard C library.
     </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -134,6 +135,5 @@
       <seglistitem>
         <seg>
-          libcord.so,
-          libgc.so and
+          libcord.so, libgc.so and
           libgccpp.so
         </seg>
@@ -174,5 +174,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: general/sysutils/obexd.xml
===================================================================
--- general/sysutils/obexd.xml	(revision 55ff8f4b25dbbe08b039f0a81b95e7bf4a00a1db)
+++ general/sysutils/obexd.xml	(revision 4e143323b05d3bd0658f52586da00d356473a362)
@@ -7,7 +7,7 @@
   <!ENTITY obexd-download-http "http://www.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
   <!ENTITY obexd-download-ftp  "ftp://ftp.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
-  <!ENTITY obexd-md5sum        "df277cc02770b5ba388c5bbc7bbd6034">
-  <!ENTITY obexd-size          "336 KB">
-  <!ENTITY obexd-buildsize     "5.0 MB">
+  <!ENTITY obexd-md5sum        "8f5810e39403b0825abbce3527eea077">
+  <!ENTITY obexd-size          "340 KB">
+  <!ENTITY obexd-buildsize     "5.5 MB">
   <!ENTITY obexd-time          "0.2 SBU">
 ]>
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
