Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision 2a7340c2bec548066b443af0eb9125eba8651ca5)
+++ general/genlib/libusb.xml	(revision fa0eb91a9c1cc9b1a1a800335f1514cba28b9e21)
@@ -8,6 +8,6 @@
 <!ENTITY libusb-download-ftp " ">
 <!ENTITY libusb-size "314 KB">
-<!ENTITY libusb-buildsize "2.1 MB">
-<!ENTITY libusb-time "0.03 SBU">
+<!ENTITY libusb-buildsize "4.5 MB (includes HTML documentation installation)">
+<!ENTITY libusb-time "0.25 SBU">
 ]>
 
@@ -19,4 +19,7 @@
 <?dbhtml filename="libusb.html"?>
 <title>libusb-&libusb-version;</title>
+<indexterm zone="libusb">
+<primary sortas="a-Libusb">Libusb</primary>
+</indexterm>
 
 <sect2>
@@ -28,14 +31,21 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&libusb-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&libusb-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &libusb-size;</para></listitem>
-<listitem><para>Estimated disk space required: &libusb-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &libusb-time;</para></listitem></itemizedlist>
+<listitem><para>Download (HTTP): 
+<ulink url="&libusb-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&libusb-download-ftp;"/></para></listitem>
+<listitem><para>Download size: 
+&libusb-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&libusb-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&libusb-time;</para></listitem></itemizedlist>
 </sect3>
 
 <sect3><title><application>libusb</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openjade"/> and <xref linkend="sgml-dtd-3"/></para></sect4>
+<para><xref linkend="openjade"/> and <xref linkend="sgml-dtd-3"/> (both 
+required to build the <acronym>HTML</acronym> documentation)</para>
+</sect4>
 </sect3>
 
@@ -48,7 +58,18 @@
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --disable-build-docs &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+<screen><userinput><command>libtoolize -f &amp;&amp;
+autoreconf -f &amp;&amp;
+./configure --prefix=/usr --disable-build-docs &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+
+<para>If you built the <acronym>HTML</acronym> documentation, install it using 
+the following commands:</para>
+
+<screen><userinput role='root'><command>install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/html &amp;&amp;
+install -v -m644 doc/html/* /usr/share/doc/libusb-&libusb-version;/html</command></userinput></screen>
 
 </sect2>
@@ -56,4 +77,12 @@
 <sect2>
 <title>Command explanations</title>
+
+<para><command>libtoolize -f</command>: There is a mismatch in the Autotools 
+with <acronym>LFS</acronym>-6.0. This command forces the build to use the 
+system installed <command>libtool</command> tools so that the shared library 
+is created correctly.</para>
+
+<para><command>autoreconf -f</command>: This command recreates some of the 
+Autotools, required by running <command>libtoolize</command>.</para>
 
 <para><option>--disable-build-docs</option>: This switch avoids building the
@@ -63,5 +92,5 @@
 the package to accomplish this:</para>
 
-<screen><userinput><command>sed -i.orig \
+<screen><userinput role='root'><command>sed -i.orig \
     -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
     /etc/sgml/catalog \
@@ -80,22 +109,17 @@
 using the following command:</para>
 
-<screen><userinput><command>groupadd -g 14 usb</command></userinput></screen>
+<screen><userinput role='root'><command>groupadd -g 14 usb</command></userinput></screen>
 
-<!-- <para>Compiling the <quote>USB device filesystem</quote> as a kernel module is 
-not recommended. However, if you did compile it as a module, you can install an 
-init script to mount usbfs at system boot-up. An init script is included in the 
-<xref linkend="intro-important-bootscripts"/> package and is installed using 
-the following command:</para>
-
-<screen><userinput><command>make install-usb</command></userinput></screen> -->
-
-<para>Ensure that you have compiled the <quote>USB device filesystem</quote> 
-directly into the kernel or compiled it as a module (listing the resulting
-<quote>usbcore</quote> module in the 
+<para id="libusb-kernel">Ensure that you have compiled the <quote>USB device 
+filesystem</quote> directly into the kernel or compiled it as a module 
+(listing the resulting <quote>usbcore</quote> module in the 
 <filename>/etc/sysconfig/modules</filename> file). You should also have an 
 entry similar to the line below in your <filename>/etc/fstab</filename> 
 file:</para>
+<indexterm zone="libusb libusb-kernel">
+<primary sortas="d-USB-device-filesystem">USB device filesystem</primary>
+</indexterm>
 
-<screen><userinput>usbfs  /proc/bus/usb  usbfs  devgid=14,devmode=0660  0  0</userinput></screen>
+<screen><userinput role='root'>usbfs  /proc/bus/usb  usbfs  devgid=14,devmode=0660  0  0</userinput></screen>
 
 </sect2>
@@ -104,20 +128,39 @@
 <title>Contents</title>
 
-<para>The <application>libusb</application> package contains
-<filename class="libraryfile">libusb</filename> libraries,
-the <filename>/usr/include/usb.h</filename> header,
-and a <command>usb-config</command> script.</para>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directory</segtitle>
 
-</sect2>
+<seglistitem>
+<seg>usb-config</seg>
+<seg>libusb.[so,a]</seg>
+<seg>/usr/share/doc/libusb-&libusb-version;</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>libusb libraries</title>
-<para><filename class="libraryfile">libusb</filename> libraries contain C 
-functions for accessing <acronym>USB</acronym> hardware.</para></sect3>
+<varlistentry id="usb-config">
+<term><command>usb-config</command></term>
+<listitem><para>is a script that provides the right compiler and linker 
+flags for programs using 
+<filename class='libraryfile'>libusb</filename>.</para>
+<indexterm zone="libusb usb-config">
+<primary sortas="b-usb-config">usb-config</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>usb-config</title>
-<para>The <command>usb-config</command> script provides the right
-compiler and linker flags for programs using this library.</para></sect3>
+<varlistentry id="libusb-lib">
+<term><filename class='libraryfile'>libusb.[so,a]</filename></term>
+<listitem><para> libraries contain C functions for accessing 
+<acronym>USB</acronym> hardware.</para>
+<indexterm zone="libusb libusb-lib">
+<primary sortas="c-libusb">libusb.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
