瀏覽代碼

Moved Host System Requirements to Chapter 2
and made minor editorial changes.



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

Bruce Dubbs 9 年之前
父節點
當前提交
72fb9bf997
共有 5 個文件被更改,包括 26 次插入16 次删除
  1. 4 0
      chapter01/changelog.xml
  2. 2 1
      chapter02/chapter02.xml
  3. 16 11
      chapter02/hostreqs.xml
  4. 4 3
      chapter02/introduction.xml
  5. 0 1
      prologue/preface.xml

+ 4 - 0
chapter01/changelog.xml

@@ -38,6 +38,10 @@
     <listitem>
       <para>2016-05-16</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Moved Host System Requirements to Chapter 2
+          and made minor editorial changes.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Updated to tar-1.29. Fixes
           <ulink url="&lfs-ticket-root;3932">#3932</ulink>.</para>

+ 2 - 1
chapter02/chapter02.xml

@@ -9,9 +9,10 @@
   <?dbhtml dir="chapter02"?>
   <?dbhtml filename="chapter02.html"?>
 
-  <title>Preparing a New Partition</title>
+  <title>Preparing the Host System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostreqs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingpartition.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingfilesystem.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlfs.xml"/>

+ 16 - 11
prologue/hostreqs.xml → chapter02/hostreqs.xml

@@ -18,8 +18,8 @@
     <quote>&lt;package-name&gt;-dev</quote>. Be sure to install those if
     your distribution provides them.</para>
 
-   <para>Earlier versions of the listed software packages may work, but has not
-   been tested.</para>
+   <para>Earlier versions of the listed software packages may work, but have
+   not been tested.</para>
 
   <itemizedlist spacing="compact">
 
@@ -143,16 +143,21 @@
 
   </itemizedlist>
 
-  <para>Note that the symlinks mentioned above are required to build an LFS
-  system using the instructions contained within this book. Symlinks that
-  point to other software (such as dash, mawk, etc.) may work, but are not
-  tested or supported by the LFS development team, and may require either
-  deviation from the instructions or additional patches to some
-  packages.</para>
+  <important>
+    <para>Note that the symlinks mentioned above are required to build an LFS
+    system using the instructions contained within this book. Symlinks that
+    point to other software (such as dash, mawk, etc.) may work, but are not
+    tested or supported by the LFS development team, and may require either
+    deviation from the instructions or additional patches to some
+    packages.</para>
+  </important>
 
   <!-- Use an empty sect2 element to prevent a pdf warning.  -->
-  <sect2 id="version-check" xreflabel="Section vii, Host System Requirements">
-  <title> </title>
+  <bridgehead renderas="sect2" 
+              id="version-check" 
+              xreflabel="Host System Requirements">
+  </bridgehead>
+  <!--<title> </title>-->
 
   <para >To see whether your host system has all the appropriate versions, and
   the ability to compile programs, run the following:</para>
@@ -234,5 +239,5 @@ bash library-check.sh</userinput></screen>
 or all absent, but not only one or two present.</para>
 
 
-</sect2>
+<!--</sect2>-->
 </sect1>

+ 4 - 3
chapter02/introduction.xml

@@ -10,8 +10,9 @@
 
   <title>Introduction</title>
 
-  <para>In this chapter, the partition which will host the LFS system is
-  prepared. We will create the partition itself, create a file system
-  on it, and mount it.</para>
+  <para>In this chapter, the host tools needed for building LFS
+  are checked and, if necessary, installed.  Then a partition which will 
+  host the LFS system is prepared. We will create the partition 
+  itself, create a file system on it, and mount it.</para>
 
 </sect1>

+ 0 - 1
prologue/preface.xml

@@ -17,7 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="standards.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="why.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prerequisites.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostreqs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="typography.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="organization.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errata.xml"/>