From 8a269ec27eaaffdba200b3b21f7f8821a03456bd Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 12 Aug 2021 16:03:35 -0500
Subject: [PATCH] Touch up cleanup commands in Chapter 8

We moved the rm /tools from Chapter 8 to Chapter 7.
Some minor wording changes and file renaming.
---
 chapter07/cleanup.xml                           |  4 ++--
 chapter08/chapter08.xml                         |  2 +-
 chapter08/revisedchroot.xml                     |  5 -----
 chapter08/{strippingagain.xml => stripping.xml} | 16 +++++++---------
 4 files changed, 10 insertions(+), 17 deletions(-)
 rename chapter08/{strippingagain.xml => stripping.xml} (92%)

diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml
index 69f3d2da1..04005eece 100644
--- a/chapter07/cleanup.xml
+++ b/chapter07/cleanup.xml
@@ -5,8 +5,8 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-tools-stripping">
-  <?dbhtml filename="stripping.html"?>
+<sect1 id="ch-tools-cleanup">
+  <?dbhtml filename="cleanup.html"?>
 
   <title>Cleaning up and Saving the Temporary System</title>
   
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index beee9e480..e9cb2b2ce 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -104,7 +104,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/>
 
 </chapter>
diff --git a/chapter08/revisedchroot.xml b/chapter08/revisedchroot.xml
index 3627cd603..0c16ae622 100644
--- a/chapter08/revisedchroot.xml
+++ b/chapter08/revisedchroot.xml
@@ -55,11 +55,6 @@ chroot "$LFS" /usr/bin/env -i          \
 
 <screen><userinput>find /usr -depth -name $(uname -m)-lfs-linux-gnu\* | xargs rm -rf</userinput></screen>
 
-   <para>The <filename class="directory">/tools</filename> directory can also
-   be removed to further gain some space:</para>
-
-<screen><userinput>rm -rf /tools</userinput></screen>
-
    <para>Finally, remove the temporary 'tester' user account created at the 
    beginning of the previous chapter.</para>
 
diff --git a/chapter08/strippingagain.xml b/chapter08/stripping.xml
similarity index 92%
rename from chapter08/strippingagain.xml
rename to chapter08/stripping.xml
index a2b6f0263..853ea8848 100644
--- a/chapter08/strippingagain.xml
+++ b/chapter08/stripping.xml
@@ -5,10 +5,10 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-strippingagain">
-  <?dbhtml filename="strippingagain.html"?>
+<sect1 id="ch-system-stripping">
+  <?dbhtml filename="stripping.html"?>
 
-  <title>Stripping Again</title>
+  <title>Stripping</title>
 
   <para>This section is optional.  If the intended user is not a 
   programmer and does not plan to do
@@ -31,9 +31,9 @@
   </para>
 
   <para>Note that <command>strip</command> will overwrite the binary or library
-  file it is processing.  This may crash the processes using code or data from
+  file it is processing.  This can crash the processes using code or data from
   the file.  If the process running <command>strip</command> itself is
-  affected, the binary or library being stripped may be destroyed.  This may
+  affected, the binary or library being stripped can be destroyed and can
   make the system completely unusable.  To avoid it, we'll copy some libraries
   and binaries into <filename class="directory">/tmp</filename>, strip them
   there, and install them back with the <command>install</command> command.
@@ -44,7 +44,6 @@
   and ld-linux.so.2 on 32-bit systems.  The contruct below selects the 
   correct name for the current architecture.</para></note>
 
-
 <!-- also of interest are libgfortan, libgo, libgomp, and libobjc from GCC -->
 
 <!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
@@ -105,8 +104,7 @@ unset BIN LIB save_usrlib online_usrbin online_usrlib
 </userinput></screen>
 
   <para>A large number of files will be reported as having their file
-  format not recognized. These warnings can be safely ignored. These
-  warnings indicate that those files are scripts instead of
-  binaries.</para>
+  format not recognized. These warnings can be safely ignored. They
+  indicate that those files are scripts instead of binaries.</para>
 
 </sect1>