From 838cd0f72168fbe6c0ba8d85d60be538d755bfaf Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 25 Oct 2014 01:52:14 +0000
Subject: [PATCH] Finish update to usbutils-008. Remove unneeded page
 hwids-20141022.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14722 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 {general/sysutils => archive}/hdwids.xml |  0
 general/sysutils/sysutils.xml            |  1 -
 general/sysutils/usbutils.xml            | 20 ++++++++------------
 introduction/welcome/changelog.xml       |  7 +++++++
 postlfs/security/cacerts.xml             |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)
 rename {general/sysutils => archive}/hdwids.xml (100%)

diff --git a/general/sysutils/hdwids.xml b/archive/hdwids.xml
similarity index 100%
rename from general/sysutils/hdwids.xml
rename to archive/hdwids.xml
diff --git a/general/sysutils/sysutils.xml b/general/sysutils/sysutils.xml
index a3d7bc519b..4554f26948 100644
--- a/general/sysutils/sysutils.xml
+++ b/general/sysutils/sysutils.xml
@@ -29,7 +29,6 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdwids.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initdtools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lm_sensors.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logrotate.xml"/>
diff --git a/general/sysutils/usbutils.xml b/general/sysutils/usbutils.xml
index 48016be02c..150cda62d4 100644
--- a/general/sysutils/usbutils.xml
+++ b/general/sysutils/usbutils.xml
@@ -75,7 +75,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="hdwids"/> (necessary for <command>lsusb.py</command>) and
       <xref linkend="libusb"/>
     </para>
 
@@ -97,6 +96,7 @@
     </para>
 
 <screen><userinput>sed -i '/^usbids/ s:usb.ids:hwdata/&amp;:' lsusb.py &amp;&amp;
+
 ./configure --prefix=/usr --datadir=/usr/share/hwdata &amp;&amp;
 make</userinput></screen>
 
@@ -128,30 +128,26 @@ make</userinput></screen>
     </para>
 
   </sect2>
-<!--
+
   <sect2 role="configuration">
     <title>Configuring USB Utils</title>
 
     <para>
       The <filename>usb.ids</filename> data file is constantly being
-      updated. To get a current version of this file, run
-      <command>update-usbids</command> as the <systemitem
-      class="username">root</systemitem> user. This program requires the
-      <xref linkend="which"/> script or program to find <xref linkend="lynx"/>
-      or <xref linkend="wget"/> which are used to download the most current file,
-      and replace the existing file in
-      <filename class="directory">/usr/share/misc</filename>.
-    </para>
+      updated. To get a current version of this file, run, as the <systemitem
+      class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput></screen>
 
     <para>
       You may wish to add an entry to
       <systemitem class="username">root</systemitem>'s (or any other user who has
-      write privilege to <filename class="directory">/usr/share/misc</filename>)
+      write privilege to <filename class="directory">/usr/share/hwdata</filename>)
       crontab to automatically update the <filename>usb.ids</filename> file
       periodically.
     </para>
 
-  </sect2>-->
+  </sect2>
 
   <sect2 role="content">
     <title>Contents</title>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index feee6df391..93a66c8e02 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,7 +46,14 @@
 
     <listitem>
       <para>October 24th, 2014</para>
+        <listitem>
+          <para>[bdubbs] - Finish update to usbutils-008.  Fixes
+          <ulink url="&blfs-ticket-root;5719">#5719</ulink>.</para>
+        </listitem>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove unneeded page hwids-20141022.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to biber-1.9.  Fixes
           <ulink url="&blfs-ticket-root;5728">#5728</ulink>.</para>
diff --git a/postlfs/security/cacerts.xml b/postlfs/security/cacerts.xml
index 03e002f361..4da502ae23 100644
--- a/postlfs/security/cacerts.xml
+++ b/postlfs/security/cacerts.xml
@@ -382,7 +382,7 @@ unset SSLDIR</userinput></screen>
       <varlistentry id="remove-expired-certs">
         <term><command>remove-expired-certs.sh</command></term>
         <listitem>
-          <para>is a utility <application>perl</application> script that
+          <para>is a utility shell script that
           removes expired certificates from a directory.  The default
           directory is <filename class='directory'>/etc/ssl/certs</filename>.</para>
           <indexterm zone="cacerts remove-expired-certs">