r965 - in trunk/BOOK: . cross-tools/common cross-tools/x86 final-preps introduction/common prologue/common temp-system/common temp-system/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Dec 26 22:57:07 PST 2005


Author: jim
Date: 2005-12-26 23:57:04 -0700 (Mon, 26 Dec 2005)
New Revision: 965

Modified:
   trunk/BOOK/
   trunk/BOOK/cross-tools/common/binutils.xml
   trunk/BOOK/cross-tools/common/cflags.xml
   trunk/BOOK/cross-tools/common/introduction.xml
   trunk/BOOK/cross-tools/x86/glibc-headers.xml
   trunk/BOOK/final-preps/aboutlfs.xml
   trunk/BOOK/final-preps/addinguser.xml
   trunk/BOOK/final-preps/creatingcrossdir.xml
   trunk/BOOK/introduction/common/acknowledgements.xml
   trunk/BOOK/introduction/common/how.xml
   trunk/BOOK/prologue/common/organization.xml
   trunk/BOOK/temp-system/common/coreutils.xml
   trunk/BOOK/temp-system/multilib/coreutils.xml
Log:
 r1199 at server:  jim | 2005-12-26 22:55:55 -0800
 Grammar fixes from Chris Staub. Thank you



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1198
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1199
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/cross-tools/common/binutils.xml
===================================================================
--- trunk/BOOK/cross-tools/common/binutils.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/cross-tools/common/binutils.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -100,7 +100,7 @@
       <varlistentry os="bd7">
         <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>
       </varlistentry>

Modified: trunk/BOOK/cross-tools/common/cflags.xml
===================================================================
--- trunk/BOOK/cross-tools/common/cflags.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/cross-tools/common/cflags.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -10,11 +10,10 @@
 
   <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
 unset CXXFLAGS</userinput></screen>

Modified: trunk/BOOK/cross-tools/common/introduction.xml
===================================================================
--- trunk/BOOK/cross-tools/common/introduction.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/cross-tools/common/introduction.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -46,7 +46,7 @@
     <important>
       <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>
 

Modified: trunk/BOOK/cross-tools/x86/glibc-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/glibc-headers.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/cross-tools/x86/glibc-headers.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -25,7 +25,7 @@
     <para os="s1">The following sed removes a dependency of gcc 3.4.x from
     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}
 sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen>
@@ -72,15 +72,6 @@
       </varlistentry>
 
       <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>
           <para>When used with --host, this creates a cross-architecture
@@ -88,7 +79,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="ca4">
+      <varlistentry os="ca3">
         <term><parameter>--host=${LFS_TARGET}</parameter></term>
         <listitem>
           <para>When used with --build, this creates a cross-architecture
@@ -96,14 +87,14 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="ca5">
+      <varlistentry os="ca4">
         <term><parameter>--disable-sanity-checks</parameter></term>
         <listitem>
           <para>This switch disables any checks that are in place.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="ca6">
+      <varlistentry os="ca5">
         <term><parameter>--enable-kernel=2.6.0</parameter></term>
         <listitem>
           <para>This tells Glibc to compile the library with support
@@ -111,7 +102,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="ca7">
+      <varlistentry os="ca6">
         <term><parameter>--with-headers=/tools/include</parameter></term>
         <listitem>
           <para>This tells Glibc to compile itself against the headers
@@ -121,7 +112,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="ca8">
+      <varlistentry os="ca7">
         <term><parameter>--with-binutils=/cross-tools/${LFS_TARGET}/bin</parameter></term>
         <listitem>
           <para>This tells GLIBC to use the binutils for our specific target architecture.</para>
@@ -134,8 +125,7 @@
 
 <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
     class="directory">/tools/include</filename>:</para>

Modified: trunk/BOOK/final-preps/aboutlfs.xml
===================================================================
--- trunk/BOOK/final-preps/aboutlfs.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/final-preps/aboutlfs.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -30,7 +30,7 @@
   <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
   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>
 
 <screen><userinput>install -d $LFS</userinput></screen>

Modified: trunk/BOOK/final-preps/addinguser.xml
===================================================================
--- trunk/BOOK/final-preps/addinguser.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/final-preps/addinguser.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -81,18 +81,16 @@
   <filename class="directory">$LFS</filename>,
   <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
 chown lfs $LFS/tools
 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>.
   This can be done via a virtual console, through a display manager, or

Modified: trunk/BOOK/final-preps/creatingcrossdir.xml
===================================================================
--- trunk/BOOK/final-preps/creatingcrossdir.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/final-preps/creatingcrossdir.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -24,16 +24,14 @@
 
   <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>
 
   <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>
 
 </sect1>

Modified: trunk/BOOK/introduction/common/acknowledgements.xml
===================================================================
--- trunk/BOOK/introduction/common/acknowledgements.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/introduction/common/acknowledgements.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -10,7 +10,7 @@
   <?dbhtml filename="acknowledgements.html"?>
 
   <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>
     <listitem>

Modified: trunk/BOOK/introduction/common/how.xml
===================================================================
--- trunk/BOOK/introduction/common/how.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/introduction/common/how.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -28,7 +28,7 @@
   LFS LiveCD or to download a copy, visit <ulink url="&livecd-root;"/></para>
 
   <!-- -->
-  <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
   to create a new Linux native partition and file system, the place
@@ -39,7 +39,7 @@
   discusses the setup for an appropriate working environment. Please read
   <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>
 
   <para><xref linkend="chapter-temp-system"/> explains the

Modified: trunk/BOOK/prologue/common/organization.xml
===================================================================
--- trunk/BOOK/prologue/common/organization.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/prologue/common/organization.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -41,7 +41,7 @@
   <sect2>
     <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 
           target host.</para>

Modified: trunk/BOOK/temp-system/common/coreutils.xml
===================================================================
--- trunk/BOOK/temp-system/common/coreutils.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/temp-system/common/coreutils.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -32,27 +32,14 @@
 <screen os="be"><userinput>./configure --prefix=/tools --cache-file=config.cache \
    --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="bi"><userinput>make install</userinput></screen>
 
-<screen os="bh"><userinput>make</userinput></screen>
-
-    <para os="bi">Install the package:</para>
-
-<screen os="bj"><userinput>make install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/temp-system/multilib/coreutils.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/coreutils.xml	2005-12-27 06:56:39 UTC (rev 964)
+++ trunk/BOOK/temp-system/multilib/coreutils.xml	2005-12-27 06:57:04 UTC (rev 965)
@@ -54,10 +54,6 @@
     href="../common/coreutils.xml"
     xpointer="xpointer(//*[@os='bi'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
   </sect2>
 
   <sect2 role="content">




More information about the cross-lfs mailing list