Brought all occurences of LFS-Bootscripts into conformity. (merged from trunk r6288)

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@6308 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 25 insertions, 26 deletions

diff --git a/chapter06/devices.xml b/chapter06/devices.xml
index e094f1528..22bb3bdb7 100644
--- a/chapter06/devices.xml
+++ b/chapter06/devices.xml
@@ -30,8 +30,8 @@ filesystem (such as <systemitem class="filesystem">tmpfs</systemitem>) on the
 <filename class="directory">/dev</filename> directory, and allow the devices to
 be created dynamically on that virtual filesystem as they are detected or
 accessed. This is generally done during the boot process. Since this new system
-has not been booted, it is necessary to do what the bootscripts would otherwise
-do by mounting <filename class="directory">/dev</filename>:</para>
+has not been booted, it is necessary to do what the LFS-Bootscripts package would
+otherwise do by mounting <filename class="directory">/dev</filename>:</para>
 
 <screen><userinput>mount -n -t tmpfs none /dev</userinput></screen>
 
@@ -51,9 +51,9 @@ chown root:tty /dev/{console,ptmx,tty}</userinput></screen>
 <!-- -->
 
 <para>There are some symlinks and directories required by LFS that are created
-during system startup by the bootscripts. Since this is a chroot environment and
-not a booted environment, those symlinks and directories need to be created
-here:</para>
+during system startup by the LFS-Bootscripts package. Since this is a chroot
+environment and not a booted environment, those symlinks and directories need to
+be created here:</para>
 
 <screen><userinput>ln -s /proc/self/fd /dev/fd
 ln -s /proc/self/fd/0 /dev/stdin
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index 516645464..ee5306761 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -40,13 +40,13 @@ running kernel.</para>
 
 <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>
+<para>Remove the init script that Hotplug installs since we are going to be
+using the script included in the LFS-Bootscripts package:</para>
 
 <screen><userinput>rm -rf /etc/init.d</userinput></screen>
 
-<para>Network device hotplugging is not supported by LFS-Bootscripts yet. For
-that reason, remove the network hotplug agent:</para>
+<para>Network device hotplugging is not yet supported by the LFS-Bootscripts
+package. For that reason, remove the network hotplug agent:</para>
 
 <screen><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
 
@@ -90,11 +90,11 @@ sortas="b-hotplug">hotplug</primary></indexterm>
 <term><command>/etc/hotplug/*.rc</command></term>
 <listitem>
 <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>
+hardware already present during system startup. They are called by the
+<filename>hotplug</filename> initscript included in 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>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index ef957cda8..fee60ae80 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -54,10 +54,10 @@
     <variablelist>
     <varlistentry>
     <term><parameter>SBINDIR=/sbin</parameter></term>
-    <listitem><para>This makes sure that the IPRoute2 binaries will install into
-      <filename class="directory">/sbin</filename>.  This is the correct
-      location according to the FHS, because some of the IPRoute2 binaries are used
-      in the bootscripts.</para>
+    <listitem><para>This ensures that the IPRoute2 binaries will install into
+      <filename class="directory">/sbin</filename>. This is the correct location
+      according to the FHS, because some of the IPRoute2 binaries are used by
+      the LFS-Bootscripts package.</para>
     </listitem>
     </varlistentry>
     </variablelist>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index ba7c627da..717ebe49e 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -38,12 +38,11 @@ GCC, Gettext, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <variablelist>
 <varlistentry>
 <term><parameter>--exec-prefix=""</parameter></term>
-<listitem><para>This causes the binaries to be installed in <filename
-class="directory">/bin</filename> instead of <filename
-class="directory">/usr/bin</filename>. Because the Psmisc programs are
-often used in bootscripts, they should be available when the <filename
-class="directory">/usr</filename> file system is not
-mounted.</para></listitem>
+<listitem><para>This ensures that the Psmisc binaries will install into
+<filename class="directory">/bin</filename> instead of <filename
+class="directory">/usr/bin</filename>. This is the correct location according to
+the FHS, because some of the Psmisc binaries are used by the LFS-Bootscripts
+package.</para></listitem>
 </varlistentry>
 </variablelist>
 
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index bbd70fb0f..de2a8d170 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -80,8 +80,8 @@ by Glibc) from being built and installed again.</para></listitem>
 <para>This package does not come with a test suite.</para>
 
 <para>Install the package and move the <command>logger</command> binary to
-<filename class="directory">/bin</filename> as it is needed by the bootscripts:
-</para>
+<filename class="directory">/bin</filename> as it is needed by the
+LFS-Bootscripts package:</para>
 
 <screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
 mv /usr/bin/logger /bin</userinput></screen>