Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

3 files changed, 55 insertions, 32 deletions

diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml
index bc8f240b8..101105d99 100644
--- a/chapter07/cleanup.xml
+++ b/chapter07/cleanup.xml
@@ -20,7 +20,7 @@
 
     <para>Second, the libtool .la files are only useful when linking with static
     libraries. They are unneeded and potentially harmful when using dynamic
-    shared libraries, specially when using non-autotools build systems.
+    shared libraries, especially when using non-autotools build systems.
     While still in chroot, remove those files now:</para>
 
 <screen><userinput>find /usr/{lib,libexec} -name \*.la -delete</userinput></screen>
@@ -37,6 +37,17 @@
   <sect2>
     <title>Backup</title>
 
+    <para>
+      At this point the essential programs and libraries have been created
+      and your current LFS system is in a good state. Your system can now be
+      backed up for later reuse. In case of fatal failures in the subsequent
+      chapters, it often turns out that removing everything and starting over
+      (more carefully) is the best option to recover. Unfortunately, all the
+      temporary files will be removed, too. To avoid spending extra time to
+      redo something which has been built successfully, creating a backup of
+      the current LFS system may prove useful.
+    </para>
+
     <note><para>
       All the remaining steps in this section are optional. Nevertheless,
       as soon as you begin installing packages in <xref
@@ -56,47 +67,60 @@
       safety reasons.
     </para>
 
+    <para>
+       If you have decided to make a backup, leave the chroot environment:
+    </para>
+
+<screen role="nodump"><userinput>exit</userinput></screen>
+
     <important>
-      <para>All of the following instructions are executed by
-        <systemitem class="username">root</systemitem>. Take extra
-        care about the commands you're going to run as mistakes
+      <para>
+        All of the following instructions are executed by
+        <systemitem class="username">root</systemitem> on your host system.
+        Take extra care about the commands you're going to run as mistakes
         here can modify your host system. Be aware that the
         environment variable <envar>LFS</envar>
         is set for user <systemitem class="username">lfs</systemitem> by default
         but may <emphasis>not</emphasis> be set for
-        <systemitem class="username">root</systemitem>. Whenever
-        commands are to be executed by <systemitem class="username">root</systemitem>,
+        <systemitem class="username">root</systemitem>.
+     </para>
+     <para>
+        Whenever commands are to be executed by <systemitem class="username">root</systemitem>,
         make sure you have set <envar>LFS</envar>.
+     </para>
+     <para>
         This has been discussed in <xref linkend='ch-partitioning-aboutlfs'/>.
       </para>
     </important>
 
-    <para>
-       Now, if you are making a backup, leave the chroot environment:
-    </para>
+    <para>Before making a backup, unmount the virtual file systems:</para>
 
-<screen role="nodump"><userinput>exit</userinput></screen>
+<screen role="nodump"><userinput>umount $LFS/dev/pts
+umount $LFS/{sys,proc,run,dev}</userinput></screen>
 
     <para>
-      At this point the essential programs and libraries have been created
-      and your current system is in a good state. Your system can now be
-      backed up for later reuse. In case of fatal failures in the subsequent
-      chapters, it often turns out that removing everything and starting over
-      (more carefully) is the best option to recover. Unfortunately, all the
-      temporary files will be removed, too. To avoid spending extra time to
-      redo something which has been built successfully, prepare a backup.
+      Make sure you have at least 1 GB free disk space (the source tarballs
+      will be included in the backup archive) on the filesystem containing
+      directory where you create the backup archive.
     </para>
 
     <para>
+<<<<<<< HEAD
       Make sure you have at least 1 GB free disk space (the source tarballs
       will be included in the backup archive) in the home directory of user
       <systemitem class="username">root</systemitem>.
+=======
+      Note that the instructions below specify the home directory of the host
+      system's <systemitem class="username">root</systemitem> user, which is
+      typically found on the root filesystem.
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
     </para>
 
-    <para>Before we make a backup, unmount the virtual file systems:</para>
-
-<screen role="nodump"><userinput>umount $LFS/dev{/pts,}
-umount $LFS/{sys,proc,run}</userinput></screen>
+    <para>
+      Replace <envar>$HOME</envar> by a directory of your choice if you
+      do not want to have the backup stored in <systemitem
+      class="username">root</systemitem>'s home directory.
+    </para>
 
     <para>
       Create the backup archive by running the following command:
@@ -107,11 +131,14 @@ umount $LFS/{sys,proc,run}</userinput></screen>
           Because the backup archive is compressed, it takes a relatively
           long time (over 10 minutes) even on a resonably fast system.
        </para>
+<<<<<<< HEAD
 
        <para>
           Also, ensure the <envar>LFS</envar> environment variable is set
           for the root user.
        </para>
+=======
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
     </note>
 
 <screen role="nodump" revision="sysv"><userinput>cd $LFS
@@ -120,11 +147,14 @@ tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
 <screen role="nodump" revision="systemd"><userinput>cd $LFS
 tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
 
+<<<<<<< HEAD
     <para>
       Replace <envar>$HOME</envar> by a directory of your choice if you
       do not want to have the backup stored in <systemitem
       class="username">root</systemitem>'s home directory.
     </para>
+=======
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
   </sect2>
 
   <sect2>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 1d53f6987..2b0030d7b 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -11,11 +11,10 @@
   <title>Introduction</title>
 
   <para>This chapter shows how to build the last missing bits of the temporary
-  system: first, the tools needed by the build machinery of various packages,
-  then three packages needed to run tests.  Now that all circular dependencies
-  have been resolved, we can use a <quote>chroot</quote> environment,
-  completely isolated the host operating system used for the build, except
-  for the running kernel.</para>
+  system: the tools needed by the build machinery of various packages.  Now
+  that all circular dependencies have been resolved, a <quote>chroot</quote>
+  environment, completely isolated from the host operating system (except for
+  the running kernel), can be used for the build.</para>
 
   <para>For proper operation of the isolated environment, some communication
   with the running kernel must be established. This is done through the
diff --git a/chapter07/texinfo.xml b/chapter07/texinfo.xml
index b67d0ab46..8f769c064 100644
--- a/chapter07/texinfo.xml
+++ b/chapter07/texinfo.xml
@@ -52,12 +52,6 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
-    <note>
-      <para>As part of the configure process, a test is made that indicates an
-      error for TestXS_la-TestXS.lo.  This is not relevant for LFS and should be
-      ignored.</para>
-    </note>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>