[blfs-book] r10484 - in trunk/BOOK: . general/genlib general/genutils general/graphlib general/prog general/sysutils introduction/welcome multimedia/audioutils networking/netlibs postlfs/editors postlfs/filesystems postlfs/security x/installing xsoft/other

krejzi at linuxfromscratch.org krejzi at linuxfromscratch.org
Tue Jul 31 16:44:52 PDT 2012


Author: krejzi
Date: 2012-07-31 17:44:40 -0600 (Tue, 31 Jul 2012)
New Revision: 10484

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/iso-codes.xml
   trunk/BOOK/general/genlib/libatasmart.xml
   trunk/BOOK/general/genutils/intltool.xml
   trunk/BOOK/general/graphlib/exiv2.xml
   trunk/BOOK/general/graphlib/fontconfig.xml
   trunk/BOOK/general/graphlib/libexif.xml
   trunk/BOOK/general/graphlib/libtiff.xml
   trunk/BOOK/general/prog/python-modules.xml
   trunk/BOOK/general/sysutils/colord.xml
   trunk/BOOK/general/sysutils/hdparm.xml
   trunk/BOOK/general/sysutils/unrar.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/audioutils/lame.xml
   trunk/BOOK/networking/netlibs/curl.xml
   trunk/BOOK/networking/netlibs/libpcap.xml
   trunk/BOOK/postlfs/editors/bluefish.xml
   trunk/BOOK/postlfs/filesystems/lvm2.xml
   trunk/BOOK/postlfs/security/liboauth.xml
   trunk/BOOK/postlfs/security/shadow.xml
   trunk/BOOK/x/installing/xcb-util.xml
   trunk/BOOK/xsoft/other/pidgin.xml
Log:
Upgraded several packages. See BLFS ChangeLog for more information.

Modified: trunk/BOOK/general/genlib/iso-codes.xml
===================================================================
--- trunk/BOOK/general/genlib/iso-codes.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/genlib/iso-codes.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -6,9 +6,9 @@
 
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.bz2">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "473407073f64f4a8d5eb22dd6abd98dd">
-  <!ENTITY iso-codes-size          "5.9 MB">
-  <!ENTITY iso-codes-buildsize     "77 MB">
+  <!ENTITY iso-codes-md5sum        "503f79b04d6372f260b7e61ff4b27a70">
+  <!ENTITY iso-codes-size          "9.8 MB">
+  <!ENTITY iso-codes-buildsize     "110 MB">
   <!ENTITY iso-codes-time          "0.1 SBU">
 ]>
 
@@ -29,56 +29,78 @@
   <sect2 role="package">
     <title>Introduction to ISO Codes</title>
 
-    <para>The <application>ISO Codes</application> package contains a list of
-    country, language and currency names. This is useful when used as a central
-    database for accessing this data.</para>
+    <para>
+      The <application>ISO Codes</application> package contains a list of
+      country, language and currency names and it is used as a central
+      database for accessing this data.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&iso-codes-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&iso-codes-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&iso-codes-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&iso-codes-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &iso-codes-md5sum;</para>
+        <para>
+          Download MD5 sum: &iso-codes-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &iso-codes-size;</para>
+        <para>
+          Download size: &iso-codes-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &iso-codes-buildsize;</para>
+        <para>
+          Estimated disk space required: &iso-codes-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &iso-codes-time;</para>
+        <para>
+          Estimated build time: &iso-codes-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">ISO Codes Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python2"/></para>
+    <para role="required">
+      <xref linkend="python2"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/iso-codes"/></para>
-
+      <ulink url="&blfs-wiki;/iso-codes"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of ISO Codes</title>
 
-    <para>Install <application>ISO Codes</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>ISO Codes</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>
 
@@ -88,15 +110,12 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>/usr/share/xml/iso-codes and
-        many directories in the /usr/share/locale hierarchy</seg>
+        <seg>
+          /usr/share/xml/iso-codes
+        </seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/general/genlib/libatasmart.xml
===================================================================
--- trunk/BOOK/general/genlib/libatasmart.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/genlib/libatasmart.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libatasmart-download-http "http://0pointer.de/public/libatasmart-&libatasmart-version;.tar.gz">
+  <!ENTITY libatasmart-download-http "http://0pointer.de/public/libatasmart-&libatasmart-version;.tar.xz">
   <!ENTITY libatasmart-download-ftp  " ">
-  <!ENTITY libatasmart-md5sum        "dc22b7acda1c2230f55ae98737e8b159">
-  <!ENTITY libatasmart-size          "376 KB">
+  <!ENTITY libatasmart-md5sum        "53afe2b155c36f658e121fe6def33e77">
+  <!ENTITY libatasmart-size          "248 KB">
   <!ENTITY libatasmart-buildsize     "3 MB">
-  <!ENTITY libatasmart-time          "0.1 SBU">
+  <!ENTITY libatasmart-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="libatasmart" xreflabel="libatasmart-&libatasmart-version;">
@@ -29,50 +29,70 @@
   <sect2 role="package">
     <title>Introduction to libatasmart</title>
 
-    <para>The <application>libatasmart</application> package is a disk reporting
-    library. It only supports a subset of the ATA S.M.A.R.T. functionality.</para>
+    <para>
+      The <application>libatasmart</application> package is a disk reporting
+      library. It only supports a subset of the ATA S.M.A.R.T. functionality.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libatasmart-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libatasmart-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libatasmart-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libatasmart-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libatasmart-md5sum;</para>
+        <para>
+          Download MD5 sum: &libatasmart-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libatasmart-size;</para>
+        <para>
+          Download size: &libatasmart-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libatasmart-buildsize;</para>
+        <para>
+          Estimated disk space required: &libatasmart-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libatasmart-time;</para>
+        <para>
+          Estimated build time: &libatasmart-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libatasmart"/></para>
-
+      <ulink url="&blfs-wiki;/libatasmart"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of libatasmart</title>
 
-    <para>Install <application>libatasmart</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libatasmart</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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,7 +102,7 @@
     <title>Command Explanations</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
 
@@ -115,7 +135,9 @@
       <varlistentry id="skdump">
         <term><command>skdump</command></term>
         <listitem>
-          <para>is a utility that reports on the status of the disk.</para>
+          <para>
+            is an utility that reports on the status of the disk.
+          </para>
           <indexterm zone="libatasmart skdump">
             <primary sortas="b-skdump">skdump</primary>
           </indexterm>
@@ -125,7 +147,9 @@
       <varlistentry id="sktest">
         <term><command>sktest</command></term>
         <listitem>
-          <para>is a utility to issue disks tests.</para>
+          <para>
+            is an utility to issue disks tests.
+          </para>
           <indexterm zone="libatasmart sktest">
             <primary sortas="b-sktest">sktest</primary>
           </indexterm>
@@ -135,7 +159,9 @@
       <varlistentry id="libatasmart-lib">
         <term><filename class='libraryfile'>libatasmart.so</filename></term>
         <listitem>
-          <para>contains the ATA S.M.A.R.T API functions.</para>
+          <para>
+            contains the ATA S.M.A.R.T API functions.
+          </para>
           <indexterm zone="libatasmart libatasmart-lib">
             <primary sortas="c-libatasmart">libatasmart.so</primary>
           </indexterm>

Modified: trunk/BOOK/general/genutils/intltool.xml
===================================================================
--- trunk/BOOK/general/genutils/intltool.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/genutils/intltool.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -6,13 +6,13 @@
 
   <!ENTITY intltool-download-http "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
   <!ENTITY intltool-download-ftp  " ">
-  <!ENTITY intltool-md5sum        "0da9847a60391ca653df35123b1f7cc0">
-  <!ENTITY intltool-size          "144 KB">
+  <!ENTITY intltool-md5sum        "23fbd879118253cb99aeac067da5f591">
+  <!ENTITY intltool-size          "188 KB">
   <!ENTITY intltool-buildsize     "1.4 MB">
   <!ENTITY intltool-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="intltool" xreflabel="intltool-&intltool-version;">
+<sect1 id="intltool" xreflabel="Intltool-&intltool-version;">
   <?dbhtml filename="intltool.html"?>
 
   <sect1info>
@@ -29,60 +29,82 @@
   <sect2 role="package">
     <title>Introduction to Intltool</title>
 
-    <para>The <application>intltool</application> package contains an
-    internationalization tool. This is useful for extracting translatable
-    strings from source files, collecting the extracted strings with messages
-    from traditional source files (<filename class="directory"><source
-    directory>/<package>/po</filename>) and merging the translations
-    into <filename>.xml</filename>, <filename>.desktop</filename> and
-    <filename>.oaf</filename> files.</para>
+    <para>
+      The <application>Intltool</application> is an internationalization 
+      tool used for extracting translatable strings from source files,
+      collecting the extracted strings with messages from traditional
+      source files (<filename class="directory"><source
+      directory>/<package>/po</filename>) and merging the
+      translations into <filename>.xml</filename>,
+      <filename>.desktop</filename> and <filename>.oaf</filename> files.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&intltool-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&intltool-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&intltool-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&intltool-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &intltool-md5sum;</para>
+        <para>
+          Download MD5 sum: &intltool-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &intltool-size;</para>
+        <para>
+          Download size: &intltool-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &intltool-buildsize;</para>
+        <para>
+          Estimated disk space required: &intltool-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &intltool-time;</para>
+        <para>
+          Estimated build time: &intltool-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Intltool Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="perl-xml-parser"/></para>
+    <para role="required">
+      <xref linkend="perl-xml-parser"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/intltool"/></para>
-
+      <ulink url="&blfs-wiki;/intltool"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Intltool</title>
 
-    <para>Install <application>intltool</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Intltool</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test 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 &&
 install -v -m644 -D doc/I18N-HOWTO \
@@ -95,14 +117,17 @@
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>intltool-extract, intltool-merge, intltool-prepare,
-        intltool-update, and intltoolize</seg>
-        <seg>None</seg>
-        <seg>/usr/share/{doc/intltool-&intltool-version;,intltool}</seg>
+        <seg>
+          intltool-extract, intltool-merge, intltool-prepare,
+          intltool-update and intltoolize
+        </seg>
+        <seg>
+          /usr/share/doc/intltool-&intltool-version; and
+          /usr/share/intltool
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -114,8 +139,10 @@
       <varlistentry id="intltoolize">
         <term><command>intltoolize</command></term>
         <listitem>
-          <para>prepares a package to use
-          <application>intltool</application>.</para>
+          <para>
+            prepares a package to use
+            <application>intltool</application>.
+          </para>
           <indexterm zone="intltool intltoolize">
             <primary sortas="b-intltoolize">intltoolize</primary>
           </indexterm>
@@ -125,8 +152,10 @@
       <varlistentry id="intltool-extract">
         <term><command>intltool-extract</command></term>
         <listitem>
-          <para>generates header files that can be read by
-          <command>gettext</command>.</para>
+          <para>
+            generates header files that can be read by
+            <command>gettext</command>.
+          </para>
           <indexterm zone="intltool intltool-extract">
             <primary sortas="b-intltool-extract">intltool-extract</primary>
           </indexterm>
@@ -136,7 +165,9 @@
       <varlistentry id="intltool-merge">
         <term><command>intltool-merge</command></term>
         <listitem>
-          <para> merges translated strings into various file types.</para>
+          <para>
+            merges translated strings into various file types.
+          </para>
           <indexterm zone="intltool intltool-merge">
             <primary sortas="b-intltool-merge">intltool-merge</primary>
           </indexterm>
@@ -146,7 +177,9 @@
       <varlistentry id="intltool-prepare">
         <term><command>intltool-prepare</command></term>
         <listitem>
-          <para>updates pot files and merges them with translation files.</para>
+          <para>
+            updates pot files and merges them with translation files.
+          </para>
           <indexterm zone="intltool intltool-prepare">
             <primary sortas="b-intltool-prepare">intltool-prepare</primary>
           </indexterm>
@@ -156,8 +189,10 @@
       <varlistentry id="intltool-update">
         <term><command>intltool-update</command></term>
         <listitem>
-          <para>updates the <filename>po</filename> template files and merges
-          them with the translations.</para>
+          <para>
+            updates the <filename>po</filename> template files and merges
+            them with the translations.
+          </para>
           <indexterm zone="intltool intltool-update">
             <primary sortas="b-intltool-update">intltool-update</primary>
           </indexterm>

Modified: trunk/BOOK/general/graphlib/exiv2.xml
===================================================================
--- trunk/BOOK/general/graphlib/exiv2.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/graphlib/exiv2.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -6,13 +6,13 @@
 
   <!ENTITY exiv2-download-http "http://www.exiv2.org/exiv2-&exiv2-version;.tar.gz">
   <!ENTITY exiv2-download-ftp  " ">
-  <!ENTITY exiv2-md5sum        "84d7d5b1802529efca8ac3d6e6a97e3a">
+  <!ENTITY exiv2-md5sum        "dab67c07bb63a4386d4ea607a8e06eaf">
   <!ENTITY exiv2-size          "3.4 MB">
-  <!ENTITY exiv2-buildsize     "46 MB">
-  <!ENTITY exiv2-time          "1.3 SBU">
+  <!ENTITY exiv2-buildsize     "28 MB">
+  <!ENTITY exiv2-time          "1.2 SBU">
 ]>
 
-<sect1 id="exiv2" xreflabel="exiv2-&exiv2-version;">
+<sect1 id="exiv2" xreflabel="Exiv2-&exiv2-version;">
   <?dbhtml filename="exiv2.html"?>
 
   <sect1info>
@@ -23,114 +23,110 @@
   <title>Exiv2-&exiv2-version;</title>
 
   <indexterm zone="exiv2">
-    <primary sortas="a-exiv2">exiv2</primary>
+    <primary sortas="a-Exiv2">Exiv2</primary>
   </indexterm>
 
   <sect2 role="package">
     <title>Introduction to Exiv2</title>
 
-    <para><application>Exiv2</application> is a C++ library and a command 
-    line utility to manage image metadata.</para>
+    <para>
+      <application>Exiv2</application> is a C++ library and a command 
+      line utility for managing image metadata.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&exiv2-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&exiv2-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&exiv2-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&exiv2-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &exiv2-md5sum;</para>
+        <para>
+          Download MD5 sum: &exiv2-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &exiv2-size;</para>
+        <para>
+          Download size: &exiv2-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &exiv2-buildsize;</para>
+        <para>
+          Estimated disk space required: &exiv2-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &exiv2-time;</para>
+        <para>
+          Estimated build time: &exiv2-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/exiv2-&exiv2-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
     <bridgehead renderas="sect3">Exiv2 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="expat"/>
+      <xref linkend="expat"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="libiodbc"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="jdk"/>
-    </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="imagemagick"/>,
-    <xref linkend="python2"/>
-    </para>
--->
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/exiv2"/></para>
-
+      <ulink url="&blfs-wiki;/exiv2"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Exiv2</title>
 
-    <para>Install <application>exiv2</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Exiv2</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr  &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
-    <para><application>Exiv2</application> does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>- -without-internal-zlib</option>: This option is set to use
-    the installed <application>zlib</application> and not the bundled
-    one.</para>
+    <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 Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Library</segtitle>
 
       <seglistitem>
-        <seg>exiv2</seg>
-        <seg>libexiv2.{so,a}</seg>
-        <seg></seg>
+        <seg>
+          exiv2
+        </seg>
+        <seg>
+          libexiv2.so
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -142,7 +138,9 @@
       <varlistentry id="exiv2-prog">
         <term><command>exiv2</command></term>
         <listitem>
-          <para>is an utility to dump Exif data.</para>
+          <para>
+            is an utility used to dump Exif data.
+          </para>
           <indexterm zone="exiv2 exiv2-prog">
             <primary sortas="b-exiv2">exiv2</primary>
           </indexterm>

Modified: trunk/BOOK/general/graphlib/fontconfig.xml
===================================================================
--- trunk/BOOK/general/graphlib/fontconfig.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/graphlib/fontconfig.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -6,7 +6,7 @@
 
   <!ENTITY fontconfig-download-http "http://fontconfig.org/release/fontconfig-&fontconfig-version;.tar.bz2">
   <!ENTITY fontconfig-download-ftp  " ">
-  <!ENTITY fontconfig-md5sum        "3950e82cf5885b41cba8a2bf466aa6f9">
+  <!ENTITY fontconfig-md5sum        "e9b9142080b7cd6b43890344fec7fbd8">
   <!ENTITY fontconfig-size          "1.4 MB">
   <!ENTITY fontconfig-buildsize     "16 MB">
   <!ENTITY fontconfig-time          "0.4 SBU">

Modified: trunk/BOOK/general/graphlib/libexif.xml
===================================================================
--- trunk/BOOK/general/graphlib/libexif.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/graphlib/libexif.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -5,8 +5,8 @@
   %general-entities;
 
   <!ENTITY libexif-download-http "&sourceforge-repo;/libexif/libexif-&libexif-version;.tar.bz2">
-  <!ENTITY libexif-download-ftp  "&gentoo-ftp-repo;/libexif-&libexif-version;.tar.bz2">
-  <!ENTITY libexif-md5sum        "19844ce6b5d075af16f0d45de1e8a6a3">
+  <!ENTITY libexif-download-ftp  " ">
+  <!ENTITY libexif-md5sum        "27339b89850f28c8f1c237f233e05b27">
   <!ENTITY libexif-size          "1.4 MB">
   <!ENTITY libexif-buildsize     "17 MB">
   <!ENTITY libexif-time          "0.2 SBU">
@@ -23,82 +23,107 @@
   <title>libexif-&libexif-version;</title>
 
   <indexterm zone="libexif">
-    <primary sortas="a-Libexif">Libexif</primary>
+    <primary sortas="a-libexif">libexif</primary>
   </indexterm>
 
   <sect2 role="package">
     <title>Introduction to libexif</title>
 
-    <para>The <application>libexif</application> package contains a library
-    for parsing, editing, and saving EXIF data. Most digital cameras produce
-    EXIF files, which are JPEG files with extra tags that contain information
-    about the image. All EXIF tags described in EXIF standard 2.1 are
-    supported.</para>
+    <para>
+      The <application>libexif</application> package contains a library for
+      parsing, editing, and saving EXIF data. Most digital cameras produce
+      EXIF files, which are JPEG files with extra tags that contain information
+      about the image. All EXIF tags described in EXIF standard 2.1 are
+      supported.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libexif-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libexif-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libexif-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libexif-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libexif-md5sum;</para>
+        <para>
+          Download MD5 sum: &libexif-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libexif-size;</para>
+        <para>
+          Download size: &libexif-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libexif-buildsize;</para>
+        <para>
+          Estimated disk space required: &libexif-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libexif-time;</para>
+        <para>
+          Estimated build time: &libexif-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">libexif Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional (to Build Documentation)</bridgehead>
-    <para role="optional"><xref linkend="doxygen"/> and
-    <xref linkend="graphviz"/></para>
+    <para role="optional">
+      <xref linkend="doxygen"/> and
+      <xref linkend="graphviz"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libexif"/></para>
-
+      <ulink url="&blfs-wiki;/libexif"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of libexif</title>
 
-    <para>Install <application>libexif</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libexif</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
-            --with-doc-dir=/usr/share/doc/libexif-&libexif-version; &&
+            --with-doc-dir=/usr/share/doc/libexif-&libexif-version; \
+            --disable-static &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test 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>
 
-    <para>Documentation was built and installed if you have the dependencies
-    shown above installed. If you don't have the dependencies installed, there
-    is a compressed tarball in the source tree
-    <filename class='directory'>doc</filename> directory that can be unpacked
-    into /usr/share/doc/libexif-&libexif-version;.</para>
+    <para>
+      Documentation was built and installed if you have the dependencies
+      shown above installed. If you don't have the dependencies installed,
+      there is a compressed tarball in the source tree
+      <filename class="directory">doc</filename> directory that can be
+      unpacked into /usr/share/doc/libexif-&libexif-version;.
+    </para>
 
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</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>
 
@@ -106,15 +131,17 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libexif.{so,a}</seg>
-        <seg>/usr/include/libexif and
-        /usr/share/doc/libexif-&libexif-version;</seg>
+        <seg>
+          libexif.so
+        </seg>
+        <seg>
+          /usr/include/libexif and
+          /usr/share/doc/libexif-&libexif-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -124,15 +151,18 @@
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libexif-lib">
-        <term><filename class='libraryfile'>libexif.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libexif.so</filename></term>
         <listitem>
-          <para>contains functions used for parsing, editing, and saving
-          EXIF data.</para>
+          <para>
+            contains functions used for parsing, editing, and saving
+            EXIF data.
+          </para>
           <indexterm zone="libexif libexif-lib">
-            <primary sortas="c-libexif">libexif.{so,a}</primary>
+            <primary sortas="c-libexif">libexif.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
 
   </sect2>

Modified: trunk/BOOK/general/graphlib/libtiff.xml
===================================================================
--- trunk/BOOK/general/graphlib/libtiff.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/graphlib/libtiff.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -5,12 +5,12 @@
   %general-entities;
 
   <!ENTITY libtiff-download-http
-  "http://download.osgeo.org/libtiff/tiff-&libtiff-version;.tar.gz">
+           "http://download.osgeo.org/libtiff/tiff-&libtiff-version;.tar.gz">
   <!ENTITY libtiff-download-ftp
-  "ftp://ftp.remotesensing.org/libtiff/tiff-&libtiff-version;.tar.gz">
-  <!ENTITY libtiff-md5sum        "fae149cc9da35c598d8be897826dfc63">
-  <!ENTITY libtiff-size          "1.9 MB">
-  <!ENTITY libtiff-buildsize     "31 MB">
+           "ftp://ftp.remotesensing.org/libtiff/tiff-&libtiff-version;.tar.gz">
+  <!ENTITY libtiff-md5sum        "04a08fa1e07e696e820a0c3f32465a13">
+  <!ENTITY libtiff-size          "2.0 MB">
+  <!ENTITY libtiff-buildsize     "22 MB">
   <!ENTITY libtiff-time          "0.4 SBU">
 ]>
 
@@ -31,60 +31,83 @@
   <sect2 role="package">
     <title>Introduction to LibTIFF</title>
 
-    <para>The <application>LibTIFF</application> package contains the
-    TIFF libraries and associated utilities. The libraries are used by many
-    programs for reading and writing TIFF files and the utilities are useful
-    for general work with TIFF files.</para>
+    <para>
+      The <application>LibTIFF</application> package contains the TIFF 
+      libraries and associated utilities. The libraries are used by many
+      programs for reading and writing TIFF files and the utilities are
+      used for general work with TIFF files.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libtiff-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libtiff-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libtiff-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libtiff-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libtiff-md5sum;</para>
+        <para>
+          Download MD5 sum: &libtiff-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libtiff-size;</para>
+        <para>
+          Download size: &libtiff-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libtiff-buildsize;</para>
+        <para>
+          Estimated disk space required: &libtiff-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libtiff-time;</para>
+        <para>
+          Estimated build time: &libtiff-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">LibTIFF Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/>,
-    <xref linkend="x-window-system"/>,
-    <xref linkend="freeglut"/>, and
-    <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink></para>
+    <para role="optional">
+      <xref linkend="freeglut"/>,
+      <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
+      <xref linkend="libjpeg"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libtiff"/></para>
+      <ulink url="&blfs-wiki;/libtiff"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of LibTIFF</title>
 
-    <para>Install <application>LibTIFF</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>LibTIFF</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test 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>
   </sect2>
@@ -92,8 +115,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This switch prevents the
-    static library from being built.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
   <sect2 role="content">
@@ -105,12 +129,18 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>bmp2tiff, fax2ps, fax2tiff, gif2tiff, pal2rgb, ppm2tiff, ras2tiff,
-        raw2tiff, rgb2ycbcr, thumbnail, tiff2bw, tiff2pdf, tiff2ps, tiff2rgba,
-        tiffcmp, tiffcp, tiffcrop, tiffdither, tiffdump, tiffinfo, tiffmedian,
-        tiffset, and tiffsplit</seg>
-        <seg>libtiff.so and libtiffxx.so</seg>
-        <seg>/usr/share/doc/tiff-&libtiff-version;</seg>
+        <seg>
+          bmp2tiff, fax2ps, fax2tiff, gif2tiff, pal2rgb, ppm2tiff, ras2tiff,
+          raw2tiff, rgb2ycbcr, thumbnail, tiff2bw, tiff2pdf, tiff2ps,
+          tiff2rgba, tiffcmp, tiffcp, tiffcrop, tiffdither, tiffdump,
+          tiffinfo, tiffmedian, tiffset and tiffsplit
+        </seg>
+        <seg>
+          libtiff.so and libtiffxx.so
+        </seg>
+        <seg>
+          /usr/share/doc/tiff-&libtiff-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -122,8 +152,10 @@
       <varlistentry id="bmp2tiff">
         <term><command>bmp2tiff</command></term>
         <listitem>
-          <para>converts a Microsoft Windows Device Independent Bitmap image
-          file to a TIFF image.</para>
+          <para>
+            converts a Microsoft Windows Device Independent Bitmap image
+            file to a TIFF image.
+          </para>
           <indexterm zone="libtiff bmp2tiff">
             <primary sortas="b-bmp2tiff">bmp2tiff</primary>
           </indexterm>
@@ -133,7 +165,9 @@
       <varlistentry id="fax2ps">
         <term><command>fax2ps</command></term>
         <listitem>
-          <para>converts a TIFF facsimile to compressed PostScript file.</para>
+          <para>
+            converts a TIFF facsimile to compressed PostScript file.
+          </para>
           <indexterm zone="libtiff fax2ps">
             <primary sortas="b-fax2ps">fax2ps</primary>
           </indexterm>
@@ -143,7 +177,9 @@
       <varlistentry id="fax2tiff">
         <term><command>fax2tiff</command></term>
         <listitem>
-          <para>creates a TIFF Class F fax file from raw fax data.</para>
+          <para>
+            creates a TIFF Class F fax file from raw fax data.
+          </para>
           <indexterm zone="libtiff fax2tiff">
             <primary sortas="b-fax2tiff">fax2tiff</primary>
           </indexterm>
@@ -153,7 +189,9 @@
       <varlistentry id="gif2tiff">
         <term><command>gif2tiff</command></term>
         <listitem>
-          <para>creates a TIFF file from a GIF87 format image file.</para>
+          <para>
+            creates a TIFF file from a GIF87 format image file.
+          </para>
           <indexterm zone="libtiff gif2tiff">
             <primary sortas="b-gif2tiff">gif2tiff</primary>
           </indexterm>
@@ -163,8 +201,10 @@
       <varlistentry id="pal2rgb">
         <term><command>pal2rgb</command></term>
         <listitem>
-          <para>converts a palette color TIFF image to a full color
-          image.</para>
+          <para>
+            converts a palette color TIFF image to a full color
+            image.
+          </para>
           <indexterm zone="libtiff pal2rgb">
             <primary sortas="b-pal2rgb">pal2rgb</primary>
           </indexterm>
@@ -174,7 +214,9 @@
       <varlistentry id="ppm2tiff">
         <term><command>ppm2tiff</command></term>
         <listitem>
-          <para>creates a TIFF file from a PPM image file.</para>
+          <para>
+            creates a TIFF file from a PPM image file.
+          </para>
           <indexterm zone="libtiff ppm2tiff">
             <primary sortas="b-ppm2tiff">ppm2tiff</primary>
           </indexterm>
@@ -184,7 +226,9 @@
       <varlistentry id="ras2tiff">
         <term><command>ras2tiff</command></term>
         <listitem>
-          <para>creates a TIFF file from a Sun rasterfile.</para>
+          <para>
+            creates a TIFF file from a Sun rasterfile.
+          </para>
           <indexterm zone="libtiff ras2tiff">
             <primary sortas="b-ras2tiff">ras2tiff</primary>
           </indexterm>
@@ -194,7 +238,9 @@
       <varlistentry id="raw2tiff">
         <term><command>raw2tiff</command></term>
         <listitem>
-          <para>converts a raw byte sequence into TIFF.</para>
+          <para>
+            converts a raw byte sequence into TIFF.
+          </para>
           <indexterm zone="libtiff raw2tiff">
             <primary sortas="b-raw2tiff">raw2tiff</primary>
           </indexterm>
@@ -204,7 +250,9 @@
       <varlistentry id="rgb2ycbcr">
         <term><command>rgb2ycbcr</command></term>
         <listitem>
-          <para>converts non-YCbCr TIFF images to YCbCr TIFF images.</para>
+          <para>
+            converts non-YCbCr TIFF images to YCbCr TIFF images.
+          </para>
           <indexterm zone="libtiff rgb2ycbcr">
             <primary sortas="b-rgb2ycbcr">rgb2ycbcr</primary>
           </indexterm>
@@ -214,7 +262,9 @@
       <varlistentry id="thumbnail">
         <term><command>thumbnail</command></term>
         <listitem>
-          <para>creates a TIFF file with thumbnail images.</para>
+          <para>
+            creates a TIFF file with thumbnail images.
+          </para>
           <indexterm zone="libtiff thumbnail">
             <primary sortas="b-thumbnail">thumbnail</primary>
           </indexterm>
@@ -224,7 +274,9 @@
       <varlistentry id="tiff2bw">
         <term><command>tiff2bw</command></term>
         <listitem>
-          <para>converts a color TIFF image to grayscale.</para>
+          <para>
+            converts a color TIFF image to grayscale.
+          </para>
           <indexterm zone="libtiff tiff2bw">
             <primary sortas="b-tiff2bw">tiff2bw</primary>
           </indexterm>
@@ -234,7 +286,9 @@
       <varlistentry id="tiff2pdf">
         <term><command>tiff2pdf</command></term>
         <listitem>
-          <para>converts a TIFF image to a PDF document.</para>
+          <para>
+            converts a TIFF image to a PDF document.
+          </para>
           <indexterm zone="libtiff tiff2pdf">
             <primary sortas="b-tiff2pdf">tiff2pdf</primary>
           </indexterm>
@@ -244,7 +298,9 @@
       <varlistentry id="tiff2ps">
         <term><command>tiff2ps</command></term>
         <listitem>
-          <para>converts a TIFF image to a PostScript file.</para>
+          <para>
+            converts a TIFF image to a PostScript file.
+          </para>
           <indexterm zone="libtiff tiff2ps">
             <primary sortas="b-tiff2ps">tiff2ps</primary>
           </indexterm>
@@ -254,8 +310,10 @@
       <varlistentry id="tiff2rgba">
         <term><command>tiff2rgba</command></term>
         <listitem>
-          <para>converts a wide variety of TIFF images into an RGBA
-          TIFF image.</para>
+          <para>
+            converts a wide variety of TIFF images into an RGBA
+            TIFF image.
+          </para>
           <indexterm zone="libtiff tiff2rgba">
             <primary sortas="b-tiff2rgba">tiff2rgba</primary>
           </indexterm>
@@ -265,7 +323,9 @@
       <varlistentry id="tiffcmp">
         <term><command>tiffcmp</command></term>
         <listitem>
-          <para>compares two TIFF files.</para>
+          <para>
+            compares two TIFF files.
+          </para>
           <indexterm zone="libtiff tiffcmp">
             <primary sortas="b-tiffcmp">tiffcmp</primary>
           </indexterm>
@@ -275,7 +335,9 @@
       <varlistentry id="tiffcp">
         <term><command>tiffcp</command></term>
         <listitem>
-          <para> copies (and possibly converts) a TIFF file.</para>
+          <para>
+            copies (and possibly converts) a TIFF file.
+          </para>
           <indexterm zone="libtiff tiffcp">
             <primary sortas="b-tiffcp">tiffcp</primary>
           </indexterm>
@@ -285,8 +347,10 @@
       <varlistentry id="tiffcrop">
         <term><command>tiffcrop</command></term>
         <listitem>
-          <para> selects, copies, crops, converts, extracts, and/or processes
-          one or more TIFF files. .</para>
+          <para>
+            selects, copies, crops, converts, extracts and/or processes
+            one or more TIFF files.
+          </para>
           <indexterm zone="libtiff tiffcrop">
             <primary sortas="b-tiffcrop">tiffcrop</primary>
           </indexterm>
@@ -296,7 +360,9 @@
       <varlistentry id="tiffdither">
         <term><command>tiffdither</command></term>
         <listitem>
-          <para>converts a grayscale image to bilevel using dithering.</para>
+          <para>
+            converts a grayscale image to bilevel using dithering.
+          </para>
           <indexterm zone="libtiff tiffdither">
             <primary sortas="b-tiffdither">tiffdither</primary>
           </indexterm>
@@ -306,7 +372,9 @@
       <varlistentry id="tiffdump">
         <term><command>tiffdump</command></term>
         <listitem>
-          <para>prints verbatim information about TIFF files.</para>
+          <para>
+            prints verbatim information about TIFF files.
+          </para>
           <indexterm zone="libtiff tiffdump">
             <primary sortas="b-tiffdump">tiffdump</primary>
           </indexterm>
@@ -316,7 +384,9 @@
       <varlistentry id="tiffinfo">
         <term><command>tiffinfo</command></term>
         <listitem>
-          <para>prints information about TIFF files.</para>
+          <para>
+            prints information about TIFF files.
+          </para>
           <indexterm zone="libtiff tiffinfo">
             <primary sortas="b-tiffinfo">tiffinfo</primary>
           </indexterm>
@@ -326,7 +396,9 @@
       <varlistentry id="tiffmedian">
         <term><command>tiffmedian</command></term>
         <listitem>
-          <para>applies the median cut algorithm to data in a TIFF file.</para>
+          <para>
+            applies the median cut algorithm to data in a TIFF file.
+          </para>
           <indexterm zone="libtiff tiffmedian">
             <primary sortas="b-tiffmedian">tiffmedian</primary>
           </indexterm>
@@ -336,7 +408,9 @@
       <varlistentry id="tiffset">
         <term><command>tiffset</command></term>
         <listitem>
-          <para>sets the value of a TIFF header to a specified value.</para>
+          <para>
+            sets the value of a TIFF header to a specified value.
+          </para>
           <indexterm zone="libtiff tiffset">
             <primary sortas="b-tiffset">tiffset</primary>
           </indexterm>
@@ -346,7 +420,9 @@
       <varlistentry id="tiffsplit">
         <term><command>tiffsplit</command></term>
         <listitem>
-          <para>splits a multi-image TIFF into single-image TIFF files.</para>
+          <para>
+            splits a multi-image TIFF into single-image TIFF files.
+          </para>
           <indexterm zone="libtiff tiffsplit">
             <primary sortas="b-tiffsplit">tiffsplit</primary>
           </indexterm>
@@ -356,9 +432,11 @@
       <varlistentry id="libtiff-lib">
         <term><filename class='libraryfile'>libtiff.so</filename></term>
         <listitem>
-          <para>contains the API functions used by the
-          <application>libtiff</application> programs as well as other
-          programs to read and write TIFF files.</para>
+          <para>
+            contains the API functions used by the
+            <application>libtiff</application> programs as well as other
+            programs to read and write TIFF files.
+          </para>
           <indexterm zone="libtiff libtiff-lib">
             <primary sortas="c-libtiff">libtiff.so</primary>
           </indexterm>
@@ -368,13 +446,18 @@
       <varlistentry id="libtiffxx">
         <term><filename class='libraryfile'>libtiffxx.so</filename></term>
         <listitem>
-          <para>contains the C++ API functions used
-          by programs to read and write TIFF files.</para>
+          <para>
+            contains the C++ API functions used
+            by programs to read and write TIFF files.
+          </para>
           <indexterm zone="libtiff libtiffxx">
             <primary sortas="c-libtiffxx">libtiffxx.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>

Modified: trunk/BOOK/general/prog/python-modules.xml
===================================================================
--- trunk/BOOK/general/prog/python-modules.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/prog/python-modules.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -93,9 +93,9 @@
 
   <!ENTITY pyxdg-download-http "http://people.freedesktop.org/~takluyver/pyxdg-&pyxdg-version;.tar.gz">
   <!ENTITY pyxdg-download-ftp  " ">
-  <!ENTITY pyxdg-md5sum        "a8945ed0e34894049e9975cbe3348aa7">
-  <!ENTITY pyxdg-size          "40 KB">
-  <!ENTITY pyxdg-buildsize     "728 KB">
+  <!ENTITY pyxdg-md5sum        "d31ceab3d68f235be4e4421a9bf110bd">
+  <!ENTITY pyxdg-size          "44 KB">
+  <!ENTITY pyxdg-buildsize     "750 KB">
   <!ENTITY pyxdg-time          "less than 0.1 SBU">
 
   <!ENTITY ipython-download-http

Modified: trunk/BOOK/general/sysutils/colord.xml
===================================================================
--- trunk/BOOK/general/sysutils/colord.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/sysutils/colord.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -7,9 +7,9 @@
   <!ENTITY colord-download-http 
            "http://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "8028ac0d078efb2584602e7931dd06b2">
-  <!ENTITY colord-size          "544 KB">
-  <!ENTITY colord-buildsize     "18 MB">
+  <!ENTITY colord-md5sum        "695403d0d480ffa7a0f424f18d696373">
+  <!ENTITY colord-size          "536 KB">
+  <!ENTITY colord-buildsize     "16 MB">
   <!ENTITY colord-time          "0.3 SBU">
 ]>
 
@@ -86,9 +86,8 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk3"/>,
       <xref linkend="polkit"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev), and
+      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev) and
       <xref linkend="vala"/>
     </para>
 
@@ -148,7 +147,7 @@
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -157,7 +156,7 @@
           colord-sane and colormgr
         </seg>
         <seg>
-          libcolord.so and libcolord-gtk.so
+          libcolord.so
         </seg>
         <seg>
           /usr/include/colord-1,
@@ -236,18 +235,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libcolord-gtk">
-        <term><filename class='libraryfile'>libcolord-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application> GTK+ bindings.
-          </para>
-          <indexterm zone="colord libcolord-gtk">
-            <primary sortas="c-libcolord-gtk">libcolord-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>

Modified: trunk/BOOK/general/sysutils/hdparm.xml
===================================================================
--- trunk/BOOK/general/sysutils/hdparm.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/sysutils/hdparm.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -6,13 +6,13 @@
 
   <!ENTITY hdparm-download-http "&sourceforge-repo;/hdparm/hdparm-&hdparm-version;.tar.gz">
   <!ENTITY hdparm-download-ftp  " ">
-  <!ENTITY hdparm-md5sum        "0bb94ddd1bedd5c02b1ca62f1caaf6de">
+  <!ENTITY hdparm-md5sum        "2bc17b72403885d4faf959682944243b">
   <!ENTITY hdparm-size          "124 KB">
   <!ENTITY hdparm-buildsize     "1 MB">
   <!ENTITY hdparm-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="hdparm" xreflabel="hdparm-&hdparm-version;">
+<sect1 id="hdparm" xreflabel="Hdparm-&hdparm-version;">
   <?dbhtml filename="hdparm.html"?>
 
   <sect1info>
@@ -29,67 +29,91 @@
   <sect2 role="package">
     <title>Introduction to Hdparm</title>
 
-    <para>The <application>hdparm</application> package contains a utility
-    that is useful for controlling ATA/IDE controllers and hard drives both to
-    increase performance and sometimes to increase stability.</para>
+    <para>
+      The <application>Hdparm</application> package contains an utility that
+      is useful for controlling ATA/IDE controllers and hard drives both to
+      increase performance and sometimes to increase stability.
+    </para>
 
     &lfs71_checked;
 
     <warning>
-      <para>As well as being useful, incorrect usage of
-      <application>hdparm</application> can destroy your information and in
-      rare cases, drives. Use with caution and make sure you know what you are
-      doing. If in doubt, it is recommended that you leave the default kernel
-      parameters alone.</para>
+      <para>
+        As well as being useful, incorrect usage of
+        <application>Hdparm</application> can destroy your information and in
+        rare cases, drives. Use with caution and make sure you know what you
+        are doing. If in doubt, it is recommended that you leave the default
+        kernel parameters alone.
+      </para>
     </warning>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&hdparm-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&hdparm-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&hdparm-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&hdparm-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &hdparm-md5sum;</para>
+        <para>
+          Download MD5 sum: &hdparm-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &hdparm-size;</para>
+        <para>
+          Download size: &hdparm-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &hdparm-buildsize;</para>
+        <para>
+          Estimated disk space required: &hdparm-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &hdparm-time;</para>
+        <para>
+          Estimated build time: &hdparm-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/hdparm"/></para>
-
+      <ulink url="&blfs-wiki;/hdparm"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Hdparm</title>
 
-    <para>Build <application>hdparm</application> by running the following
-    command:</para>
+    <para>
+      Build <application>Hdparm</application> by running the following
+      command:
+    </para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>
 
-    <para>Note that by default, <command>hdparm</command> is installed in
-    <filename class="directory">/sbin</filename> as some systems may require it
-    during the boot process before <filename class="directory">/usr</filename>
-    is mounted.  If you wish to install <command>hdparm</command> under the
-    <filename class="directory">/usr</filename> hierarchy, then replace the above
-    command with the following:</para>
+    <para>
+      Note that by default, <command>hdparm</command> is installed in
+      <filename class="directory">/sbin</filename> as some systems may require it
+      during the boot process before <filename class="directory">/usr</filename>
+      is mounted.  If you wish to install <command>hdparm</command> under the
+      <filename class="directory">/usr</filename> hierarchy, then replace the above
+      command with the following:
+    </para>
 
 <screen role="root"><userinput>make binprefix=/usr/ install</userinput></screen>
 
@@ -100,13 +124,11 @@
 
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>hdparm</seg>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>
+          hdparm
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -118,8 +140,10 @@
       <varlistentry id="hdparm-prog">
         <term><command>hdparm</command></term>
         <listitem>
-          <para>provides a command-line interface to various hard disk ioctls
-          supported by the stock Linux ATA/IDE device driver subsystem.</para>
+          <para>
+            provides a command-line interface to various hard disk ioctls
+            supported by the stock Linux ATA/IDE device driver subsystem.
+          </para>
           <indexterm zone="hdparm hdparm-prog">
             <primary sortas="b-hdparm">hdparm</primary>
           </indexterm>

Modified: trunk/BOOK/general/sysutils/unrar.xml
===================================================================
--- trunk/BOOK/general/sysutils/unrar.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general/sysutils/unrar.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -5,14 +5,14 @@
   %general-entities;
 
   <!ENTITY unrar-download-http "http://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz">
-  <!ENTITY unrar-download-ftp "">
-  <!ENTITY unrar-md5sum "e7c3e0f6e30faf447d9d7918af570672">
-  <!ENTITY unrar-size "156 KB">
-  <!ENTITY unrar-buildsize "2 MB">
-  <!ENTITY unrar-time "less than 0.1 SBU">
+  <!ENTITY unrar-download-ftp  "">
+  <!ENTITY unrar-md5sum        "8ea9d1b4139474b282d76e627a2de3e4">
+  <!ENTITY unrar-size          "164 KB">
+  <!ENTITY unrar-buildsize     "2 MB">
+  <!ENTITY unrar-time          "0.1 SBU">
 ]>
 
-<sect1 id="unrar" xreflabel="Unrar-&unrar-version;">
+<sect1 id="unrar" xreflabel="UnRar-&unrar-version;">
   <?dbhtml filename="unrar.html"?>
 
   <sect1info>
@@ -29,53 +29,73 @@
   <sect2 role="package">
     <title>Introduction to UnRar</title>
 
-    <para>The <application>UnRar</application> package contains a
-    <filename>RAR</filename> extraction utility. This is useful for
-    extracting files from <filename>RAR</filename> archives.
-    <filename>RAR</filename> archives are usually
-    created with <application>WinRAR</application>,
-    primarily in a Windows environment.</para>
+    <para>
+      The <application>UnRar</application> package contains a
+      <filename>RAR</filename> extraction utility used for
+      extracting files from <filename>RAR</filename> archives.
+      <filename>RAR</filename> archives are usually created
+      with <application>WinRAR</application>, primarily in a
+      Windows environment.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&unrar-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&unrar-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&unrar-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&unrar-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &unrar-md5sum;</para>
+        <para>
+          Download MD5 sum: &unrar-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &unrar-size;</para>
+        <para>
+          Download size: &unrar-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &unrar-buildsize;</para>
+        <para>
+          Estimated disk space required: &unrar-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &unrar-time;</para>
+        <para>
+          Estimated build time: &unrar-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/unrar"/></para>
-
+      <ulink url="&blfs-wiki;/unrar"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of UnRar</title>
 
-    <para>Install <application>UnRar</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>UnRar</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>make -f makefile.unix</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>install -v -m755 unrar /usr/bin</userinput></screen>
 
@@ -86,13 +106,11 @@
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>unrar</seg>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>
+          unrar
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -104,7 +122,9 @@
       <varlistentry id="unrar-prog">
         <term><command>unrar</command></term>
         <listitem>
-          <para>uncompresses a <filename>RAR</filename> archive.</para>
+          <para>
+            uncompresses a <filename>RAR</filename> archive.
+          </para>
           <indexterm zone="unrar unrar-prog">
             <primary sortas="b-unrar">unrar</primary>
           </indexterm>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/general.ent	2012-07-31 23:44:40 UTC (rev 10484)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
+<!ENTITY day          "31">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 27th, &year;">
+<!ENTITY releasedate  "July 31st, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -161,7 +161,7 @@
 <!ENTITY gpgme-version                "1.3.2">
 <!ENTITY iptables-version             "1.4.14">
 <!ENTITY libcap2-version              "2.22">
-<!ENTITY liboauth-version             "0.9.5">
+<!ENTITY liboauth-version             "0.9.7">
 <!ENTITY linux-pam-version            "1.1.5">
 <!ENTITY mitkrb-version               "1.10.2">
 <!ENTITY nettle-version               "2.5">
@@ -172,7 +172,7 @@
 <!ENTITY openssl-version              "1.0.1c">
 <!ENTITY p11-kit-version              "0.13">
 <!ENTITY polkit-version               "0.107">
-<!ENTITY shadow-version               "4.1.5">
+<!ENTITY shadow-version               "4.1.5.1">
 <!ENTITY stunnel-version              "4.52">
 <!ENTITY sudo-version                 "1.8.5p2">
 <!ENTITY tcpwrappers-version          "7.6">
@@ -186,7 +186,7 @@
 <!ENTITY curlftpfs-version            "0.9.1">
 <!ENTITY fuse-version                 "2.9.1">
 <!ENTITY jfsutils-version             "1.1.15">
-<!ENTITY lvm2-version                 "2.02.95">
+<!ENTITY lvm2-version                 "2.02.96">
 <!ENTITY mdadm-version                "3.2.5">
 <!ENTITY ntfs-3g-version              "2012.1.15">
 <!ENTITY reiser-version               "3.6.21">
@@ -194,7 +194,7 @@
 <!ENTITY xfsprogs-version             "3.1.7">
 
 <!-- Chapter 6 -->
-<!ENTITY bluefish-version             "2.2.2">
+<!ENTITY bluefish-version             "2.2.3">
 <!ENTITY ed-version                   "1.6">
 <!ENTITY emacs-version                "23.4">
 <!ENTITY joe-version                  "3.7">
@@ -244,12 +244,12 @@
 <!ENTITY icu-version                  "&icu-major;.&icu-minor;.&icu-patch;">
 <!ENTITY icu-dl-version               "&icu-major;_&icu-minor;_&icu-patch;">
 
-<!ENTITY iso-codes-version            "3.30">
+<!ENTITY iso-codes-version            "3.37">
 <!ENTITY json-c-version               "0.9">
 <!ENTITY json-glib-version            "0.14.2">
 <!ENTITY keyutils-version             "1.5.5">
 <!ENTITY libassuan-version            "2.0.3">
-<!ENTITY libatasmart-version          "0.18">
+<!ENTITY libatasmart-version          "0.19">
 <!ENTITY libatomic_ops-version        "7.2">
 <!ENTITY libcroco-version             "0.6.5">
 <!ENTITY libdaemon-version            "0.14">
@@ -308,9 +308,9 @@
 <!-- Chapter 10 -->
 <!ENTITY aalib-version                "1.4rc5">
 <!ENTITY babl-version                 "0.1.10">
-<!ENTITY exiv2-version                "0.22">
+<!ENTITY exiv2-version                "0.23">
 <!ENTITY freetype2-version            "2.4.10">
-<!ENTITY fontconfig-version           "2.10.0">
+<!ENTITY fontconfig-version           "2.10.1">
 <!ENTITY fribidi-version              "0.19.2">
 <!ENTITY gegl-version                 "0.2.0">
 <!ENTITY giflib-version               "4.1.6">
@@ -319,12 +319,12 @@
 <!ENTITY lcms-version                 "1.19">
 <!ENTITY lcms2-version                "2.3">
 <!ENTITY libart_lgpl-version          "2.3.21">
-<!ENTITY libexif-version              "0.6.20">
+<!ENTITY libexif-version              "0.6.21">
 <!ENTITY libjpeg-version              "8d">
 <!ENTITY libmng-version               "1.0.10">
 <!ENTITY libpng-version               "1.5.12">
 <!ENTITY librsvg-version              "2.36.1">
-<!ENTITY libtiff-version              "4.0.1">
+<!ENTITY libtiff-version              "4.0.2">
 <!ENTITY openjpeg-version             "1.5.0">
 <!ENTITY pixman-version               "0.26.2">
 <!ENTITY poppler-version              "0.20.2">
@@ -346,7 +346,7 @@
 <!ENTITY hd2u-version                 "1.0.3">
 <!ENTITY icon-naming-utils-version    "0.8.90">
 <!ENTITY imagemagick-version          "6.7.8">
-<!ENTITY intltool-version             "0.50.0">
+<!ENTITY intltool-version             "0.50.2">
 <!ENTITY libiodbc-version             "3.52.7">
 <!ENTITY pilot-link-version           "0.12.2">
 <!ENTITY pinentry-version             "0.8.1">
@@ -372,7 +372,7 @@
 <!ENTITY at-version                   "3.1.13">
 <!ENTITY autofs-version               "5.0.6">
 <!ENTITY bluez-version                "4.101">
-<!ENTITY colord-version               "0.1.21">
+<!ENTITY colord-version               "0.1.22">
 <!ENTITY cpio-version                 "2.11">
 <!ENTITY dbus-version                 "1.6.4">
 <!ENTITY dbus-glib-version            "0.100">
@@ -381,7 +381,7 @@
 <!ENTITY fcron-version                "3.0.6">
 <!ENTITY gpm-version                  "1.20.6">
 <!ENTITY gvfs-version                 "1.12.3">
-<!ENTITY hdparm-version               "9.37">
+<!ENTITY hdparm-version               "9.39">
 <!ENTITY libarchive-version           "3.0.4">
 <!ENTITY lm_sensors-version           "3.3.2">
 <!ENTITY mc-version                   "4.8.3">
@@ -398,7 +398,7 @@
 <!ENTITY udev-version                 "Installed LFS Version">
 <!ENTITY udisks-version               "1.0.4">
 <!ENTITY udisks2-version              "1.98.0">
-<!ENTITY unrar-version                "4.1.1">
+<!ENTITY unrar-version                "4.2.4">
 <!ENTITY unzip-version                "6.0">
 <!ENTITY upower-version               "0.9.17">
 <!ENTITY usbutils-version             "006">
@@ -532,7 +532,7 @@
 <!ENTITY pygtksourceview-version      "2.10.1">
 <!ENTITY pyatspi2-version             "2.4.0">
 <!ENTITY pyrex-version                "0.9.9">
-<!ENTITY pyxdg-version                "0.20">
+<!ENTITY pyxdg-version                "0.22">
 <!ENTITY ipython-version              "0.12">
 
 <!--- Removed
@@ -583,7 +583,7 @@
 <!ENTITY wicd-major-version           "1.7">
 
 <!-- Chapter 17 -->
-<!ENTITY curl-version                 "7.26.0">
+<!ENTITY curl-version                 "7.27.0">
 <!ENTITY geoclue-version              "0.12.0">
 <!ENTITY geocode-glib-version         "0.99.0">
 <!ENTITY glib-networking-version      "2.32.3">
@@ -592,7 +592,7 @@
 <!ENTITY libgdata-version             "0.12.0">
 <!ENTITY libnice-version              "0.1.2">
 <!ENTITY libnl-version                "3.2.11">
-<!ENTITY libpcap-version              "1.1.1">
+<!ENTITY libpcap-version              "1.3.0">
 <!ENTITY libproxy-version             "0.4.7">
 <!ENTITY librest-version              "0.7.12">
 <!ENTITY libsoup-version              "2.38.1">
@@ -678,7 +678,7 @@
 <!ENTITY xcursor-themes-version       "1.0.3">
 <!ENTITY xkeyboard-config-version     "2.6">
 <!ENTITY mesalib-version              "8.0.4">
-<!ENTITY xcb-util-version             "0.3.8">
+<!ENTITY xcb-util-version             "0.3.9">
 <!ENTITY printproto-version           "1.0.5">
 <!ENTITY libXp-version                "1.0.1">
 <!ENTITY xorg-server-version          "1.12.3">
@@ -1022,7 +1022,7 @@
 <!ENTITY icedtea-web-version          "1.2">
 <!ENTITY inkscape-version             "0.48.2">
 <!ENTITY pan-version                  "0.133">
-<!ENTITY pidgin-version               "2.10.4">
+<!ENTITY pidgin-version               "2.10.6">
 <!ENTITY rox-filer-version            "2.10">
 <!ENTITY thunderbird-version          "13.0.1">
 <!ENTITY transmission-version         "2.60">
@@ -1094,16 +1094,16 @@
 <!-- Chapter 39 -->
 <!ENTITY mpg123-version               "1.14.3">
 <!ENTITY vorbistools-version          "1.4.0">
-<!ENTITY XMMS-version                 "1.2.10">
-<!ENTITY lame-major-version           "3.99">
-<!ENTITY lame-version                 "3.99.3">
+<!ENTITY lame-version                 "3.99.5">
 <!ENTITY CDParanoia-version           "III-10.2">
 <!ENTITY freetts-version              "1.2.2">
 <!ENTITY audacious-version            "3.2.2">
 <!ENTITY audacious-plugins-version    "3.2.2">
 <!ENTITY amarok-version               "2.5.0">
 <!ENTITY gvolwheel-version            "1.0">
+
 <!-- Obsolete
+<!ENTITY XMMS-version                 "1.2.10">
 <!ENTITY gnome-media-version          "2.32.0">
 -->
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -44,6 +44,72 @@
 
 -->
     <listitem>
+      <para>July 31st, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Bluefish 2.2.3.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Colord 0.1.22.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - cURL 7.27.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Exiv2 0.23.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Fontconfig 2.10.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Hdparm 9.39.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Intltool 0.50.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - ISO Codes 3.37.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - LAME 0.99.5.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libatasmart 0.19.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libexif 0.6.21.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - liboauth 0.9.7.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libpcap 1.3.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libTIFF 4.0.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - LVM2 2.02.96.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Pidgin 2.10.6.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - PyXDG 0.22 - A Python Module.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Shadow 4.1.5.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - UnRar 4.2.4.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - XCB Util 0.3.9.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 30th, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/multimedia/audioutils/lame.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/lame.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/multimedia/audioutils/lame.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,13 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!-- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.3.tar.gz -->
-
-  <!ENTITY lame-download-http "&sourceforge-repo2;/projects/lame/files/lame/&lame-major-version;/lame-&lame-version;.tar.gz">
+  <!ENTITY lame-download-http "&sourceforge-repo;/lame/lame-&lame-version;.tar.gz">
   <!ENTITY lame-download-ftp  " ">
-  <!ENTITY lame-md5sum        "5ad31e33e70455eb3a7b79a5dd934fce">
+  <!ENTITY lame-md5sum        "84835b313d4a8b68f5349816d33e07ce">
   <!ENTITY lame-size          "1.4 MB">
-  <!ENTITY lame-buildsize     "13 MB">
+  <!ENTITY lame-buildsize     "11 MB">
   <!ENTITY lame-time          "0.3 SBU">
 ]>
 
@@ -31,31 +29,45 @@
   <sect2 role="package">
     <title>Introduction to LAME</title>
 
-    <para>The <application>LAME</application> package contains
-    an MP3 encoder and optionally, an MP3 frame analyzer. This is useful
-    for creating and analyzing compressed audio files.</para>
+    <para>
+      The <application>LAME</application> package contains an MP3
+      encoder and optionally, an MP3 frame analyzer. This is useful
+      for creating and analyzing compressed audio files.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&lame-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&lame-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&lame-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&lame-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &lame-md5sum;</para>
+        <para>
+          Download MD5 sum: &lame-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &lame-size;</para>
+        <para>
+          Download size: &lame-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &lame-buildsize;</para>
+        <para>
+          Estimated disk space required: &lame-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &lame-time;</para>
+        <para>
+          Estimated build time: &lame-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -63,31 +75,35 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="ftp://ftp.gtk.org/pub/gtk/v1.3/">GTK-1</ulink>,
-      <xref linkend="NASM"/>,
-      <xref linkend="libsndfile"/>
-      (support for input from stdin is currently broken),
-      <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and
-      <ulink url="http://dmalloc.com/">Dmalloc</ulink>
+      <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
+      <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink>,
+      <xref linkend="libsndfile"/> and
+      <xref linkend="NASM"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/lame"/></para>
-
+      <ulink url="&blfs-wiki;/lame"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of LAME</title>
 
-    <para>Install <application>LAME</application> by running
-    the following commands:</para>
+    <para>
+      Install <application>LAME</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --enable-mp3rtp --disable-static &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make test</command>.</para>
+    <para>
+      To test the results, issue: <command>make test</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 pkghtmldir=/usr/share/doc/lame-&lame-version; install</userinput></screen>
 
@@ -96,14 +112,19 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-mp3rtp</parameter>: Builds the
-    encode-to-RTP program.</para>
+    <para>
+      <option>--enable-mp3rtp</option>: This switch enables building
+      of the encode-to-RTP program.
+    </para>
 
-    <para><parameter>--enable-nasm</parameter>: Enable the use of
-    <xref linkend="NASM"/> to compile optimized assembly routines.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--enable-nasm</option>: Enable the use of
+      <xref linkend="NASM"/> to compile optimized assembly routines.
+    </para>
+
   </sect2>
 
   <sect2 role="content">
@@ -115,9 +136,15 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>lame, mp3rtp, and optionally, mp3x</seg>
-        <seg>libmp3lame.{so,a}</seg>
-        <seg>/usr/include/lame and /usr/share/doc/lame</seg>
+        <seg>
+          lame and mp3rtp
+        </seg>
+        <seg>
+          libmp3lame.so
+        </seg>
+        <seg>
+          /usr/include/lame and /usr/share/doc/lame-&lame-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -129,8 +156,10 @@
       <varlistentry id="lame-prog">
         <term><command>lame</command></term>
         <listitem>
-          <para>creates MP3 audio files from raw
-          PCM or <filename>.wav</filename> data.</para>
+          <para>
+            creates MP3 audio files from raw
+            PCM or <filename>.wav</filename> data.
+          </para>
           <indexterm zone="lame lame-prog">
             <primary sortas="b-lame">lame</primary>
           </indexterm>
@@ -140,32 +169,24 @@
       <varlistentry id="mp3rtp">
         <term><command>mp3rtp</command></term>
         <listitem>
-          <para>is used to encode MP3 with RTP streaming of the output.</para>
+          <para>
+            is used to encode MP3 with RTP streaming of the output.
+          </para>
           <indexterm zone="lame mp3rtp">
             <primary sortas="b-mp3rtp">mp3rtp</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="mp3x">
-        <term><command>mp3x</command></term>
-        <listitem>
-          <para>is a <application>GTK</application> based graphical MP3
-          frame analyzer used for debugging, development and studying MP3
-          frames produced by any encoder.</para>
-          <indexterm zone="lame mp3x">
-            <primary sortas="b-mp3x">mp3x</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libmp3lame">
-        <term><filename class='libraryfile'>libmp3lame.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libmp3lame.so</filename></term>
         <listitem>
-          <para>libraries provide the functions necessary to convert
-          raw PCM and WAV files to MP3 files.</para>
+          <para>
+            libraries provide the functions necessary to convert
+            raw PCM and WAV files to MP3 files.
+          </para>
           <indexterm zone="lame libmp3lame">
-            <primary sortas="c-libmp3lame">libmp3lame.{so,a}</primary>
+            <primary sortas="c-libmp3lame">libmp3lame.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/networking/netlibs/curl.xml
===================================================================
--- trunk/BOOK/networking/netlibs/curl.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/networking/netlibs/curl.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -6,10 +6,10 @@
 
   <!ENTITY curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "bfa80f01b3d300359cfb4d409b6136a3">
+  <!ENTITY curl-md5sum        "11fcbfc0de9c12512e607e7d72d500a0">
   <!ENTITY curl-size          "2.4 MB">
-  <!ENTITY curl-buildsize     "28 MB">
-  <!ENTITY curl-time          "0.5 SBU">
+  <!ENTITY curl-buildsize     "30 MB">
+  <!ENTITY curl-time          "0.4 SBU">
 ]>
 
 <sect1 id="curl" xreflabel="cURL-&curl-version;">
@@ -89,6 +89,7 @@
       <ulink url="http://daniel.haxx.se/projects/c-ares/">c-ares</ulink>,
       <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
       <xref linkend="libidn"/>,
+      <ulink url="https://launchpad.net/libmetalink/">libmetalink</ulink>,
       <ulink url="http://www.libssh2.org">libssh2</ulink>,
       <xref linkend="mitkrb"/>,
       <xref linkend="openldap"/> and
@@ -119,11 +120,7 @@
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>. Note that
-      if you have <application>Stunnel</application> and
-      <application>TCP Wrapper</application> installed and you wish to perform
-      the HTTPS tests, you'll need to have an unrestrictive
-      <filename>/etc/hosts.deny</filename> file.
+      To test the results, issue: <command>make check</command>.
     </para>
 
     <para>
@@ -140,9 +137,6 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <command>sed -i '/--static-libs)/{N;s#echo .*#echo #;}'
       curl-config.in</command>: As we've not installed the static libraries,
@@ -150,6 +144,9 @@
       otherwise confuse other applications<!--such as pycurl-->.
     </para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
     <para>
       <parameter>--with-ca-path=/etc/ssl/certs</parameter>: This parameter
       sets the directory to use as the path to the SSL certificates.
@@ -165,12 +162,6 @@
     </para>
 
     <para>
-      <option>--with-libssh2</option>: This parameter adds
-      SSH2 protocol support to
-      <filename class="libraryfile">libcurl</filename>.
-    </para>
-
-    <para>
       <option>--without-ssl --with-gnutls</option>: Use to
       build with <application>GnuTLS</application> support
       instead of <application>OpenSSL</application> for SSL/TLS.

Modified: trunk/BOOK/networking/netlibs/libpcap.xml
===================================================================
--- trunk/BOOK/networking/netlibs/libpcap.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/networking/netlibs/libpcap.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libpcap-download-http "&sources-anduin-http;/l/libpcap-&libpcap-version;.tar.gz">
-  <!ENTITY libpcap-download-ftp  "&gentoo-ftp-repo;/libpcap-&libpcap-version;.tar.gz">
-  <!ENTITY libpcap-md5sum        "1bca27d206970badae248cfa471bbb47">
-  <!ENTITY libpcap-size          "576 KB">
-  <!ENTITY libpcap-buildsize     "4 MB">
-  <!ENTITY libpcap-time          "less than 0.1 SBU">
+  <!ENTITY libpcap-download-http "http://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
+  <!ENTITY libpcap-download-ftp  " ">
+  <!ENTITY libpcap-md5sum        "f78455a92622b7a3c05c58b6ad1cec7e">
+  <!ENTITY libpcap-size          "596 KB">
+  <!ENTITY libpcap-buildsize     "8 MB">
+  <!ENTITY libpcap-time          "0.1 SBU">
 ]>
 
 <sect1 id="libpcap" xreflabel="libpcap-&libpcap-version;">
@@ -23,65 +23,89 @@
   <title>libpcap-&libpcap-version;</title>
 
   <indexterm zone="libpcap">
-    <primary sortas="a-Libpcap">Libpcap</primary>
+    <primary sortas="a-libpcap">libpcap</primary>
   </indexterm>
 
   <sect2 role="package">
     <title>Introduction to libpcap</title>
 
-    <para><application>libpcap</application> provides functions for user-level
-    packet capture, used in low-level network monitoring.</para>
+    <para>
+      <application>libpcap</application> provides functions for user-level
+      packet capture, used in low-level network monitoring.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libpcap-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libpcap-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libpcap-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libpcap-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libpcap-md5sum;</para>
+        <para>
+          Download MD5 sum: &libpcap-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libpcap-size;</para>
+        <para>
+          Download size: &libpcap-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libpcap-buildsize;</para>
+        <para>
+          Estimated disk space required: &libpcap-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libpcap-time;</para>
+        <para>
+          Estimated build time: &libpcap-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">libpcap Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">Software distribution for the
-    <ulink url="http://www.endace.com/">DAG</ulink> and
-    <ulink url="http://www.intel.com/">Septel</ulink> range of passive
-    network monitoring cards and
-    <xref linkend="bluez"/></para>
+    <para role="optional">
+      <xref linkend="bluez"/>,
+      Software distribution for the
+      <ulink url="http://www.endace.com/">DAG</ulink>,
+      <ulink url="http://www.infradead.org/~tgr/libnl/">
+      libnl (version 1 or 2)</ulink> and
+      <ulink url="http://www.intel.com/">Septel</ulink> range of passive
+      network monitoring cards.
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libpcap"/></para>
-
+      <ulink url="&blfs-wiki;/libpcap"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of libpcap</title>
 
-    <para>Install <application>libpcap</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libpcap</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>
 
@@ -96,9 +120,15 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>libpcap-config</seg>
-        <seg>libpcap.{a,so}</seg>
-        <seg>/usr/include/pcap</seg>
+        <seg>
+          libpcap-config
+        </seg>
+        <seg>
+          libpcap.{a,so}
+        </seg>
+        <seg>
+          /usr/include/pcap
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -110,7 +140,10 @@
     <varlistentry id="libpcap-config">
         <term><command>libpcap-config</command></term>
       <listitem>
-        <para>provides configuration information for libpcap.</para>
+        <para>
+          provides configuration information for
+          <application>libpcap</application>.
+        </para>
         <indexterm zone="libpcap libpcap-config">
           <primary sortas="c-libpcap">libpcap-config</primary>
         </indexterm>
@@ -120,7 +153,9 @@
     <varlistentry id="libpcap-lib">
         <term><filename class="libraryfile">libpcap.{a,so}</filename></term>
       <listitem>
-        <para>are libraries used for user-level packet capture.</para>
+        <para>
+          are libraries used for user-level packet capture.
+        </para>
         <indexterm zone="libpcap libpcap-lib">
           <primary sortas="c-libpcap">libpcap.{a,so}</primary>
         </indexterm>

Modified: trunk/BOOK/postlfs/editors/bluefish.xml
===================================================================
--- trunk/BOOK/postlfs/editors/bluefish.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/postlfs/editors/bluefish.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,13 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY bluefish-download-http
-    "http://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
+  <!ENTITY bluefish-download-http "http://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
   <!ENTITY bluefish-download-ftp  " ">
-  <!ENTITY bluefish-md5sum        "6475325565fb0a003a75f88564b7835f">
-  <!ENTITY bluefish-size          "3.4 MB">
-  <!ENTITY bluefish-buildsize     "74 MB">
-  <!ENTITY bluefish-time          "0.5 SBU">
+  <!ENTITY bluefish-md5sum        "d7d2d3893c3f100b27f2ea2e3edfb8d0">
+  <!ENTITY bluefish-size          "3.5 MB">
+  <!ENTITY bluefish-buildsize     "70 MB">
+  <!ENTITY bluefish-time          "0.8 SBU">
 ]>
 
 <sect1 id="bluefish" xreflabel="Bluefish-&bluefish-version;">
@@ -32,7 +31,7 @@
 
     <para>
       <application>Bluefish</application> is a
-      <application>Gtk</application> text editor targeted towards
+      <application>GTK+</application> text editor targeted towards
       programmers and web designers, with many options to write websites,
       scripts and programming code. <application>Bluefish</application>
       supports many programming and markup languages, and it focuses on
@@ -81,17 +80,15 @@
     <para role="required">
       <xref linkend="gtk2"/> or <xref linkend="gtk3"/>.
       If both are installed, <command>configure</command> defaults to using
-      <application>Gtk 3</application>.
+      <application>GTK+ 3</application>.
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="enchant"/> (for spellchecking),
+      <xref linkend="enchant"/> (for spell checking),
       <xref linkend="gucharmap"/>,
-      <ulink url="http://code.google.com/p/jing-trang/">Jing</ulink>,
-      <xref linkend="pcre"/> and
-      <xref linkend="shared-mime-info"/>.
+      <ulink url="http://code.google.com/p/jing-trang/">Jing</ulink> and
+      <xref linkend="pcre"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -128,13 +125,15 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>bluefish</seg>
         <seg>
-          /usr/lib/bluefish
-          /usr/share/doc/bluefish,
-          /usr/share/xml/bluefish and
-          /usr/share/bluefish.
+          bluefish
         </seg>
+        <seg>
+          /usr/lib/bluefish,
+          /usr/share/bluefish,
+          /usr/share/doc/bluefish and
+          /usr/share/xml/bluefish
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -147,7 +146,7 @@
         <term><command>bluefish</command></term>
         <listitem>
           <para>
-            is a <application>Gtk</application> text editor for markup and
+            is a <application>GTK+</application> text editor for markup and
             programming.
           </para>
           <indexterm zone="bluefish bluefish-prog">
@@ -155,6 +154,9 @@
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>

Modified: trunk/BOOK/postlfs/filesystems/lvm2.xml
===================================================================
--- trunk/BOOK/postlfs/filesystems/lvm2.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/postlfs/filesystems/lvm2.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -6,13 +6,13 @@
 
   <!ENTITY lvm2-download-http " ">
   <!ENTITY lvm2-download-ftp  "ftp://sources.redhat.com/pub/lvm2/LVM2.&lvm2-version;.tgz">
-  <!ENTITY lvm2-md5sum        "bd470a802046c807603618a443732ea7">
+  <!ENTITY lvm2-md5sum        "4637503d792e9ee35a9b71387bcd8a93">
   <!ENTITY lvm2-size          "1.2 MB">
-  <!ENTITY lvm2-buildsize     "15 MB">
+  <!ENTITY lvm2-buildsize     "20 MB">
   <!ENTITY lvm2-time          "0.4 SBU">
 ]>
 
-<sect1 id="lvm2" xreflabel="lvm2-&lvm2-version;">
+<sect1 id="lvm2" xreflabel="LVM2-&lvm2-version;">
   <?dbhtml filename="lvm2.html"?>
 
   <sect1info>
@@ -20,54 +20,70 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>lvm2-&lvm2-version;</title>
+  <title>LVM2-&lvm2-version;</title>
 
   <indexterm zone="lvm2">
-    <primary sortas="a-lvm2">lvm2</primary>
+    <primary sortas="a-LVM2">LVM2</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to lvm2</title>
+    <title>Introduction to LVM2</title>
 
-    <para>The <application>lvm2</application> package is a package that manages
-    logical partitions. It allows spanning of file systems across multiple
-    physical disks and disk partitions and provides for dynamic growing or shrinking
-    of logical partitions.</para>
+    <para>
+      The <application>LVM2</application> package is a package that manages
+      logical partitions. It allows spanning of file systems across multiple
+      physical disks and disk partitions and provides for dynamic growing or
+      shrinking of logical partitions.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&lvm2-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&lvm2-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&lvm2-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&lvm2-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &lvm2-md5sum;</para>
+        <para>
+          Download MD5 sum: &lvm2-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &lvm2-size;</para>
+        <para>
+          Download size: &lvm2-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &lvm2-buildsize;</para>
+        <para>
+          Estimated disk space required: &lvm2-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &lvm2-time;</para>
+        <para>
+          Estimated build time: &lvm2-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/lvm2"/></para>
-
+      <ulink url="&blfs-wiki;/lvm2"/>
+    </para>
   </sect2>
 
-  <sect2 role="kernel" id='lvm2-kernel'>
+  <sect2 role="kernel" id="lvm2-kernel">
     <title>Kernel Configuration</title>
 
-    <para>Enable the following option in the kernel configuration
-    and recompile the kernel:</para>
+    <para>
+      Enable the following option in the kernel configuration
+      and recompile the kernel:
+    </para>
 
 <screen><literal>Device Drivers --->
   Multiple devices driver support (RAID and LVM): Y
@@ -83,10 +99,12 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of lvm2</title>
+    <title>Installation of LVM2</title>
 
-    <para>Install <application>lvm2</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>LVM2</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
             --exec-prefix= \
@@ -97,9 +115,13 @@
             --enable-udev_sync &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test 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>
 
@@ -108,21 +130,32 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--enable-applib</option>: This parameter enables
-    building of the shared application library..</para>
+    <para>
+      <option>--enable-applib</option>: This switch enables
+      building of the shared application library.
+    </para>
 
-    <para><option>--enable-cmdlib</option>: This parameter enables
-    building of the shared command library. It is required when
-    building the event daemon.</para>
+    <para>
+      <option>--enable-cmdlib</option>: This switch enables
+      building of the shared command library. It is required
+      when building the event daemon.
+    </para>
 
-    <para><option>--enable-pkgconfig</option>: This parameter enables
-    installation of pkgconfig support files.</para>
+    <para>
+      <option>--enable-pkgconfig</option>: This switch enables
+      installation of <command>pkg-config</command> support files.
+    </para>
 
-    <para><option>--enable-udev_sync</option>: This parameter enables
-    synchronisation with <application>Udev</application> processing.</para>
+    <para>
+     <option>--enable-udev_sync</option>: This switch enables
+      synchronisation with <application>Udev</application> processing.
+    </para>
 
-    <para><option>--enable-dmeventd</option>: This parameter enables
-    building of the device-mapper event daemon.</para>
+    <para>
+      <option>--enable-dmeventd</option>: This switch enables
+      building of the <application>Device Mapper</application>
+      event daemon.
+    </para>
 
   </sect2>
 
@@ -132,14 +165,16 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>dmsetup, fsadm, lvm, lvmconf, lvmdump, vgimportclone.  There
-        are also numerous symbolic links to lvm to implement specific 
-        functionality.</seg>
-        <seg>libdevmapper.so</seg>
-        <seg>None</seg>
+        <seg>
+          dmsetup, fsadm, lvm, lvmconf, lvmdump, vgimportclone. There
+          are also numerous symbolic links to lvm that implement
+          specific functionality.
+        </seg>
+        <seg>
+          libdevmapper.so, liblvm2app.so and liblvm2cmd.so
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -151,7 +186,9 @@
       <varlistentry id="dmsetup">
         <term><command>dmsetup</command></term>
         <listitem>
-          <para>is a low level logical volume management tool.</para>
+          <para>
+            is a low level logical volume management tool.
+          </para>
           <indexterm zone="lvm2 dmsetup">
             <primary sortas="b-dmsetup">dmsetup</primary>
           </indexterm>
@@ -161,7 +198,9 @@
       <varlistentry id="fsadm">
         <term><command>fsadm</command></term>
         <listitem>
-          <para>is a utility to resize or check filesystem on a device.</para>
+          <para>
+            is an utility used to resize or check filesystem on a device.
+          </para>
           <indexterm zone="lvm2 fsadm">
             <primary sortas="b-fsadm">fsadm</primary>
           </indexterm>
@@ -171,9 +210,12 @@
       <varlistentry id="lvm">
         <term><command>lvm</command></term>
         <listitem>
-          <para>provides the command-line tools for lvm2.  Commands are
-          implemented via sympolic links to this program to manage physical 
-          devices (pv*), volume groups (vg*), and logical volumes (lv*).</para>
+          <para>
+            provides the command-line tools for <application>LVM2</application>.
+            Commands are implemented via sympolic links to this program to
+            manage physical devices (pv*), volume groups (vg*) and logical
+            volumes (lv*).
+          </para>
           <indexterm zone="lvm2 lvm">
             <primary sortas="b-lvm">lvm</primary>
           </indexterm>
@@ -183,8 +225,10 @@
       <varlistentry id="lvmconf">
         <term><command>lvmconf</command></term>
         <listitem>
-          <para>is a script that modifies the locking configuration in 
-          an lvm configuration file.</para>
+          <para>
+            is a script that modifies the locking configuration in 
+            the <application>LVM2</application> configuration file.
+          </para>
           <indexterm zone="lvm2 lvmconf">
             <primary sortas="b-lvmconf">lvmconf</primary>
           </indexterm>
@@ -194,7 +238,10 @@
       <varlistentry id="lvmdump">
         <term><command>lvmdump</command></term>
         <listitem>
-          <para>is a tool to dump various information concerning lvm2.</para>
+          <para>
+            is a tool used to dump various information concerning
+            <application>LVM2</application>.
+          </para>
           <indexterm zone="lvm2 lvmdump">
             <primary sortas="b-lvmdump">lvmdump</primary>
           </indexterm>
@@ -204,7 +251,9 @@
       <varlistentry id="vgimportclone">
         <term><command>vgimportclone</command></term>
         <listitem>
-          <para>is used to import a duplicated VG (e.g. hardware snapshot).</para>
+          <para>
+            is used to import a duplicated VG (e.g. hardware snapshot).
+          </para>
           <indexterm zone="lvm2 vgimportclone">
             <primary sortas="b-vgimportclone">vgimportclone</primary>
           </indexterm>
@@ -214,8 +263,10 @@
       <varlistentry id="libdevmapper">
         <term><filename class='libraryfile'>libdevmapper.so</filename></term>
         <listitem>
-          <para>contains the <application>device-mapper</application> API
-          functions.</para>
+          <para>
+            contains the <application>Device Mapper</application> API
+            functions.
+          </para>
           <indexterm zone="lvm2 libdevmapper">
             <primary sortas="c-libdevmapper">libdevmapper.so</primary>
           </indexterm>

Modified: trunk/BOOK/postlfs/security/liboauth.xml
===================================================================
--- trunk/BOOK/postlfs/security/liboauth.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/postlfs/security/liboauth.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY liboauth-download-http "http://downloads.sourceforge.net/liboauth/liboauth-&liboauth-version;.tar.gz">
+  <!ENTITY liboauth-download-http "&sourceforge-repo;/liboauth/liboauth-&liboauth-version;.tar.gz">
   <!ENTITY liboauth-download-ftp  " ">
-  <!ENTITY liboauth-md5sum        "2a8e01914dc85f297ef69c1ab300d0ec">
-  <!ENTITY liboauth-size          "416 KB">
-  <!ENTITY liboauth-buildsize     "4.0 MB">
+  <!ENTITY liboauth-md5sum        "103ea90e3330dfcda7b6d59c4c697472">
+  <!ENTITY liboauth-size          "488 KB">
+  <!ENTITY liboauth-buildsize     "3.6 MB">
   <!ENTITY liboauth-time          "less than 0.1 SBU">
 ]>
 
@@ -29,33 +29,47 @@
   <sect2 role="package">
     <title>Introduction to liboauth</title>
 
-    <para><application>Liboauth</application> is a collection of POSIX-C
-    functions implementing the OAuth Core RFC 5849 standard. Liboauth provides
-    functions to escape and encode parameters according to OAuth specification and
-    offers high-level functionality to sign requests or verify OAuth signatures as
-    well as perform HTTP requests.</para>
+    <para>
+      <application>liboauth</application> is a collection of POSIX-C functions
+      implementing the OAuth Core RFC 5849 standard. Liboauth provides functions
+      to escape and encode parameters according to OAuth specification and
+      offers high-level functionality to sign requests or verify OAuth signatures
+      as well as perform HTTP requests.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&liboauth-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&liboauth-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&liboauth-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&liboauth-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &liboauth-md5sum;</para>
+        <para>
+          Download MD5 sum: &liboauth-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &liboauth-size;</para>
+        <para>
+          Download size: &liboauth-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &liboauth-buildsize;</para>
+        <para>
+          Estimated disk space required: &liboauth-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &liboauth-time;</para>
+        <para>
+          Estimated build time: &liboauth-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -64,7 +78,8 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="curl"/> and
-      <xref linkend="openssl"/> or <xref linkend="nss"/>
+      <xref linkend="openssl"/> or
+      <xref linkend="nss"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -73,43 +88,51 @@
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/liboauth"/></para>
-
+      <ulink url="&blfs-wiki;/liboauth"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of liboauth</title>
 
-    <para>Install <application>liboauth</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>liboauth</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
-    <para>If you have <xref linkend="doxygen"/>, issue <command>make dox</command>
-    to build documentation.</para>
+    <para>
+      If you have <xref linkend="doxygen"/>, issue <command>make dox</command>
+      to build documentation.
+    </para>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test 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>
 
-    <para>If you have built documentation previously, install it with following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you have built documentation previously, install it with following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
 
-<screen role="root">
-<userinput>mkdir -pv /usr/share/doc/liboauth-&liboauth-version; &&
-cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</userinput>
-</screen>
+<screen role="root"><userinput>mkdir -pv /usr/share/doc/liboauth-&liboauth-version; &&
+cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</userinput></screen>
 
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This switch prevents static
-    libraries from being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para><option>--enable-nss</option>: Use NSS instead of OpenSSL.</para>
 
@@ -119,14 +142,16 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>liboauth.{so,a}</seg>
-        <seg></seg>
+        <seg>
+          liboauth.so
+        </seg>
+        <seg>
+          /usr/share/doc/liboauth-&liboauth-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -136,14 +161,16 @@
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="liboauth-lib">
-        <term><filename class='libraryfile'>liboauth.{so,a}</filename></term>
+        <term><filename class='libraryfile'>liboauth.so</filename></term>
         <listitem>
-          <para>provides functions to escape and encode stings according to
-          OAuth specifications and offers high-level functionality built 
-          on top to sign requests or verify signatures using either NSS or 
-          OpenSSL for calculating the hash/signatures.</para>
+          <para>
+            provides functions to escape and encode stings according to
+            OAuth specifications and offers high-level functionality built 
+            on top to sign requests or verify signatures using either NSS or 
+            OpenSSL for calculating the hash/signatures.
+          </para>
           <indexterm zone="liboauth liboauth-lib">
-            <primary sortas="c-liboauth">liboauth.{so,a}</primary>
+            <primary sortas="c-liboauth">liboauth.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/postlfs/security/shadow.xml
===================================================================
--- trunk/BOOK/postlfs/security/shadow.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/postlfs/security/shadow.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,12 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY shadow-download-http
-  "http://pkg-shadow.alioth.debian.org/releases/shadow-&shadow-version;.tar.bz2 ">
+  <!ENTITY shadow-download-http "http://pkg-shadow.alioth.debian.org/releases/shadow-&shadow-version;.tar.bz2">
   <!ENTITY shadow-download-ftp  " ">
-  <!ENTITY shadow-md5sum        "d5f7a588fadb79faeb4b08b1eee82e9a">
+  <!ENTITY shadow-md5sum        "a00449aa439c69287b6d472191dc2247">
   <!ENTITY shadow-size          "2.1 MB">
-  <!ENTITY shadow-buildsize     "35 MB">
+  <!ENTITY shadow-buildsize     "38 MB">
   <!ENTITY shadow-time          "0.3 SBU">
 ]>
 
@@ -78,16 +77,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/shadow-&shadow-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Shadow Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -140,8 +129,6 @@
 sed -i -e 's at PATH=/sbin:/bin:/usr/sbin:/usr/bin@&:/usr/local/sbin:/usr/local/bin@' \
        -e 's at PATH=/bin:/usr/bin@&:/usr/local/bin@' etc/login.defs &&
 
-patch -Np1 -i ../shadow-&shadow-version;-fixes-1.patch &&
-
 ./configure --prefix=/usr --sysconfdir=/etc &&
 make</userinput></screen>
 
@@ -652,5 +639,7 @@
       A list of the installed files, along with their short descriptions can be
       found at <ulink url="&lfs-root;/chapter06/shadow.html#contents-shadow"/>.
     </para>
+
   </sect2>
+
 </sect1>

Modified: trunk/BOOK/x/installing/xcb-util.xml
===================================================================
--- trunk/BOOK/x/installing/xcb-util.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/x/installing/xcb-util.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xcb-util-download-http "http://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.bz2">
-  <!ENTITY xcb-util-download-ftp  " ">
-  <!ENTITY xcb-util-md5sum        "8ce019c4bbf20dce246b98f177cfccff">
-  <!ENTITY xcb-util-size          "268 KB">
-  <!ENTITY xcb-util-buildsize     "2.7 MB">
-  <!ENTITY xcb-util-time          "0.1 SBU">
+  <!ENTITY xcb-util-download-http "&xorg-download-http;/xcb/xcb-util-&xcb-util-version;.tar.bz2">
+  <!ENTITY xcb-util-download-ftp  "&xorg-download-ftp;/xcb/xcb-util-&xcb-util-version;.tar.bz2">
+  <!ENTITY xcb-util-md5sum        "01dcc7a16d5020530552712710646ea2">
+  <!ENTITY xcb-util-size          "284 KB">
+  <!ENTITY xcb-util-buildsize     "2.5 MB">
+  <!ENTITY xcb-util-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="xcb-util" xreflabel="xcb-util-&xcb-util-version;">
@@ -29,58 +29,80 @@
   <sect2 role="package">
     <title>Introduction to xcb-util</title>
 
-    <para>The <application>xcb-util</application> package provides additional
-    extensions to the <application>XCB</application> library, many that were
-    previously found in <application>Xlib</application>, but are not part of
-    core X protocol.</para>
+    <para>
+      The <application>xcb-util</application> package provides additional
+      extensions to the <application>XCB</application> library, many that were
+      previously found in <application>Xlib</application>, but are not part of
+      core X protocol.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xcb-util-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&xcb-util-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&xcb-util-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&xcb-util-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &xcb-util-md5sum;</para>
+        <para>
+          Download MD5 sum: &xcb-util-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &xcb-util-size;</para>
+        <para>
+          Download size: &xcb-util-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xcb-util-buildsize;</para>
+        <para>
+          Estimated disk space required: &xcb-util-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &xcb-util-time;</para>
+        <para>
+          Estimated build time: &xcb-util-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">xcb-util Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxcb"/> and
-    <xref linkend="gperf"/></para>
+    <para role="required">
+      <xref linkend="gperf"/> and
+      <xref linkend="libxcb"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xcb-util"/></para>
-
+      <ulink url="&blfs-wiki;/xcb-util"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of xcb-util</title>
 
-    <para>Install <application>xcb-util</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>xcb-util</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure $XORG_CONFIG &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test 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>
 
@@ -90,14 +112,10 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
         <seg>libxcb-util.{a,so}</seg>
-        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -109,7 +127,9 @@
       <varlistentry id="libxcb-util">
         <term><filename class='libraryfile'>libxcb-util.{so,a}</filename></term>
         <listitem>
-          <para>Provides utility functions for other XCB utilities.</para>
+          <para>
+            Provides utility functions for other XCB utilities.
+          </para>
           <indexterm zone="xcb-util libxcb-util">
             <primary sortas="c-xcb-util">libxcb-util.{so,a}</primary>
           </indexterm>

Modified: trunk/BOOK/xsoft/other/pidgin.xml
===================================================================
--- trunk/BOOK/xsoft/other/pidgin.xml	2012-07-30 11:52:19 UTC (rev 10483)
+++ trunk/BOOK/xsoft/other/pidgin.xml	2012-07-31 23:44:40 UTC (rev 10484)
@@ -4,13 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY pidgin-download-http
-    "&sourceforge-repo;/pidgin/pidgin-&pidgin-version;.tar.bz2">
+  <!ENTITY pidgin-download-http "&sourceforge-repo;/pidgin/pidgin-&pidgin-version;.tar.bz2">
   <!ENTITY pidgin-download-ftp  " ">
-  <!ENTITY pidgin-md5sum        "264f9ae89742b8ee168306b85d2fb51e">
+  <!ENTITY pidgin-md5sum        "a0ebb55083e2dfc22a75c504acde6a07">
   <!ENTITY pidgin-size          "9.6 MB">
   <!ENTITY pidgin-buildsize     "255 MB">
-  <!ENTITY pidgin-time          "2.3 SBU">
+  <!ENTITY pidgin-time          "3.0 SBU">
 ]>
 
 <sect1 id="pidgin" xreflabel="Pidgin-&pidgin-version;">
@@ -41,22 +40,34 @@
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&pidgin-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&pidgin-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&pidgin-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&pidgin-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &pidgin-md5sum;</para>
+        <para>
+          Download MD5 sum: &pidgin-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &pidgin-size;</para>
+        <para>
+          Download size: &pidgin-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &pidgin-buildsize;</para>
+        <para>
+          Estimated disk space required: &pidgin-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &pidgin-time;</para>
+        <para>
+          Estimated build time: &pidgin-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -77,36 +88,36 @@
     <para>
       SSL support is required for the MSN Messenger, Yahoo!, Novel Groupwise and
       Google Talk protocol plugins. <application>GnuTLS</application> is the
-      preferred method (the Mozilla nss API is more likely to change and this
+      preferred method (the Mozilla NSS API is more likely to change and this
       can cause problems).
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="avahi"/> (required for the Bonjour plugin),
+      <xref linkend="check"/> (only used during the test suite),
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="evolution-data-server"/>,
+      <xref linkend="farstream"/> (required for video and voice support),
+      <xref linkend="GConf"/>,
+      <xref linkend="gstreamer"/> (required for audio support),
       <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>,
-      <xref linkend="startup-notification"/>,
       <xref linkend="intltool"/>,
-      <xref linkend="GConf"/>,
-      <xref linkend="dbus-glib"/>,
       <xref linkend="libidn"/>,
+      <ulink url="http://toxygen.net/libgadu/">libgadu</ulink>,
+      <ulink url="http://meanwhile.sourceforge.net/">Meanwhile</ulink>
+      (required for Sametime protocol support),
+      <xref linkend="mitkrb"/> (required for Kerberos support in the Zephyr
+      module),
+      <xref linkend="NetworkManager"/>,
       <ulink url="http://silcnet.org/software/">SILC Client</ulink>,
       <ulink url="http://silcnet.org/software/">SILC Toolkit</ulink>,
-      <ulink url="http://packages.debian.org/stable/source/zephyr">zephyr</ulink>,
-      <xref linkend="gstreamer"/> (required for audio support),
-      <xref linkend="farstream"/> (required for video and voice support),
-      <xref linkend="evolution-data-server"/>,
+      <xref linkend="startup-notification"/>,
       <xref linkend="sqlite"/> (required for the Contact Availability Prediction
       plugin),
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="mitkrb"/> (required for Kerberos support in the Zephyr
-      module),
-      <xref linkend="avahi"/>, (required for the Bonjour plugin),
-      <ulink url="http://meanwhile.sourceforge.net/">Meanwhile</ulink>
-      (required for Sametime protocol support),
-      <xref linkend="NetworkManager"/>,
-      <ulink url="http://toxygen.net/libgadu/">libgadu</ulink>,
-      <xref linkend="check"/> (only used during the test suite) and
-      <xref linkend="tcl"/>
+      <xref linkend="tcl"/> and
+      <ulink url="http://packages.debian.org/stable/source/zephyr">Zephyr</ulink>
     </para>
 
     <para condition="html" role="usernotes">
@@ -122,9 +133,16 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-meanwhile --disable-avahi  \
-  --disable-nm --disable-tcl --disable-idn --disable-gstreamer \
-  --disable-vv --disable-gtkspell --disable-dbus LIBS=-lX11    &&
+<screen><userinput>./configure --prefix=/usr       \
+            --disable-avahi     \
+            --disable-dbus      \
+            --disable-gtkspell  \
+            --disable-gstreamer \
+            --disable-meanwhile \
+            --disable-idn       \
+            --disable-nm        \
+            --disable-vv        \
+            --disable-tcl &&
 make</userinput></screen>
 
     <para>
@@ -133,7 +151,9 @@
       API documentation, issue: <command>make docs</command>
     </para>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -156,27 +176,19 @@
     <title>Command Explanations</title>
 
     <para>
-      <option>--disable-meanwhile</option>: Remove this option if you've
-      installed <ulink url="http://meanwhile.sourceforge.net/">Meanwhile</ulink>
-    </para>
-
-    <para>
       <option>--disable-avahi</option>: Remove this option if you've
-    installed <xref linkend="avahi"/>.</para>
-
-    <para>
-      <option>--disable-nm</option>: Remove this option if you've installed
-      <xref linkend="NetworkManager"/>.
+      installed <xref linkend="avahi"/>.
     </para>
 
     <para>
-      <option>--disable-tcl</option>: Remove this option if you've installed
-      <xref linkend="tcl"/>.
+      <option>--disable-dbus</option>: Remove this option if you've installed
+      <xref linkend="dbus"/>.
     </para>
 
     <para>
-      <option>--disable-idn</option>: Remove this option if you've installed
-      <xref linkend="libidn"/>.
+      <option>--disable-gtkspell</option>: Spellchecking. Remove this option if
+      you've installed
+      <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>.
     </para>
 
     <para>
@@ -185,32 +197,30 @@
     </para>
 
     <para>
-      <option>--disable-vv</option>: Video and voice. Remove this option if
-      you've installed <xref linkend="farstream"/>.
+      <option>--disable-meanwhile</option>: Remove this option if you've
+      installed <ulink url="http://meanwhile.sourceforge.net/">Meanwhile</ulink>
     </para>
 
     <para>
-      <option>--disable-gtkspell</option>: Spellchecking. Remove this option if
-      you've installed
-      <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>.
+      <option>--disable-idn</option>: Remove this option if you've installed
+      <xref linkend="libidn"/>.
     </para>
 
     <para>
-      <option>--disable-dbus</option>: Remove this option if you've installed
-      <xref linkend="dbus"/>.
+      <option>--disable-nm</option>: Remove this option if you've installed
+      <xref linkend="NetworkManager"/>.
     </para>
 
     <para>
-      <parameter>LIBS=-lX11</parameter>: This parameter needs to be passed to
-      configure to avoid a link time error with recent versions of binutils.
+      <option>--disable-vv</option>: Video and voice. Remove this option if
+      you've installed <xref linkend="farstream"/>.
     </para>
 
     <para>
-      <option>--disable-gtkui</option>: Use this option if you've not installed
-      <xref linkend="gtk2"/> and you just want the
-      <application>Ncurses</application> based <command>finch</command>
-      program.
+      <option>--disable-tcl</option>: Remove this option if you've installed
+      <xref linkend="tcl"/>.
     </para>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -218,8 +228,10 @@
 
     <sect3 id="pidgin-config">
       <title>Config Files</title>
-      <para><filename>~/.purple/*</filename> and
-      <filename>~/.gtkrc-02</filename></para>
+      <para>
+        <filename>~/.purple/*</filename> and
+        <filename>~/.gtkrc-02</filename>
+      </para>
 
       <indexterm zone="pidgin pidgin-config">
         <primary sortas="e-AA.purple-*">~/.purple/*</primary>
@@ -241,7 +253,9 @@
         was installed during the package installation and can be used as a
         starting point or reference.
       </para>
+
     </sect3>
+
   </sect2>
 
   <sect2 role="content">
@@ -254,20 +268,12 @@
 
       <seglistitem>
         <seg>
-          finch,
-          pidgin,
-          purple-client-example,
-          purple-remote,
-          purple-send,
-          purple-send-async and
+          finch, pidgin, purple-client-example,
+          purple-remote, purple-send, purple-send-async and
           purple-url-handler
         </seg>
         <seg>
-          libgnt.so,
-          libpurple.so and
-          libpurple-client.so along with numerous plugin and support modules
-          located in /usr/lib/finch, /usr/lib/gnt, /usr/lib/pidgin and
-          /usr/lib/purple-2
+          libgnt.so, libpurple.so and libpurple-client.so
         </seg>
         <seg>
           /usr/include/finch,
@@ -294,7 +300,9 @@
       <varlistentry id="pidgin-prog">
         <term><command>pidgin</command></term>
         <listitem>
-          <para>is a Gtk+-2 instant messaging client</para>
+          <para>
+            is a GTK+ 2 instant messaging client.
+          </para>
           <indexterm zone="pidgin pidgin-prog">
             <primary sortas="b-pidgin">pidgin</primary>
           </indexterm>
@@ -304,12 +312,17 @@
       <varlistentry id="finch">
         <term><command>finch</command></term>
         <listitem>
-          <para>is a text-based instant messaging client</para>
+          <para>
+            is a text-based instant messaging client.
+          </para>
           <indexterm zone="pidgin finch">
             <primary sortas="b-finch">finch</primary>
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>




More information about the blfs-book mailing list