Index: general.ent
===================================================================
--- general.ent	(revision 23407e4ad8a9b9ff6413fdc3b41863caed23b934)
+++ general.ent	(revision c7ce750add9ce27c5cb84451607356c661561b63)
@@ -290,5 +290,5 @@
 <!ENTITY sbc-version                  "1.0">
 <!ENTITY slib-version                 "3b3">
-<!ENTITY talloc-version               "2.0.7">
+<!ENTITY talloc-version               "2.0.8">
 <!ENTITY telepathy-farstream-version  "0.6.0">
 <!ENTITY telepathy-glib-version       "0.20.1">
@@ -365,5 +365,5 @@
 <!ENTITY ibus-version                 "1.5.1">
 <!ENTITY libarchive-version           "3.0.4">
-<!ENTITY lm_sensors-version           "3.3.2">
+<!ENTITY lm_sensors-version           "3.3.3">
 <!ENTITY mc-version                   "4.8.6">
 <!ENTITY obex-data-server-version     "0.4.6">
@@ -621,5 +621,5 @@
 <!ENTITY phonon-backend-vlc-version   "0.6.0">
 <!ENTITY attica-version               "0.4.1">
-<!ENTITY akonadi-version              "1.8.1">
+<!ENTITY akonadi-version              "1.9.0">
 <!ENTITY qimageblitz-version          "0.0.6">
 <!ENTITY shared-desktop-ontologies-version "0.10.0">
@@ -843,5 +843,5 @@
 <!ENTITY libao-version                "1.1.0">
 <!ENTITY libcanberra-version          "0.30">
-<!ENTITY libdiscid-version            "0.2.2">
+<!ENTITY libdiscid-version            "0.3.0">
 <!ENTITY libdvdcss-version            "1.2.12">
 <!ENTITY libdvdread-version           "4.2.0">
Index: general/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision 23407e4ad8a9b9ff6413fdc3b41863caed23b934)
+++ general/genlib/talloc.xml	(revision c7ce750add9ce27c5cb84451607356c661561b63)
@@ -7,11 +7,11 @@
   <!ENTITY talloc-download-http "http://samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
   <!ENTITY talloc-download-ftp  "ftp://samba.org/pub/talloc/talloc-&talloc-version;.tar.gz">
-  <!ENTITY talloc-md5sum        "dbfb3146f4cc47054e13b8a2988299f9">
-  <!ENTITY talloc-size          "368 KB">
-  <!ENTITY talloc-buildsize     "5.6 MB">
+  <!ENTITY talloc-md5sum        "7857200b58a8617ca18fe2c91296cd93">
+  <!ENTITY talloc-size          "424 KB">
+  <!ENTITY talloc-buildsize     "6.5 MB">
   <!ENTITY talloc-time          "0.3 SBU">
 ]>
 
-<sect1 id="talloc" xreflabel="talloc-&talloc-version;">
+<sect1 id="talloc" xreflabel="Talloc-&talloc-version;">
   <?dbhtml filename="talloc.html"?>
 
@@ -21,17 +21,18 @@
   </sect1info>
 
-  <title>talloc-&talloc-version;</title>
+  <title>Talloc-&talloc-version;</title>
 
   <indexterm zone="talloc">
-    <primary sortas="a-talloc">talloc</primary>
+    <primary sortas="a-Talloc">Talloc</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to talloc</title>
+    <title>Introduction to Talloc</title>
 
-    <para><application>talloc</application> provides a hierarchical, reference
-    counted memory pool system with destructors. It is the core memory
-    allocator used in <application>Samba</application> and
-    <application>MesaLib</application>.</para>
+    <para>
+      <application>Talloc</application> provides a hierarchical, reference
+      counted memory pool system with destructors. It is the core memory
+      allocator used in <application>Samba</application>.
+    </para>
 
     &lfs72_checked;
@@ -40,37 +41,67 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&talloc-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&talloc-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&talloc-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&talloc-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &talloc-md5sum;</para>
+        <para>
+          Download MD5 sum: &talloc-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &talloc-size;</para>
+        <para>
+          Download size: &talloc-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &talloc-buildsize;</para>
+        <para>
+          Estimated disk space required: &talloc-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &talloc-time;</para>
+        <para>
+          Estimated build time: &talloc-time;
+        </para>
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Talloc Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/> and
+      <xref linkend="libxslt"/> (To generate man pages) and
+      <xref linkend="python2"/> (To build Python module).
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/talloc"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of talloc</title>
+    <title>Installation of Talloc</title>
 
-    <para>Install <application>talloc</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Talloc</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>To check the results, issue <command>make check</command>.</para>
+    <para>
+      To check the results, issue <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -82,12 +113,11 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libtalloc.{a,so}</seg>
-        <seg>None</seg>
+        <seg>
+          libpytalloc-util.so, libtalloc.so and
+          talloc.so (Python Module)
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -98,11 +128,13 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="talloc-lib">
-        <term><filename class='libraryfile'>libtalloc.{a,so}</filename></term>
+      <varlistentry id="libtalloc">
+        <term><filename class="libraryfile">libtalloc.so</filename></term>
         <listitem>
-          <para>contains a replacemnt for the <application>glibc</application>
-          malloc function.</para>
-          <indexterm zone="talloc talloc-lib">
-            <primary sortas="c-libtalloc">libtalloc.{a,so}</primary>
+          <para>
+            contains a replacemnt for the <application>Glibc</application>
+            malloc function.
+          </para>
+          <indexterm zone="talloc libtalloc">
+            <primary sortas="c-libtalloc">libtalloc.so</primary>
           </indexterm>
         </listitem>
Index: general/sysutils/lm_sensors.xml
===================================================================
--- general/sysutils/lm_sensors.xml	(revision 23407e4ad8a9b9ff6413fdc3b41863caed23b934)
+++ general/sysutils/lm_sensors.xml	(revision c7ce750add9ce27c5cb84451607356c661561b63)
@@ -6,9 +6,9 @@
 
   <!ENTITY lm_sensors-download-http
-    "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-&lm_sensors-version;.tar.bz2">
+           "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-&lm_sensors-version;.tar.bz2">
   <!ENTITY lm_sensors-download-ftp
-    "ftp://ftp.netroedge.com/pub/lm-sensors/lm_sensors-&lm_sensors-version;.tar.bz2">
-  <!ENTITY lm_sensors-md5sum        "f357ba00b080ab102a170f7bf8bb2578">
-  <!ENTITY lm_sensors-size          "168 KB">
+           "ftp://ftp.netroedge.com/pub/lm-sensors/lm_sensors-&lm_sensors-version;.tar.bz2">
+  <!ENTITY lm_sensors-md5sum        "73c2fcccdab6049d289c5e0c596192a1">
+  <!ENTITY lm_sensors-size          "172 KB">
   <!ENTITY lm_sensors-buildsize     "2.4 MB">
   <!ENTITY lm_sensors-time          "0.1 SBU">
@@ -79,10 +79,10 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="which"/>.
+      <xref linkend="which"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://oss.oetiker.ch/rrdtool/">RRDtool</ulink>.
+      <ulink url="http://oss.oetiker.ch/rrdtool/">RRDtool</ulink>
     </para>
 
@@ -142,5 +142,5 @@
 
 <screen><userinput>make PREFIX=/usr BUILD_STATIC_LIB=0 \
-  MANDIR=/usr/share/man</userinput></screen>
+     MANDIR=/usr/share/man</userinput></screen>
 
     <para>
@@ -153,7 +153,7 @@
 
 <screen role="root"><userinput>make PREFIX=/usr BUILD_STATIC_LIB=0 \
-  MANDIR=/usr/share/man install &amp;&amp;
-mkdir -p /usr/share/doc/lm_sensors-&lm_sensors-version; &amp;&amp;
-cp -rf doc/* /usr/share/doc/lm_sensors-&lm_sensors-version;</userinput></screen>
+     MANDIR=/usr/share/man install &amp;&amp;
+mkdir -pv /usr/share/doc/lm_sensors-&lm_sensors-version; &amp;&amp;
+cp -rfv doc/* /usr/share/doc/lm_sensors-&lm_sensors-version;</userinput></screen>
   </sect2>
 
@@ -174,4 +174,5 @@
       bindings/perl-shared/RRDs.xs</command>.
     </para>
+
   </sect2>
 
@@ -181,5 +182,8 @@
     <sect3 id="lm_sensors-config">
       <title>Config File</title>
-      <para><filename>/etc/sensors3.conf</filename>.</para>
+
+      <para>
+        <filename>/etc/sensors3.conf</filename>
+      </para>
 
       <indexterm zone="lm_sensors lm_sensors-config">
@@ -187,4 +191,5 @@
         sortas="e-etc-path-Configfilename2">/etc/sensors3.conf</primary>
       </indexterm>
+
     </sect3>
 
@@ -204,5 +209,7 @@
         can't use).
       </para>
+
     </sect3>
+
   </sect2>
 
@@ -217,16 +224,14 @@
       <seglistitem>
         <seg>
-          fancontrol,
-          isadump,
-          isaset,
-          pwmconfig,
-          sensors,
-          sensors-conf-convert and
-          sensors-detect.
+          fancontrol, isadump, isaset, pwmconfig,
+          sensors, sensors-conf-convert and
+          sensors-detect
         </seg>
-        <seg>libsensors.so.</seg>
+        <seg>
+          libsensors.so
+        </seg>
         <seg>
           /usr/include/sensors and
-          /usr/share/doc/lm_sensors-&lm_sensors-version;.
+          /usr/share/doc/lm_sensors-&lm_sensors-version;
         </seg>
       </seglistitem>
@@ -345,5 +350,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 23407e4ad8a9b9ff6413fdc3b41863caed23b934)
+++ introduction/welcome/changelog.xml	(revision c7ce750add9ce27c5cb84451607356c661561b63)
@@ -55,4 +55,7 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - Akonadi 1.9.0.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - GnuTLS 3.1.6.</para>
         </listitem>
@@ -64,4 +67,10 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - libdiscid 0.3.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - lm_sensors 3.3.3.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - PulseAudio 3.0.</para>
         </listitem>
@@ -71,4 +80,7 @@
         <listitem>
           <para>[krejzi] - SoundTouch 1.7.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Talloc 2.0.8.</para>
         </listitem>
         <listitem>
Index: kde/core/akonadi.xml
===================================================================
--- kde/core/akonadi.xml	(revision 23407e4ad8a9b9ff6413fdc3b41863caed23b934)
+++ kde/core/akonadi.xml	(revision c7ce750add9ce27c5cb84451607356c661561b63)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY akonadi-download-http "http://mirrors.isc.org/pub/kde/stable/akonadi/src/akonadi-&akonadi-version;.tar.bz2">
-  <!ENTITY akonadi-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/akonadi/src/akonadi-&akonadi-version;.tar.bz2">
-  <!ENTITY akonadi-md5sum        "39411abc7bec8a485362ea7460e7e3d7">
-  <!ENTITY akonadi-size          "214 KB">
-  <!ENTITY akonadi-buildsize     "43 MB">
+  <!ENTITY akonadi-download-http "&kde-download-http;akonadi/src/akonadi-&akonadi-version;.tar.bz2">
+  <!ENTITY akonadi-download-ftp  "&kde-download-ftp;akonadi/src/akonadi-&akonadi-version;.tar.bz2">
+  <!ENTITY akonadi-md5sum        "51ef4c9455f97ce4346c5934174b9da8">
+  <!ENTITY akonadi-size          "216 KB">
+  <!ENTITY akonadi-buildsize     "50 MB">
   <!ENTITY akonadi-time          "1.9 SBU">
 ]>
 
-<sect1 id="akonadi" xreflabel="akonadi-&akonadi-version;">
+<sect1 id="akonadi" xreflabel="Akonadi-&akonadi-version;">
   <?dbhtml filename="akonadi.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="akonadi">
-    <primary sortas="a-akonadi">akonadi</primary>
+    <primary sortas="a-Akonadi">Akonadi</primary>
   </indexterm>
 
@@ -89,12 +89,14 @@
     <title>Installation of Akonadi</title>
 
-    <para>Install <application>akonadi</application> by running the following
+    <para>Install <application>Akonadi</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i 's#qt4/plugins#kde4/plugins#' qsqlite/CMakeLists.txt &amp;&amp;
-mkdir build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_PREFIX_PATH=&qt-dir; .. &amp;&amp;
+      -DCMAKE_PREFIX_PATH=&qt-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
+      .. &amp;&amp;
 make</userinput></screen>
 
@@ -108,9 +110,13 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's#qt4/plugins...</command>: This sed fixes the 
-    installation path of the SQLite plugin.</para>
-    
-    <para><option>-DCMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to
-    find automoc4.</para>
+    <para><option>-DCMAKE_PREFIX_PATH=&qt-dir;</option>: This switch is used to
+    help <command>cmake</command> find <command>automoc4</command>.</para>
+
+    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
+    higher level of compiler optimizations.</para>
+
+    <para><option>-DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE</option>: This switch ensures
+    that <application>Akonadi</application> SQLite extension is installed into
+    <application>Qt</application> plugins directory.</para>
 
   </sect2>
@@ -132,22 +138,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-akonadi">
-        <term><command>akonadi</command></term>
-        <listitem>
-          <para>is a testing utility for akonadi-generated build trees.</para>
-          <indexterm zone="a-akonadi akonadi">
-            <primary sortas="b-akonadi">akonadi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: multimedia/libdriv/libdiscid.xml
===================================================================
--- multimedia/libdriv/libdiscid.xml	(revision 23407e4ad8a9b9ff6413fdc3b41863caed23b934)
+++ multimedia/libdriv/libdiscid.xml	(revision c7ce750add9ce27c5cb84451607356c661561b63)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libdiscid-download-http "http://users.musicbrainz.org/~matt/libdiscid-&libdiscid-version;.tar.gz">
+  <!ENTITY libdiscid-download-http "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-&libdiscid-version;.tar.gz">
   <!ENTITY libdiscid-download-ftp  " ">
-  <!ENTITY libdiscid-md5sum        "ee21ddbe696a3c60e14827a75f3bcf5b">
+  <!ENTITY libdiscid-md5sum        "17e51260062b7583e5981c82cf618127">
   <!ENTITY libdiscid-size          "340 KB">
-  <!ENTITY libdiscid-buildsize     "1 MB">
+  <!ENTITY libdiscid-buildsize     "2.6 MB">
   <!ENTITY libdiscid-time          "less than 0.1 SBU">
 ]>
@@ -30,9 +30,11 @@
     <title>Introduction to libdiscid</title>
 
-    <para>The <application>libdiscid</application> package is a library for
-    creating MusicBrainz DiscIDs from audio CDs. It reads a CD's table of
-    contents (TOC) and generates an identifier which can be used to lookup the
-    CD at MusicBrainz (<ulink url="http://musicbrainz.org"/>). Additionally, it
-    provides a submission URL for adding the DiscID to the database.</para>
+    <para>
+      The <application>libdiscid</application> package contains a library for
+      creating MusicBrainz DiscIDs from audio CDs. It reads a CD's table of
+      contents (TOC) and generates an identifier which can be used to lookup the
+      CD at MusicBrainz (<ulink url="http://musicbrainz.org"/>). Additionally, it
+      provides a submission URL for adding the DiscID to the database.
+    </para>
 
     &lfs72_checked;
@@ -41,26 +43,43 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libdiscid-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libdiscid-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libdiscid-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libdiscid-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libdiscid-md5sum;</para>
+        <para>
+          Download MD5 sum: &libdiscid-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libdiscid-size;</para>
+        <para>
+          Download size: &libdiscid-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libdiscid-buildsize;</para>
+        <para>
+          Estimated disk space required: &libdiscid-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libdiscid-time;</para>
+        <para>
+          Estimated build time: &libdiscid-time;
+        </para>
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libdiscid"/></para>
-
+      <ulink url="&blfs-wiki;/libdiscid"/>
+    </para>
   </sect2>
 
@@ -68,8 +87,10 @@
     <title>Installation of libdiscid</title>
 
-    <para>Install <application>libdiscid</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libdiscid</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>
 
@@ -82,16 +103,26 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libdiscid.{so,a}</seg>
-        <seg>/usr/include/discid</seg>
+        <seg>
+          libdiscid.so
+        </seg>
+        <seg>
+          /usr/include/discid
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -103,9 +134,11 @@
 
       <varlistentry id="libdiscid-lib">
-        <term><filename class='libraryfile'>libdiscid.{so,a}</filename></term>
+        <term><filename class="libraryfile">libdiscid.so</filename></term>
         <listitem>
-          <para>contains the DiscID API functions.</para>
+          <para>
+            contains the DiscID API functions.
+          </para>
           <indexterm zone="libdiscid libdiscid-lib">
-            <primary sortas="c-libdiscid">libdiscid.{so,a}</primary>
+            <primary sortas="c-libdiscid">libdiscid.so</primary>
           </indexterm>
         </listitem>
