Author: manuel
Date: 2005-06-20 11:31:31 -0600 (Mon, 20 Jun 2005)
New Revision: 6063
Modified:
branches/6.1/BOOK/chapter01/changelog.xml
branches/6.1/BOOK/chapter06/hotplug.xml
Log:
Typos and tags fixes on hotplug.xml. Ported from trunk r6053 to r6055.
Modified: branches/6.1/BOOK/chapter01/changelog.xml
===================================================================
--- branches/6.1/BOOK/chapter01/changelog.xml 2005-06-20 17:23:46 UTC (rev
6062)
+++ branches/6.1/BOOK/chapter01/changelog.xml 2005-06-20 17:31:31 UTC (rev
6063)
@@ -84,9 +84,10 @@
</itemizedlist>
</listitem>
-<listitem><para>June 20th, 2005 [manuel]: kernel.xml: Added a warning
-about /usr/src/linux symlink and kernel headers, plus fixed the list
-of installed files. Bug 1569.</para></listitem>
+<listitem><para>June 20th, 2005 [manuel]: Added a warning about kernel
+headers and Linux-Libc-Headers, plus fixed the list of installed files
+on kernel.xml (bug 1569). Some typos and tags fixes ported from trunk
+(r6048 to r6050 and r6053 to r6056)</para></listitem>
<listitem><para>June 19th, 2005 [jhuntwork]: Changed listing of IRC servers to
show
only irc.linuxfromscratch.org.</para></listitem>
Modified: branches/6.1/BOOK/chapter06/hotplug.xml
===================================================================
--- branches/6.1/BOOK/chapter06/hotplug.xml 2005-06-20 17:23:46 UTC (rev
6062)
+++ branches/6.1/BOOK/chapter06/hotplug.xml 2005-06-20 17:31:31 UTC (rev
6063)
@@ -25,7 +25,7 @@
<segmentedlist>
<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>bash, coreutils, find, gawk, make</seg></seglistitem>
+<seglistitem><seg>Bash, Coreutils, Find, Gawk, and Make</seg></seglistitem>
</segmentedlist>
</sect2>
@@ -38,7 +38,7 @@
<para>Copy a file that the <quote>install</quote> target omits.</para>
-<screen><userinput>cp etc/hotplug/pnp.distmap
/etc/hotplug</userinput></screen>
+<screen><userinput>cp etc/hotplug/pnp.distmap /etc/hotplug</userinput></screen>
<para>Remove the init script that Hotplug installs, since we're going to be
using the script included with LFS-Bootscripts:</para>
@@ -50,7 +50,7 @@
<screen><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
-<para>Create a directory for storing firmware that can be loaded by
+<para>Create a directory for storing firmware that can be loaded by
<command>hotplug</command>:</para>
<screen><userinput>mkdir /lib/firmware</userinput></screen>
@@ -65,7 +65,7 @@
<segtitle>Installed files</segtitle>
<seglistitem><seg>hotplug</seg>
<seg>/etc/hotplug/*.rc, /etc/hotplug/*.agent</seg>
-<seg>/etc/hotplug/hotplug.functions, /etc/hotplug/blacklist,
/etc/hotplug/{pci,usb},
+<seg>/etc/hotplug/hotplug.functions, /etc/hotplug/blacklist,
/etc/hotplug/{pci,usb},
/etc/hotplug/usb.usermap, /etc/hotplug.d,
/var/log/hotplug/events</seg></seglistitem>
</segmentedlist>
@@ -78,107 +78,107 @@
<varlistentry id="hotplug">
<term><command>hotplug</command></term>
<listitem>
-<indexterm zone="ch-system-hotplug hotplug"><primary
-sortas="b-hotplug">hotplug</primary></indexterm>
<para>This script is called by default by the Linux kernel when something
changes in its internal state (e.g., a new device is added or an existing
device
is removed)</para>
+<indexterm zone="ch-system-hotplug hotplug"><primary
+sortas="b-hotplug">hotplug</primary></indexterm>
</listitem>
</varlistentry>
<varlistentry id="hotplug-rc">
<term><command>/etc/hotplug/*.rc</command></term>
<listitem>
-<indexterm zone="ch-system-hotplug hotplug-rc"><primary
-sortas="d-/etc/hotplug/*.rc">/etc/hotplug/*.rc</primary></indexterm>
<para>These scripts are used for cold plugging, i.e., detecting and acting upon
hardware already present during system startup. They are called by the
<filename>hotplug</filename> initscript that comes from the LFS-Bootscripts
package. The <command>*.rc</command> scripts try to recover hotplug events
that
were lost during system boot because, for example, the root filesystem was not
mounted by the kernel</para>
+<indexterm zone="ch-system-hotplug hotplug-rc"><primary
+sortas="d-/etc/hotplug/*.rc">/etc/hotplug/*.rc</primary></indexterm>
</listitem>
</varlistentry>
<varlistentry id="hotplug-agent">
<term><command>/etc/hotplug/*.agent</command></term>
<listitem>
-<indexterm zone="ch-system-hotplug hotplug-agent"><primary
-sortas="d-/etc/hotplug/*.agent">/etc/hotplug/*.agent</primary></indexterm>
<para>These scripts are called by <command>hotplug</command>
in response to different types of hotplug events generated by the kernel.
Their action is to insert corresponding kernel modules and call any
user-provided scripts</para>
+<indexterm zone="ch-system-hotplug hotplug-agent"><primary
+sortas="d-/etc/hotplug/*.agent">/etc/hotplug/*.agent</primary></indexterm>
</listitem>
</varlistentry>
<varlistentry id="hotplug-blacklist">
<term><filename>/etc/hotplug/blacklist</filename></term>
<listitem>
+<para>This file contains the list of modules that should never be inserted into
+the kernel by the Hotplug scripts</para>
<indexterm zone="ch-system-hotplug hotplug-blacklist"><primary
sortas="e-/etc/hotplug/blacklist">/etc/hotplug/blacklist</primary></indexterm>
-<para>This file contains the list of modules that should never be inserted into
-the kernel by the Hotplug scripts</para>
</listitem>
</varlistentry>
<varlistentry id="hotplug-functions">
<term><filename>/etc/hotplug/hotplug.functions</filename></term>
<listitem>
+<para>This file contains common functions used by other scripts in the Hotplug
+package</para>
<indexterm zone="ch-system-hotplug hotplug-functions"><primary
sortas="e-/etc/hotplug/hotplug.functions">/etc/hotplug/hotplug.functions</primary></indexterm>
-<para>This file contains common functions used by other scripts in the Hotplug
-package</para>
</listitem>
</varlistentry>
<varlistentry id="hotplug-subdirs">
<term><filename class="directory">/etc/hotplug/{pci,usb}</filename></term>
<listitem>
+<para>These directories contain user-written handlers for hotplug events</para>
<indexterm zone="ch-system-hotplug hotplug-subdirs"><primary
sortas="e-/etc/hotplug/{pci,usb}">/etc/hotplug/{pci,usb}</primary></indexterm>
-<para>These directories contain user-written handlers for hotplug events</para>
</listitem>
</varlistentry>
<varlistentry id="hotplug-usb.usermap">
<term><filename>/etc/hotplug/usb.usermap</filename></term>
<listitem>
+<para>This file contains rules that determine which user-defined handlers to
+call for each USB device, based on its vendor ID and other attributes</para>
<indexterm zone="ch-system-hotplug hotplug-usb.usermap"><primary
sortas="e-/etc/hotplug/usb.usermap">/etc/hotplug/usb.usermap</primary></indexterm>
-<para>This file contains rules that determine which user-defined handlers to
-call for each USB device, based on its vendor ID and other attributes</para>
</listitem>
</varlistentry>
<varlistentry id="hotplug-hotplug.d">
<term><filename class="directory">/etc/hotplug.d</filename></term>
<listitem>
-<indexterm zone="ch-system-hotplug hotplug-hotplug.d"><primary
-sortas="e-/etc/hotplug.d">/etc/hotplug.d</primary></indexterm>
<para>This directory contains programs (or symlinks to them) that are
interested
in receiving hotplug events. For example, <application>Udev</application> puts
its symlink here during installation</para>
+<indexterm zone="ch-system-hotplug hotplug-hotplug.d"><primary
+sortas="e-/etc/hotplug.d">/etc/hotplug.d</primary></indexterm>
</listitem>
</varlistentry>
<varlistentry id="hotplug-firmware">
<term><filename class="directory">/lib/firmware</filename></term>
<listitem>
+<para>This directory contains the firmware for devices that need to have their
+firmware loaded before use</para>
<indexterm zone="ch-system-hotplug hotplug-firmware"><primary
sortas="e-/lib/firmware">/lib/firmware</primary></indexterm>
-<para>This directory contains the firmware for devices that need to have their
-firmware loaded before use</para>
</listitem>
</varlistentry>
<varlistentry id="hotplug-events">
<term><filename>/var/log/hotplug/events</filename></term>
<listitem>
+<para>This file contains all the events that <command>hotplug</command> has
+called since bootup</para>
<indexterm zone="ch-system-hotplug hotplug-events"><primary
sortas="e-/var/log/hotplug/events">/var/log/hotplug/events</primary></indexterm>
-<para>This file contains all the events that <command>hotplug</command> has
-called since bootup</para>
</listitem>
</varlistentry>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
