Index: appendixb/acknowledgments.xml
===================================================================
--- appendixb/acknowledgments.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ appendixb/acknowledgments.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -36,5 +36,5 @@
 
 <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>
 
@@ -91,5 +91,5 @@
 <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>
 
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter01/changelog.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -88,4 +88,7 @@
 </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>
Index: chapter01/how.xml
===================================================================
--- chapter01/how.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter01/how.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -72,5 +72,5 @@
 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
Index: chapter06/devices.xml
===================================================================
--- chapter06/devices.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter06/devices.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -31,6 +31,6 @@
 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>
@@ -52,7 +52,7 @@
 
 <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
Index: chapter06/hotplug.xml
===================================================================
--- chapter06/hotplug.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter06/hotplug.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -41,11 +41,11 @@
 <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>
@@ -91,9 +91,9 @@
 <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>
Index: chapter06/iproute2.xml
===================================================================
--- chapter06/iproute2.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter06/iproute2.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -55,8 +55,8 @@
     <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>
Index: chapter06/psmisc.xml
===================================================================
--- chapter06/psmisc.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter06/psmisc.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -39,10 +39,9 @@
 <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>
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter06/util-linux.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -81,6 +81,6 @@
 
 <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
Index: chapter07/bootscripts.xml
===================================================================
--- chapter07/bootscripts.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter07/bootscripts.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -11,5 +11,6 @@
 
 <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>
@@ -34,5 +35,5 @@
 </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>
Index: chapter07/introduction.xml
===================================================================
--- chapter07/introduction.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter07/introduction.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -8,8 +8,8 @@
 <?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
Index: chapter07/network.xml
===================================================================
--- chapter07/network.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter07/network.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -55,11 +55,10 @@
 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
Index: chapter07/udev.xml
===================================================================
--- chapter07/udev.xml	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ chapter07/udev.xml	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -83,25 +83,22 @@
 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
Index: general.ent
===================================================================
--- general.ent	(revision 90b56f5cf346ee9cbd5032a13066decc72860011)
+++ general.ent	(revision aabd480689b6c9bd4b28ee66c1cfa3b7a717a334)
@@ -1,5 +1,5 @@
 <?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}]" -->
