r2042 - / branches/clfs-2.0/BOOK branches/clfs-2.0/BOOK/cross-tools/common branches/clfs-2.0/BOOK/final-system/common branches/clfs-2.0/BOOK/introduction/common branches/clfs-2.0/BOOK/materials/common branches/clfs-2.0/BOOK/prologue/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Jul 19 20:45:34 PDT 2006

Author: jim
Date: 2006-07-19 21:45:31 -0600 (Wed, 19 Jul 2006)
New Revision: 2042

 r4679 at server (orig r2160):  jciccone | 2006-07-19 19:24:03 -0700
 Text and entity updates.

Property changes on: 
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2159
   + b6734a72-470d-0410-b049-f317dca95413:/:2160

Modified: branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml
--- branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -125,7 +125,7 @@
           <para>This checks the host environment and makes sure all the
-          necessary tools are available to compile binutils.</para>
+          necessary tools are available to compile Binutils.</para>

Modified: branches/clfs-2.0/BOOK/final-system/common/bzip2.xml
--- branches/clfs-2.0/BOOK/final-system/common/bzip2.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/final-system/common/bzip2.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -44,7 +44,9 @@
 <screen os="p6"><userinput>patch -Np1 -i ../&bzip2-remove_tempfile-patch;</userinput></screen>
-    <para os="s1">Disable running of the testsuite after a successful build:</para>
+    <para os="s1">Bzip2's default Makefile target automatically runs
+     the testsuite as well. Disable the tests since they won't work on a
+     multi-architecture build:</para>
 <screen os="s2"><userinput>cp Makefile{,.orig}
 sed -e "/^all:/s/ test//" Makefile.orig > Makefile</userinput></screen>

Modified: branches/clfs-2.0/BOOK/final-system/common/gzip.xml
--- branches/clfs-2.0/BOOK/final-system/common/gzip.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/final-system/common/gzip.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -25,10 +25,10 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
-    <para os="p1">The following patch fixes two security vulnerabilities in Gzip.
-    First, a path traversal bug when using the <option>-N</option> option
-    (CAN-2005-1228) Second, a race condition in the file permission restore
-    code (CAN-2005-0998)</para>
+    <para os="p1">The following patch fixes two security vulnerabilities in Gzip:
+    a path traversal bug when using the <option>-N</option> option
+    (CAN-2005-1228), and a race condition in the file permission restore
+    code (CAN-2005-0998):</para>
 <screen os="p2"><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>

Modified: branches/clfs-2.0/BOOK/final-system/common/man.xml
--- branches/clfs-2.0/BOOK/final-system/common/man.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/final-system/common/man.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -117,7 +117,7 @@
     <para os="v">Additional information with regards to the compression of
     man and info pages can be found in the BLFS book at
-    <ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>
+    <ulink url="&blfs-root;view/svn/postlfs/compressdoc.html"/>.</para>

Modified: branches/clfs-2.0/BOOK/final-system/common/sysklogd.xml
--- branches/clfs-2.0/BOOK/final-system/common/sysklogd.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/final-system/common/sysklogd.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -26,7 +26,7 @@
     <title>Installation of Sysklogd</title>
     <para os="a">The following patch fixes various issues, including a
-    problem building Sysklogd with Linux 2.6 series kernels</para>
+    problem building Sysklogd with Linux 2.6 series kernels:</para>
 <screen os="b"><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>

Modified: branches/clfs-2.0/BOOK/general.ent
--- branches/clfs-2.0/BOOK/general.ent	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/general.ent	2006-07-20 03:45:31 UTC (rev 2042)
@@ -2,7 +2,7 @@
 <!ENTITY month "07"> <!-- Use two digits -->
 <!ENTITY month_name "July">
-<!ENTITY day "16"> <!-- Use two digits -->
+<!ENTITY day "19"> <!-- Use two digits -->
 <!ENTITY year "2006"> <!-- Use four digits -->
 <!ENTITY releasedate "&month_name; &day;, &year;">
@@ -18,14 +18,15 @@
 <!ENTITY version-ARM "&version;-ARM">
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
-<!ENTITY clfs-root "http://trac.cross-lfs.org/">
+<!ENTITY clfs-root "http://cross-lfs.org/">
+<!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
-<!ENTITY faq-root "&lfs-root;faq/">
+<!ENTITY faq-root "&clfs-wiki;wiki/faq">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY livecd-root "&lfs-root;livecd/">
-<!ENTITY test-results "&clfs-root;clfs/build-logs/&generic-version;/">
-<!ENTITY errata "&clfs-root;clfs/errata/&generic-version;/">
+<!ENTITY test-results "&clfs-wiki;clfs/build-logs/&generic-version;/">
+<!ENTITY errata "&clfs-wiki;clfs/errata/&generic-version;/">
 <!ENTITY gnu "http://ftp.gnu.org/gnu/">
 <!ENTITY gnu-software "http://www.gnu.org/software/">

Modified: branches/clfs-2.0/BOOK/introduction/common/askforhelp.xml
--- branches/clfs-2.0/BOOK/introduction/common/askforhelp.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/introduction/common/askforhelp.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -68,7 +68,7 @@
       <para>Deviating from this book does <emphasis>not</emphasis>
       mean that we will not help you. After all, the CLFS project is
       about personal preference. Be upfront about any changes to
-      the established procedure, this helps us evaluate and determine
+      the established procedure—this helps us evaluate and determine
       possible causes of your problem.</para>

Modified: branches/clfs-2.0/BOOK/introduction/common/changelog.xml
--- branches/clfs-2.0/BOOK/introduction/common/changelog.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/introduction/common/changelog.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -13,7 +13,7 @@
   <para>This is version &version; of the Cross-Compiled Linux From Scratch book, dated
   &releasedate;. If this book is more than six months old, a newer and better
   version is probably already available. To find out, please check one of the
-  mirrors via <ulink url="&clfs-root;"/>.</para>
+  mirrors via <ulink url="&clfs-wiki;"/>.</para>
   <para>Below is a list of detailed changes made since the previous release of
    the book.</para>

Modified: branches/clfs-2.0/BOOK/introduction/common/resources.xml
--- branches/clfs-2.0/BOOK/introduction/common/resources.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/introduction/common/resources.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -32,7 +32,7 @@
     <para>For information on the different lists, how to subscribe, archive
     locations, and additional information, visit
     <ulink url="&lfs-root;mail.html"/>. For mailing lists specifically
-    for CLFS, visit <ulink url="&clfs-root;wiki/lists"/>.</para>
+    for CLFS, visit <ulink url="&clfs-wiki;wiki/lists"/>.</para>
@@ -75,7 +75,7 @@
     accessing the website and downloading the required packages more
     convenient. Please visit the LFS website at <ulink
     url="&lfs-root;mirrors.html"/> for a list of current mirrors of
-    the LFS website, or <ulink url="&clfs-root;wiki/mirrors"/> for
+    the LFS website, or <ulink url="&clfs-wiki;wiki/mirrors"/> for
     mirrors of CLFS.</para>

Modified: branches/clfs-2.0/BOOK/materials/common/introduction.xml
--- branches/clfs-2.0/BOOK/materials/common/introduction.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/materials/common/introduction.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -24,7 +24,7 @@
   url="http://www.google.com/"/>) provides a useful search engine for
   most packages. If this search is unsuccessful, try one of the
   alternative means of downloading discussed at <ulink
-  url="&clfs-root;wiki/download"/>.</para>
+  url="&packages-root;"/>.</para>
   <para>Downloaded packages and patches will need to be stored somewhere
   that is conveniently available throughout the entire build. A working
@@ -41,11 +41,11 @@
 <screen><userinput>mkdir -v $CLFS/sources</userinput></screen>
-  <para>Make this directory writable and sticky. <quote>Sticky</quote>
-  means that even if multiple users have write permission on a
-  directory, only the owner of a file can delete the file within a
-  sticky directory. The following command will enable the write and
-  sticky modes:</para>
+  <para>Make this directory writable and sticky. When a directory is
+  marked <quote>sticky</quote>, that means that even if multiple users have
+  write permission on that directory, any file within that directory can only be
+  deleted or modified by its owner. The following command will enable the
+  write and sticky modes:</para>
 <screen><userinput>chmod -v a+wt $CLFS/sources</userinput></screen>

Modified: branches/clfs-2.0/BOOK/materials/common/patches.xml
--- branches/clfs-2.0/BOOK/materials/common/patches.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/materials/common/patches.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -14,7 +14,7 @@
   These patches correct any mistakes in the packages that should be
   fixed by the maintainer. The patches also make small modifications to
   make the packages easier to work with. The following patches will be
-  needed to build an CLFS system:</para>
+  needed to build a CLFS system:</para>
   <variablelist role="materials">

Modified: branches/clfs-2.0/BOOK/packages.ent
--- branches/clfs-2.0/BOOK/packages.ent	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/packages.ent	2006-07-20 03:45:31 UTC (rev 2042)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY packages-root "http://cross-lfs.org/files/packages/&generic-version;/">
+<!ENTITY packages-root "&clfs-root;files/packages/&generic-version;/">
 <!-- Note: For empty *-home entities use " " not "" -->

Modified: branches/clfs-2.0/BOOK/patches.ent
--- branches/clfs-2.0/BOOK/patches.ent	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/patches.ent	2006-07-20 03:45:31 UTC (rev 2042)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY patches-root "http://cross-lfs.org/files/patches/&generic-version;/">
+<!ENTITY patches-root "&clfs-root;files/patches/&generic-version;/">
 <!-- Start of Common Patches -->

Modified: branches/clfs-2.0/BOOK/prologue/common/audience.xml
--- branches/clfs-2.0/BOOK/prologue/common/audience.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/prologue/common/audience.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -67,7 +67,7 @@
   yourself, you have no guarantee that the new binary package was built
   correctly and adequately fixes the problem.</para>
-  <para>The goal of Linux From Scratch is to build a complete and usable
+  <para>The goal of Cross Linux From Scratch is to build a complete and usable
   foundation-level system. Readers who do not wish to build their own
   Linux system from scratch may not benefit from the information in this
   book. If you only want to know what happens while the computer boots,

Modified: branches/clfs-2.0/BOOK/prologue/common/foreword.xml
--- branches/clfs-2.0/BOOK/prologue/common/foreword.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/prologue/common/foreword.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -24,7 +24,7 @@
   udev dynamic device structure, sanitized kernel headers, and other
   improvements to the Linux From Scratch system.</para>
-  <para>The one "flaw" in LFS is that it has always been based on a x86
+  <para>The one "flaw" in LFS is that it has always been based on an x86
   class processor.  With the advent of the Athlon 64 and Intel EM64T
   processors, the x86-only LFS is no longer ideal. Throughout this time,
   Ryan Oliver developed and documented a process by which you could
@@ -39,13 +39,13 @@
   architectures such as Sparc, MIPS, and Alpha, and much more.</para>
   <para>We hope you enjoy building your own CLFS system, and the benefits
-  that come from a system tailored to your needs!</para>
+  that come from a system tailored to your needs.</para>
 Jeremy Utley, CLFS 1.x Release Manager (Page Author)
 Jim Gifford, CLFS Project Co-leader
 Ryan Oliver, CLFS Project Co-leader
-Joe Ciccone, Justin Knierin, Chris Staub, Matt Darcy, Ken Moffat,
+Joe Ciccone, Justin Knierim, Chris Staub, Matt Darcy, Ken Moffat,
 Manuel Canales Esparcia, and Nathan Coulson - CLFS Developers</literallayout>

Modified: branches/clfs-2.0/BOOK/prologue/common/prerequisites.xml
--- branches/clfs-2.0/BOOK/prologue/common/prerequisites.xml	2006-07-20 03:45:14 UTC (rev 2041)
+++ branches/clfs-2.0/BOOK/prologue/common/prerequisites.xml	2006-07-20 03:45:31 UTC (rev 2042)
@@ -19,13 +19,13 @@
   expected that the reader has a reasonable knowledge of using and installing
   Linux software. A basic knowledge of the architectures being used in 
   the Cross LFS process and the host operating systems in use is also
-  required</para>
+  required.</para>
   <para>Because the CLFS book assumes <emphasis>at least</emphasis> this basic
   level of skill, the various LFS support forums are unlikely to be able to
   provide you with much assistance; you will find that your questions regarding
   such basic knowledge will likely go unanswered, or you will simply be referred
-  to the LFS essential pre-reading list.</para>
+  to the CLFS essential pre-reading list.</para>
   <para>Before building a CLFS system, we recommend reading the following
@@ -48,7 +48,7 @@
       <para remap="verbatim">The Essential Pre-Reading Hint
       <ulink url="&hints-root;essential_prereading.txt"/></para>
-      <para>This is an LFS Hint written specifically for users new to Linux.
+      <para>This is an Hint written specifically for users new to Linux.
       It includes a list of links to excellent sources of information on a
       wide range of topics. Anyone attempting to install CLFS should have an
       understanding of many of the topics in this hint.</para>

More information about the cross-lfs mailing list