Author: manuel
Date: 2005-06-21 12:56:46 -0600 (Tue, 21 Jun 2005)
New Revision: 6097

Added:
   branches/cross-lfs/BOOK/introduction/x86/livecd.xml
   branches/cross-lfs/BOOK/introduction/x86_64/livecd.xml
Removed:
   branches/cross-lfs/BOOK/introduction/x86/bootcd.xml
   branches/cross-lfs/BOOK/introduction/x86_64/bootcd.xml
Modified:
   branches/cross-lfs/BOOK/introduction/common/how.xml
   branches/cross-lfs/BOOK/introduction/common/resources.xml
   branches/cross-lfs/BOOK/introduction/x86-chapter.xml
   branches/cross-lfs/BOOK/introduction/x86_64-chapter.xml
Log:
Text updates ported from trunk.

Modified: branches/cross-lfs/BOOK/introduction/common/how.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/how.xml 2005-06-21 17:21:23 UTC 
(rev 6096)
+++ branches/cross-lfs/BOOK/introduction/common/how.xml 2005-06-21 18:56:46 UTC 
(rev 6097)
@@ -10,7 +10,7 @@
 
   <title>How to Build an LFS System</title>
 
-  <para>The LFS system will be built by using a previously installed
+  <para>The LFS system will be built by using an existing running
   Linux distribution (such as Debian, Mandrake, Red Hat, or SuSE). This
   existing Linux system (the host) will be used as a starting point to
   provide necessary programs, including a compiler, linker, and shell,
@@ -18,6 +18,18 @@
   during the distribution installation to be able to access these
   tools.</para>
 
+  <para>As an alternative to installing an entire separate distribution
+  onto your machine, and if your host machine is x86 based, you may wish to
+  use the Linux From Scratch LiveCD. The CD works well as a host sytem,
+  providing all the tools you need to successfully follow the instructions
+  in this book. Additionally, it contains all the source packages, patches
+  and a copy of this book. So once you have the CD, no network connection
+  or additional downloads are necessary. For more information about the
+  LFS LiveCD or to download a copy, visit
+  <ulink url="http://linuxfromscratch.org/~jhuntwork/livecd/"/></para>
+
+  <!-- The text below need to be rewrited -->
+
   <para><xref linkend="chapter-partitioning"/> of this book describes how
   to create a new Linux native partition and file system, the place
   where the new LFS system will be compiled and installed. <xref

Modified: branches/cross-lfs/BOOK/introduction/common/resources.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/resources.xml   2005-06-21 
17:21:23 UTC (rev 6096)
+++ branches/cross-lfs/BOOK/introduction/common/resources.xml   2005-06-21 
18:56:46 UTC (rev 6097)
@@ -15,8 +15,8 @@
 
     <para>If during the building of the LFS system you encounter any
     errors, have any questions, or think there is a typo in the book,
-    please start by consulting the Frequently Asked Questions (FAQ) at
-    <ulink url="&faq-root;"/>.</para>
+    please start by consulting the Frequently Asked Questions (FAQ)
+    that is located at <ulink url="&faq-root;"/>.</para>
 
   </sect2>
 
@@ -72,7 +72,7 @@
     <title>References</title>
 
     <para>For additional information on the packages, useful tips are
-    available at <ulink
+    available in the LFS Package Reference page located at <ulink
     
url="http://www.linuxfromscratch.org/~matthew/LFS-references.html"/>.</para>
 
   </sect2>

Deleted: branches/cross-lfs/BOOK/introduction/x86/bootcd.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86/bootcd.xml 2005-06-21 17:21:23 UTC 
(rev 6096)
+++ branches/cross-lfs/BOOK/introduction/x86/bootcd.xml 2005-06-21 18:56:46 UTC 
(rev 6097)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-bootcd" arch="x86">
-  <?dbhtml filename="bootcd.html"?>
-
-  <title>About the Included CD</title>
-
-  <para>For your convenience, we have included a CD with this book that
-  contains the source packages needed for creating a Linux From Scratch
-  system.  The CD is bootable and provides a stable working environment
-  for building LFS.  This book refers to this system as the
-  <quote>host system.</quote>  The CD images are actively maintained and
-  updated versions can be found at
-  <ulink url="ftp://ftp.lfs-matrix.de/pub/lfs-livecd/"/></para>
-
-  <para>In addition to the tools required to build LFS, the host system
-  on the CD has a number of other helpful tools installed:</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>An HTML version of this book</para>
-    </listitem>
-
-    <listitem>
-      <para>The X Window System Environment</para>
-    </listitem>
-
-    <listitem>
-      <para>Web Tools</para>
-      <itemizedlist>
-        <listitem>
-          <para>Wget (command line file retriever)</para>
-        </listitem>
-        <listitem>
-          <para>Lynx (text web browser)</para>
-        </listitem>
-        <listitem>
-          <para>Irssi (console IRC client)</para>
-        </listitem>
-        <listitem>
-          <para>Firefox (graphical web browser)</para>
-        </listitem>
-        <listitem>
-          <para>Xchat (X-based IRC client)</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Text Editors</para>
-      <itemizedlist>
-        <listitem>
-          <para>Vim</para>
-        </listitem>
-        <listitem>
-          <para>Nano</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Network Tools</para>
-      <itemizedlist>
-        <listitem>
-          <para>SSH Server and Client</para>
-        </listitem>
-        <listitem>
-          <para>NFS Server and Client</para>
-        </listitem>
-        <listitem>
-          <para>Smbmount (mount.cifs) for Windows shares</para>
-        </listitem>
-        <listitem>
-          <para>Subversion</para>
-        </listitem>
-        <listitem>
-          <para>Dhcpcd (DHCP client)</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Filesystem Programs</para>
-      <itemizedlist>
-        <listitem>
-          <para>Reiserfsprogs</para>
-        </listitem>
-        <listitem>
-          <para>Xfsprogs</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>nALFS - A tool for automating LFS builds</para>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>

Copied: branches/cross-lfs/BOOK/introduction/x86/livecd.xml (from rev 6096, 
branches/cross-lfs/BOOK/introduction/x86/bootcd.xml)

Modified: branches/cross-lfs/BOOK/introduction/x86-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86-chapter.xml        2005-06-21 
17:21:23 UTC (rev 6096)
+++ branches/cross-lfs/BOOK/introduction/x86-chapter.xml        2005-06-21 
18:56:46 UTC (rev 6097)
@@ -16,6 +16,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="x86/changelog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="common/resources.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="common/askforhelp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="x86/bootcd.xml"/>
+  <!-- This page is only for published versions if the LiveCD is included
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="x86/livecd.xml"/>
+  -->
 
 </chapter>

Deleted: branches/cross-lfs/BOOK/introduction/x86_64/bootcd.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86_64/bootcd.xml      2005-06-21 
17:21:23 UTC (rev 6096)
+++ branches/cross-lfs/BOOK/introduction/x86_64/bootcd.xml      2005-06-21 
18:56:46 UTC (rev 6097)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-  href="../x86/bootcd.xml"
-  xpointer="xpointer(/sect1)"/>

Copied: branches/cross-lfs/BOOK/introduction/x86_64/livecd.xml (from rev 6096, 
branches/cross-lfs/BOOK/introduction/x86_64/bootcd.xml)

Modified: branches/cross-lfs/BOOK/introduction/x86_64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86_64-chapter.xml     2005-06-21 
17:21:23 UTC (rev 6096)
+++ branches/cross-lfs/BOOK/introduction/x86_64-chapter.xml     2005-06-21 
18:56:46 UTC (rev 6097)
@@ -17,6 +17,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="x86_64/changelog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="common/resources.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="common/askforhelp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="x86_64/bootcd.xml"/>
+  <!-- This page is only for published versions if the LiveCD is included
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="x86/livecd.xml"/>
+  -->
 
 </chapter>

-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page

Reply via email to