r2029 - / trunk/BOOK trunk/BOOK/final-system/x86_64 trunk/BOOK/introduction/common trunk/BOOK/prologue/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jul 18 00:45:19 PDT 2006

Author: jim
Date: 2006-07-18 01:45:15 -0600 (Tue, 18 Jul 2006)
New Revision: 2029

 r4657 at server (orig r2150):  chris at beaker67.com | 2006-07-17 20:58:44 -0700
 Text updates, and addition of a clfs-wiki entity to account for the difference between the CLFS trac website and the package/patch download site

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

Modified: trunk/BOOK/final-system/x86_64/grub.xml
--- trunk/BOOK/final-system/x86_64/grub.xml	2006-07-17 07:45:07 UTC (rev 2028)
+++ trunk/BOOK/final-system/x86_64/grub.xml	2006-07-18 07:45:15 UTC (rev 2029)
@@ -28,9 +28,9 @@
-   <para os="p3">The follow patch will fix an issue that exists
-   with grub on x86_64 machines, that causes grub to segfault when you
-   try to configure a drive to utilize grub:</para>
+    <para os="p3">GRUB has an issue that can cause it to segfault when you
+    try to configure a drive to utilize GRUB on x86_64 machines. The following
+    patch fixes this problem:</para>
 <screen os="p4"><userinput>patch -Np1 -i ../&grub-use_mmap-patch;</userinput></screen>

Modified: trunk/BOOK/general.ent
--- trunk/BOOK/general.ent	2006-07-17 07:45:07 UTC (rev 2028)
+++ trunk/BOOK/general.ent	2006-07-18 07:45:15 UTC (rev 2029)
@@ -29,14 +29,15 @@
 <!ENTITY version-alpha "&version;-ALPHA">
 <!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 "&clfs-root;/wiki/faq">
+<!ENTITY faq-root "&clfs-root;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: trunk/BOOK/introduction/common/changelog.xml
--- trunk/BOOK/introduction/common/changelog.xml	2006-07-17 07:45:07 UTC (rev 2028)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-07-18 07:45:15 UTC (rev 2029)
@@ -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: trunk/BOOK/introduction/common/resources.xml
--- trunk/BOOK/introduction/common/resources.xml	2006-07-17 07:45:07 UTC (rev 2028)
+++ trunk/BOOK/introduction/common/resources.xml	2006-07-18 07:45:15 UTC (rev 2029)
@@ -33,7 +33,7 @@
     <para><ulink url="http://www.mail-archive.com/index.php?hunt=clfs"/></para>
     <para>For information on the different lists, how to subscribe, archive
-    locations, and additional information, visit <ulink url="&clfs-root;wiki/lists"/>.</para>
+    locations, and additional information, visit <ulink url="&clfs-wiki;wiki/lists"/>.</para>i
@@ -69,7 +69,7 @@
     <para>The CLFS project has a number of world-wide mirrors to make
     accessing the website and downloading the required packages more
     convenient. Please visit the CLFS website at
-    <ulink url="&clfs-root;wiki/mirrors"/> for mirrors of CLFS.</para>
+    <ulink url="&clfs-wiki;wiki/mirrors"/> for mirrors of CLFS.</para>

Modified: trunk/BOOK/prologue/common/audience.xml
--- trunk/BOOK/prologue/common/audience.xml	2006-07-17 07:45:07 UTC (rev 2028)
+++ trunk/BOOK/prologue/common/audience.xml	2006-07-18 07:45:15 UTC (rev 2029)
@@ -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: trunk/BOOK/prologue/common/prerequisites.xml
--- trunk/BOOK/prologue/common/prerequisites.xml	2006-07-17 07:45:07 UTC (rev 2028)
+++ trunk/BOOK/prologue/common/prerequisites.xml	2006-07-18 07:45:15 UTC (rev 2029)
@@ -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 CLFS 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