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

13 files changed, 64 insertions, 65 deletions

diff --git a/appendixb/acknowledgments.xml b/appendixb/acknowledgments.xml
index 610cea299..36420e0f4 100644
--- a/appendixb/acknowledgments.xml
+++ b/appendixb/acknowledgments.xml
@@ -35,7 +35,7 @@ From Scratch (ALFS), BLFS and hints project logo
 creator</para></listitem>
 
 <listitem><para><ulink url="mailto:nathan@linuxfromscratch.org">Nathan
-Coulson</ulink> &lt;nathan@linuxfromscratch.org&gt; &ndash; LFS bootscripts
+Coulson</ulink> &lt;nathan@linuxfromscratch.org&gt; &ndash; LFS-Bootscripts
 maintainer</para></listitem>
 
 <listitem><para><ulink url="mailto:jeroen@linuxfromscratch.org">Jeroen
@@ -90,7 +90,7 @@ Editor, hints and patches projects maintainer</para></listitem>
 
 <listitem><para><ulink url="mailto:jeremy@linuxfromscratch.org">Jeremy
 Utley</ulink> &lt;jeremy@linuxfromscratch.org&gt; &ndash; LFS Technical
-Writer, Bugzilla maintainer, LFS bootscripts maintainer, LFS Server
+Writer, Bugzilla maintainer, LFS-Bootscripts maintainer, LFS Server
 co-administrator</para></listitem>
 
 <listitem><para><ulink url="mailto:zwinkles@gmail.com">Zack
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fa6253a1f..c097def7e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -87,6 +87,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>July  1st, 2005 [archaic]: Brought all occurences of
+LFS-Bootscripts into conformity.</para></listitem>
+
 <listitem><para>June 30th, 2005 [archaic]: Several minor wording changes in
 chapters 1 - 5 (matt).</para></listitem>
 
diff --git a/chapter01/how.xml b/chapter01/how.xml
index 0e752e076..577f2b695 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -71,7 +71,7 @@ waiting for package compilation to complete, a user can switch to a
 different virtual console (VC) or X desktop and continue using the
 computer as normal.</para>
 
-<para>To finish the installation, the bootscripts are set up in <xref
+<para>To finish the installation, the LFS-Bootscripts are set up in <xref
 linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
 up in <xref linkend="chapter-bootable"/>. <xref
 linkend="chapter-finalizing"/> contains information on furthering the
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>
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 46f95e278..5e0c31478 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -10,7 +10,8 @@
 <indexterm zone="ch-scripts-bootscripts"><primary sortas="a-Bootscripts">Bootscripts</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The LFS-Bootscripts package contains a set of bootscripts.</para>
+<para>The LFS-Bootscripts package contains a set of scripts to start/stop the
+LFS system at bootup/shutdown.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -33,7 +34,7 @@
 
 </sect2>
 
-<sect2 id="contents-bootscripts" role="content"><title>Contents of LFS-bootscripts</title>
+<sect2 id="contents-bootscripts" role="content"><title>Contents of LFS-Bootscripts</title>
 
 <segmentedlist>
 <segtitle>Installed scripts</segtitle>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 34c8cf514..2c3ca8c4c 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -7,10 +7,10 @@
 <title>Introduction</title>
 <?dbhtml filename="introduction.html"?>
 
-<para>This chapter details how to install the bootscripts and set them up
-properly. Most of these scripts will work without modification, but a
-few require additional configuration files because they deal with
-hardware-dependent information.</para>
+<para>This chapter details how to install and configure the LFS-Bootscripts
+package. Most of these scripts will work without modification, but a few require
+additional configuration files because they deal with hardware-dependent
+information.</para>
 
 <para>System-V style init scripts are employed in this book because they are
 widely used. For additional options, a hint detailing the BSD style
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 998303fc7..f389ec40a 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -54,13 +54,12 @@ Network Interface Card (NIC) during booting of the system. If set
 to anything but <quote>yes</quote> the NIC will be ignored by the
 network script and not brought up.</para>
 
-<para>The <envar>SERVICE</envar> variable defines the method of
-obtaining the IP address. The LFS bootscripts have a modular IP
-assignment format, and creating additional files in the <filename
-class="directory" condition="html">/etc/sysconfig/network-devices/services</filename>
-<filename class="directory" condition="pdf">/etc/sysconfig/network- devices/services</filename>
-directory allows other IP assignment methods. This is commonly used
-for Dynamic Host Configuration Protocol (DHCP), which is addressed in the BLFS book.</para>
+<para>The <envar>SERVICE</envar> variable defines the method of obtaining the IP
+address. The LFS-Bootscripts package has a modular IP assignment format, and
+creating additional files in the <filename
+class="directory">/etc/sysconfig/network-devices/services</filename> directory
+allows other IP assignment methods. This is commonly used for Dynamic Host
+Configuration Protocol (DHCP), which is addressed in the BLFS book.</para>
 
 <para>The <envar>GATEWAY</envar> variable should contain
 the default gateway IP address, if one is present. If not, then comment out
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index 9d1946d4b..7967a8f2b 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -82,27 +82,24 @@ built-in drivers registered with <systemitem
 class="filesystem">sysfs</systemitem> are available to userspace
 processes and to <command>udev</command> for device node creation.</para>
 
-<para>The <command>S10udev</command> initscript takes care of creating
-these device nodes when Linux is booted. This script starts with
-registering <command>/sbin/udevsend</command> as a hotplug event handler.
-Hotplug events (discussed below) should not be generated during this
-stage, but <command>udev</command> is registered just in case they do
-occur.  The <command>udevstart</command> program then walks through
-the <systemitem class="filesystem">/sys</systemitem> filesystem and
-creates devices under <filename class="directory">/dev</filename> that
-match the descriptions.  For example,
-<filename>/sys/class/tty/vcs/dev</filename> contains the string
-<quote>7:0</quote> This string is used by <command>udevstart</command>
-to create <filename>/dev/vcs</filename> with major number
-<emphasis>7</emphasis> and minor <emphasis>0</emphasis>.  The names and
-permissions of the nodes created under the
-<filename class="directory">/dev</filename> directory are configured according
-to the rules specified in the files within the
-<filename class="directory">/etc/udev/rules.d/</filename> directory.  These are
-numbered in a similar fashion to the LFS bootscripts.  If
-<command>udev</command> can't find a rule for the device it is creating, it will
-default permissions to <emphasis>660</emphasis> and ownership to
-<emphasis>root:root</emphasis>.</para>
+<para>The <command>S10udev</command> initscript takes care of creating these
+device nodes when Linux is booted. This script starts with registering
+<command>/sbin/udevsend</command> as a hotplug event handler.  Hotplug events
+(discussed below) should not be generated during this stage, but
+<command>udev</command> is registered just in case they do occur.  The
+<command>udevstart</command> program then walks through the <systemitem
+class="filesystem">/sys</systemitem> filesystem and creates devices under
+<filename class="directory">/dev</filename> that match the descriptions.  For
+example, <filename>/sys/class/tty/vcs/dev</filename> contains the string
+<quote>7:0</quote> This string is used by <command>udevstart</command> to create
+<filename>/dev/vcs</filename> with major number <emphasis>7</emphasis> and minor
+<emphasis>0</emphasis>.  The names and permissions of the nodes created under
+the <filename class="directory">/dev</filename> directory are configured
+according to the rules specified in the files within the <filename
+class="directory">/etc/udev/rules.d/</filename> directory. These are numbered in
+a similar fashion to the LFS-Bootscripts package. If <command>udev</command>
+can't find a rule for the device it is creating, it will default permissions to
+<emphasis>660</emphasis> and ownership to <emphasis>root:root</emphasis>.</para>
 
 <para>Once the above stage is complete, all devices that were already
 present and have compiled-in drivers will be available for use. What 
diff --git a/general.ent b/general.ent
index c71a7c214..350c909be 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20050630">
-<!ENTITY releasedate "June 30, 2005">
+<!ENTITY version "TESTING-20050701">
+<!ENTITY releasedate "July 1, 2005">
 <!ENTITY milestone "6.1">
 <!ENTITY generic-version "testing"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->