Changeset ed3e5d8

Timestamp:

Feb 21, 2006, 1:55:04 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

10c15e3

Parents:

5c41d32

Message:

r967@server (orig r965): jim | 2005-12-26 22:57:04 -0800

r1199@server: jim | 2005-12-26 22:55:55 -0800
Grammar fixes from Chris Staub. Thank you

Files:

• cross-tools/common/binutils.xml (modified) (1 diff)
• cross-tools/common/cflags.xml (modified) (1 diff)
• cross-tools/common/introduction.xml (modified) (1 diff)
• cross-tools/x86/glibc-headers.xml (modified) (8 diffs)
• final-preps/aboutlfs.xml (modified) (1 diff)
• final-preps/addinguser.xml (modified) (2 diffs)
• final-preps/creatingcrossdir.xml (modified) (2 diffs)
• introduction/common/acknowledgements.xml (modified) (1 diff)
• introduction/common/how.xml (modified) (2 diffs)
• prologue/common/organization.xml (modified) (1 diff)
• temp-system/common/coreutils.xml (modified) (1 diff)
• temp-system/multilib/coreutils.xml (modified) (1 diff)

cross-tools/common/binutils.xml

@@ -101 +101 @@
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
-          <para>This options disables the building of a multilib
+          <para>This option disables the building of a multilib
           capable binutils.</para>
         </listitem>

cross-tools/common/cflags.xml

@@ -11 +11 @@
   <title>Build CFLAGS</title>
 
-  <para><envar>CFLAGS</envar> during the building of cross tools must
-  not be set.</para>
+  <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be set during the building of cross tools.</para>
 
   <para>To disable <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
-  use the following command:</para>
+  use the following commands:</para>
 
 <screen><userinput>unset CFLAGS

cross-tools/common/introduction.xml

@@ -47 +47 @@
       <para>After installing each package, both in this and the next chapters,
       delete its source and build directories, unless specifically instructed
-      otherwise. Deleting the sources space and prevents mis-configuration
+      otherwise. Deleting the sources prevents mis-configuration
       when the same package is reinstalled later.</para>
     </important>

cross-tools/x86/glibc-headers.xml

@@ -26 +26 @@
     the glibc we are using in cross-lfs. The reason we are changing it is
     because this only installs the headers, no compiling takes place. In the
-    next glibc chapter, we use the gcc that's build right after this chapter.</para>
+    next glibc chapter, we use the gcc that's built right after this chapter.</para>
 
 <screen os="s2"><userinput>cp configure{,.orig}
@@ -73 +73 @@
 
       <varlistentry os="ca2">
-        <term><parameter>--prefix=/tools</parameter></term>
-        <listitem>
-          <para>This tells the configure script to prepare to install the
-          package in the <filename class="directory">/tools</filename>
-          directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="ca3">
         <term><parameter>--build=${LFS_HOST}</parameter></term>
         <listitem>
@@ -89 +80 @@
       </varlistentry>
 
-      <varlistentry os="ca4">
+      <varlistentry os="ca3">
         <term><parameter>--host=${LFS_TARGET}</parameter></term>
         <listitem>
@@ -97 +88 @@
       </varlistentry>
 
-      <varlistentry os="ca5">
+      <varlistentry os="ca4">
         <term><parameter>--disable-sanity-checks</parameter></term>
         <listitem>
@@ -104 +95 @@
       </varlistentry>
 
-      <varlistentry os="ca6">
+      <varlistentry os="ca5">
         <term><parameter>--enable-kernel=2.6.0</parameter></term>
         <listitem>
@@ -112 +103 @@
       </varlistentry>
 
-      <varlistentry os="ca7">
+      <varlistentry os="ca6">
         <term><parameter>--with-headers=/tools/include</parameter></term>
         <listitem>
@@ -122 +113 @@
       </varlistentry>
 
-      <varlistentry os="ca8">
+      <varlistentry os="ca7">
         <term><parameter>--with-binutils=/cross-tools/${LFS_TARGET}/bin</parameter></term>
         <listitem>
@@ -135 +126 @@
 <screen os="cd"><userinput>make install-headers</userinput></screen>
 
-    <para os="ce">Some files aren't installed by the above command, then
-    we will copy the header files we need:</para>
+    <para os="ce">Some files aren't installed by the above command, so we will copy the additional header files we need:</para>
 
     <para os="cf">First we will copy a common file over to <filename

final-preps/aboutlfs.xml

@@ -31 +31 @@
   processes the command line.</para>
 
-  <para>If you haven't created the <filename class="directory">/mnt/lfs</filename>
+  <para>If you haven't created the <filename class="directory">$LFS</filename>
   directory, do so at this time by issuing the following commands:</para>
 

final-preps/addinguser.xml

@@ -82 +82 @@
   <filename class="directory">$LFS/cross-tools</filename>, 
   and <filename class="directory">$LFS/tools</filename> by making <systemitem
-  class="username">lfs</systemitem> the directories owner:</para>
+  class="username">lfs</systemitem> the directorys' owner:</para>
 
 <screen><userinput>chown lfs $LFS
@@ -88 +88 @@
 chown lfs $LFS/cross-tools</userinput></screen>
 
-  <para>If a separate working directory was created as suggested, we will
-  show you how to create the directory and give user <systemitem
-  class="username">lfs</systemitem> ownership of this directory:</para>
+  <para>If a separate working directory was created as suggested, 
+  give user <systemitem class="username">lfs</systemitem> ownership of this directory:</para>
 
-<screen><userinput>install -d $LFS/sources
-chown lfs $LFS/sources</userinput></screen>
+<screen><userinput>chown lfs $LFS/sources</userinput></screen>
 
   <para>Next, login as user <systemitem class="username">lfs</systemitem>.

final-preps/creatingcrossdir.xml

@@ -25 +25 @@
   <para>The next step is to create a <filename
   class="symlink">/cross-tools</filename> symlink on the host system.
-  This will point to the newly-created directory in your home directory.
-  Since normal users will not have permissions to write to the root tree,
-  we need to exit the <command>su</command> and run the symlink command as
-  <systemitem class="username">root</systemitem>:</para>
+  This will point to the newly-created directory on the LFS partition.
+  Run this command as  <systemitem class="username">root</systemitem> as well:</para>
 
 <screen><userinput>ln -s $LFS/cross-tools /</userinput></screen>
@@ -34 +32 @@
   <para>The created symlink enables the toolchain to be compiled so that
   it always refers to <filename class="directory">/cross-tools</filename>,
-  meaning that the compiler, assembler, and linker will be avaialble for
+  meaning that the compiler, assembler, and linker will be available for
   use later if some unforseen circumstances happen.</para>
 

introduction/common/acknowledgements.xml

@@ -11 +11 @@
 
   <para>The editors of the book would like to acknowledge people who
-  have assisted in making the book, what it is today.</para>
+  have assisted in making the book what it is today.</para>
 
   <itemizedlist>

introduction/common/how.xml

@@ -29 +29 @@
 
   <!-- -->
-  <para>THE TEXT BELOW NEED TO BE REWRITTEN</para>
+  <para>THE TEXT BELOW NEEDS TO BE REWRITTEN</para>
 
   <para><xref linkend="chapter-partitioning"/> of this book describes how
@@ -40 +40 @@
   <xref linkend="chapter-final-preps"/> carefully as it explains several
   important issues the developer should be aware of before beginning to
-  work through <xref linkend="chapter-temp-system"/> and
+  work through <xref linkend="chapter-cross-tools"/> and
   beyond.</para>
 

prologue/common/organization.xml

@@ -42 +42 @@
     <title>Part IV - Building the Basic Tools</title>
 
-    <para>Part IV explains how to building a tool chain built for
+    <para>Part IV explains how to build a tool chain built
           to operate on your target system. These are the tools
           that will allow you to build a working system on your 

temp-system/common/coreutils.xml

@@ -33 +33 @@
    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
 
-    <variablelist os="bf">
-      <title>The meaning of the configure options:</title>
+    <para os="bf">Compile the package:</para>
 
-      <varlistentry>
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This tells configure to use a config.cache file that we
-          specify.</para>
-        </listitem>
-      </varlistentry>
+<screen os="bg"><userinput>make</userinput></screen>
 
-    </variablelist>
+    <para os="bh">Install the package:</para>
 
-    <para os="bg">Compile the package:</para>
-
-<screen os="bh"><userinput>make</userinput></screen>
-
-    <para os="bi">Install the package:</para>
-
-<screen os="bj"><userinput>make install</userinput></screen>
+<screen os="bi"><userinput>make install</userinput></screen>
 
   </sect2>

temp-system/multilib/coreutils.xml

@@ -55 +55 @@
     xpointer="xpointer(//*[@os='bi'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
   </sect2>