Index: general/sysutils/libarchive.xml
===================================================================
--- general/sysutils/libarchive.xml	(revision 9ca304af6fd29b445a6c00ebaa3146fd3b2f1289)
+++ general/sysutils/libarchive.xml	(revision 5b38e374f3078b9231fcc5187ebd74fe015080ec)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libarchive-download-http "http://github.com/downloads/libarchive/libarchive/libarchive-&libarchive-version;.tar.gz">
+  <!ENTITY libarchive-download-http "http://www.libarchive.org/downloads/libarchive-&libarchive-version;.tar.gz">
   <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "af443ca9a10ddbcbf00f7ae34ca7fc16">
-  <!ENTITY libarchive-size          "3.5 MB">
-  <!ENTITY libarchive-buildsize     "39 MB">
+  <!ENTITY libarchive-md5sum        "efad5a503f66329bb9d2f4308b5de98a">
+  <!ENTITY libarchive-size          "4.4 MB">
+  <!ENTITY libarchive-buildsize     "60 MB">
   <!ENTITY libarchive-time          "0.5 SBU">
 ]>
@@ -30,6 +30,8 @@
     <title>Introduction to libarchive</title>
 
-    <para>The <application>libarchive</application> library provides a single interface for
-    reading/writing various compression formats.</para>
+    <para>
+      The <application>libarchive</application> library provides a single
+      interface for reading/writing various compression formats.
+    </para>
 
     &lfs72_checked;
@@ -38,32 +40,34 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libarchive-download-http;"/></para>
+        <para>
+Download (HTTP): <ulink url="&libarchive-download-http;"/>
+</para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libarchive-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libarchive-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libarchive-md5sum;</para>
+        <para>
+          Download MD5 sum: &libarchive-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libarchive-size;</para>
+        <para>
+          Download size: &libarchive-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libarchive-buildsize;</para>
+        <para>
+          Estimated disk space required: &libarchive-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libarchive-time;</para>
+        <para>
+          Estimated build time: &libarchive-time;
+        </para>
       </listitem>
     </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libarchive-&libarchive-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
 
     <bridgehead renderas="sect3">libarchive Dependencies</bridgehead>
@@ -71,14 +75,15 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="libxml2"/> or
-    <xref linkend="expat"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="nettle"/> and
-    <xref linkend="acl"/>
+      <xref linkend="acl"/>,
+      <xref linkend="libxml2"/> or
+      <xref linkend="expat"/>,
+      <xref linkend="LZO"/>,
+      <xref linkend="nettle"/> and
+      <xref linkend="openssl"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libarchive"/></para>
-
+      <ulink url="&blfs-wiki;/libarchive"/>
+    </para>
   </sect2>
 
@@ -86,14 +91,19 @@
     <title>Installation of libarchive</title>
 
-    <para>Install <application>libarchive</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libarchive</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <para>
+      To test the results, issue: <userinput>make check</userinput>.
+    </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>
@@ -101,9 +111,9 @@
   </sect2>
 
-    <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This option prevents building the
-    static archive versions of the libraries.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -118,7 +128,13 @@
 
       <seglistitem>
-        <seg>bsdcpio and bsdtar</seg>
-        <seg>libarchive.so</seg>
-        <seg>none</seg>
+        <seg>
+          bsdcpio and bsdtar
+        </seg>
+        <seg>
+          libarchive.so
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -132,5 +148,7 @@
         <term><command>bsdcpio</command></term>
         <listitem>
-          <para>is a tool similar to <command>cpio</command>.</para>
+          <para>
+            is a tool similar to <command>cpio</command>.
+          </para>
           <indexterm zone="libarchive bsdcpio">
             <primary sortas="b-bsdcpio">bsdcpio</primary>
@@ -139,11 +157,25 @@
       </varlistentry>
 
-
       <varlistentry id="bsdtar">
         <term><command>bsdtar</command></term>
         <listitem>
-          <para>is a tool similar to GNU <command>tar</command>.</para>
+          <para>
+            is a tool similar to GNU <command>tar</command>.
+          </para>
           <indexterm zone="libarchive bsdtar">
             <primary sortas="b-bsdtar">bsdtar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libarchive-lib">
+        <term><filename class="libraryfile">libarchive.so</filename></term>
+        <listitem>
+          <para>
+            is a library that can create and read several streaming
+            archive formats.
+          </para>
+          <indexterm zone="libarchive libarchive-lib">
+            <primary sortas="c-libarchive">libarchive.so</primary>
           </indexterm>
         </listitem>
Index: general/sysutils/raptor.xml
===================================================================
--- general/sysutils/raptor.xml	(revision 9ca304af6fd29b445a6c00ebaa3146fd3b2f1289)
+++ general/sysutils/raptor.xml	(revision 5b38e374f3078b9231fcc5187ebd74fe015080ec)
@@ -7,7 +7,7 @@
   <!ENTITY raptor-download-http "http://download.librdf.org/source/raptor2-&raptor-version;.tar.gz">
   <!ENTITY raptor-download-ftp  " ">
-  <!ENTITY raptor-md5sum        "ac60858b875aab8fa7917f21a1237aa9">
-  <!ENTITY raptor-size          "1.7 MB">
-  <!ENTITY raptor-buildsize     "19 MB">
+  <!ENTITY raptor-md5sum        "4ceb9316488b0ea01acf011023cf7fff">
+  <!ENTITY raptor-size          "1.8 MB">
+  <!ENTITY raptor-buildsize     "30 MB">
   <!ENTITY raptor-time          "0.2 SBU">
 ]>
@@ -30,7 +30,9 @@
     <title>Introduction to Raptor</title>
 
-    <para><application>Raptor</application> is a C library that provides a set
-    of parsers and serializers that generate Resource Description Framework (RDF)
-    triples.</para>
+    <para>
+      <application>Raptor</application> is a C library that provides a set of
+      parsers and serializers that generate Resource Description Framework
+      (RDF) triples.
+    </para>
 
     &lfs72_checked;
@@ -39,48 +41,53 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&raptor-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&raptor-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&raptor-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&raptor-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &raptor-md5sum;</para>
+        <para>
+          Download MD5 sum: &raptor-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &raptor-size;</para>
+        <para>
+          Download size: &raptor-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &raptor-buildsize;</para>
+        <para>
+          Estimated disk space required: &raptor-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &raptor-time;</para>
+        <para>
+          Estimated build time: &raptor-time;
+        </para>
       </listitem>
     </itemizedlist>
 
- <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/raptor-&raptor-version;-curl.patch"/></para>
-      </listitem>
-    </itemizedlist>
-    -->
     <bridgehead renderas="sect3">Raptor Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="expat"/> or <xref linkend="libxml2"/>,
-    <xref linkend="curl"/>
+      <xref linkend="curl"/> and
+      <xref linkend="libxslt"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="gtk2"/>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="icu"/> and
+      <ulink url="http://lloyd.github.com/yajl/">libyajl</ulink>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/raptor"/></para>
-
+      <ulink url="&blfs-wiki;/raptor"/>
+    </para>
   </sect2>
 
@@ -88,9 +95,10 @@
     <title>Installation of Raptor</title>
 
-    <para>Install <application>Raptor</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Raptor</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -99,5 +107,7 @@
     </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,6 +118,13 @@
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This option prevents compiling the
-    static archive versions of the libraries.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--with-icu-config=/usr/bin/icu-config</parameter>: Use
+      this switch if you have installed <xref linkend="icu"/> and wish
+      to build <application>Raptor</application> with its support.
+    </para>
+
   </sect2>
 
@@ -121,7 +138,14 @@
 
       <seglistitem>
-        <seg>rapper</seg>
-        <seg>libraptor2.so</seg>
-        <seg>/usr/include/raptor2 and /usr/share/gtk-doc/html/raptor2</seg>
+        <seg>
+          rapper
+        </seg>
+        <seg>
+          libraptor2.so
+        </seg>
+        <seg>
+          /usr/include/raptor2 and
+          /usr/share/gtk-doc/html/raptor2
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -135,7 +159,21 @@
         <term><command>rapper</command></term>
         <listitem>
-          <para>is a RDF parsing and serializing utility.</para>
+          <para>
+            is a RDF parsing and serializing utility.
+          </para>
           <indexterm zone="raptor rapper">
             <primary sortas="b-rapper">rapper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libraptor2">
+        <term><filename class="libraryfile">libraptor2.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Raptor</application> API functions.
+          </para>
+          <indexterm zone="raptor libraptor2">
+            <primary sortas="c-libraptor2">libraptor2.so</primary>
           </indexterm>
         </listitem>
Index: general/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision 9ca304af6fd29b445a6c00ebaa3146fd3b2f1289)
+++ general/sysutils/sg3_utils.xml	(revision 5b38e374f3078b9231fcc5187ebd74fe015080ec)
@@ -7,8 +7,8 @@
   <!ENTITY sg3_utils-download-http "http://sg.danny.cz/sg/p/sg3_utils-&sg3_utils-version;.tar.xz">
   <!ENTITY sg3_utils-download-ftp  " ">
-  <!ENTITY sg3_utils-md5sum        "eeec89247acd9c8aef8dd550f43cfdc5">
-  <!ENTITY sg3_utils-size          "628 KB">
-  <!ENTITY sg3_utils-buildsize     "15.9 MB">
-  <!ENTITY sg3_utils-time          "0.2 SBU">
+  <!ENTITY sg3_utils-md5sum        "01600b51611388c65b6954d99197d529">
+  <!ENTITY sg3_utils-size          "636 KB">
+  <!ENTITY sg3_utils-buildsize     "21 MB">
+  <!ENTITY sg3_utils-time          "0.3 SBU">
 ]>
 
@@ -76,6 +76,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/sg3_utils"/></para>
-
+      <ulink url="&blfs-wiki;/sg3_utils"/>
+    </para>
   </sect2>
 
@@ -121,13 +121,15 @@
       <seglistitem>
         <seg>
-          sg_dd, sg_decode_sense, sg_emc_trespass, sg_format, sg_get_config,
-          sg_get_lba_status, sg_ident, sginfo, sg_inq, sg_logs, sg_luns, sg_map,
-          sg_map26, sgm_dd, sg_modes, sg_opcodes, sgp_dd, sg_persist, sg_prevent,
-          sg_raw, sg_rbuf, sg_rdac, sg_read, sg_read_block_limits, sg_read_buffer,
-          sg_readcap, sg_read_long, sg_reassign, sg_referrals, sg_requests, sg_reset,
-          sg_rmsn, sg_rtpg, sg_safte, sg_sanitize, sg_sat_identify, sg_sat_phy_event,
-          sg_sat_set_features, sg_scan, sg_senddiag, sg_ses, sg_start, sg_stpg,
-          sg_sync, sg_test_rwbuf, sg_turs, sg_unmap, sg_verify, sg_vpd,
-          sg_write_buffer, sg_write_long, sg_write_same and sg_wr_mode
+          sg_compare_and_write, sg_copy_results, sg_dd, sg_decode_sense,
+          sg_emc_trespass, sg_format, sg_get_config, sg_get_lba_status,
+          sg_ident, sginfo, sg_inq, sg_logs, sg_luns, sg_map, sg_map26,
+          sgm_dd, sg_modes, sg_opcodes, sgp_dd, sg_persist, sg_prevent, sg_raw,
+          sg_rbuf, sg_rdac, sg_read, sg_read_block_limits, sg_read_buffer,
+          sg_readcap, sg_read_long, sg_reassign, sg_referrals, sg_requests,
+          sg_reset, sg_rmsn, sg_rtpg, sg_safte, sg_sanitize, sg_sat_identify,
+          sg_sat_phy_event, sg_sat_set_features, sg_scan, sg_senddiag,
+          sg_ses, sg_start, sg_stpg, sg_sync, sg_test_rwbuf, sg_turs, sg_unmap,
+          sg_verify, sg_vpd, sg_write_buffer, sg_write_long, sg_write_same,
+          sg_wr_mode and sg_xcopy
         </seg>
         <seg>
@@ -145,4 +147,28 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="sg_compare_and_write">
+        <term><command>sg_compare_and_write</command></term>
+        <listitem>
+          <para>
+            sends the SCSI COMPARE AND WRITE command to device.
+          </para>
+          <indexterm zone="sg3_utils sg_compare_and_write">
+            <primary sortas="b-sg_compare_and_write">sg_compare_and_write</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sg_copy_results">
+        <term><command>sg_copy_results</command></term>
+        <listitem>
+          <para>
+            sends the SCSI RECEIVE COPY RESULTS command (XCOPY related).
+          </para>
+          <indexterm zone="sg3_utils sg_copy_results">
+            <primary sortas="b-sg_copy_results">sg_copy_results</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="sg_dd">
         <term><command>sg_dd</command></term>
@@ -799,6 +825,19 @@
       </varlistentry>
 
+      <varlistentry id="sg_xcopy">
+        <term><command>sg_xcopy</command></term>
+        <listitem>
+          <para>
+            copies data to and from files and devices
+            using SCSI EXTENDED COPY (XCOPY).
+          </para>
+          <indexterm zone="sg3_utils sg_xcopy">
+            <primary sortas="b-sg_xcopy">sg_xcopy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libsgutils2">
-        <term><filename class='libraryfile'>libsgutils2.so</filename></term>
+        <term><filename class="libraryfile">libsgutils2.so</filename></term>
         <listitem>
           <para>
