aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Canales Esparcia <manuel@linuxfromscratch.org>2004-12-19 19:08:13 +0000
committerManuel Canales Esparcia <manuel@linuxfromscratch.org>2004-12-19 19:08:13 +0000
commit1422130085ebfa2674217107518bd12a8895bd00 (patch)
tree9929b41c17649ed8f44d2958d212f19adda6d420
parent87899e5354cf50414a44c5fb36317e4f6a0fe99b (diff)
Dropped/updated the text in unstable - Chapter01, 02 and 09.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4423 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/askforhelp.xml2
-rw-r--r--chapter01/how.xml2
-rw-r--r--chapter02/creatingfilesystem.xml4
-rw-r--r--chapter02/creatingpartition.xml10
-rw-r--r--chapter02/introduction.xml4
-rw-r--r--chapter02/mounting.xml4
-rw-r--r--chapter09/getcounted.xml4
-rw-r--r--chapter09/reboot.xml18
-rw-r--r--chapter09/theend.xml2
-rw-r--r--chapter09/whatnow.xml4
10 files changed, 40 insertions, 14 deletions
diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml
index f876d4c69..de599d7c2 100644
--- a/chapter01/askforhelp.xml
+++ b/chapter01/askforhelp.xml
@@ -11,7 +11,7 @@
<!--
<para>If you run into a problem while working through this book, you should
-first check the FAQ at <ulink url="&faq-root;"/> -- often your question
+first check the FAQ at <ulink url="&faq-root;"/> - often your question
is already answered there. If it is not, you should try to find the source of
the problem. The following hint might give you some ideas for your
troubleshooting: <ulink url="&hints-root;errors.txt"/>.</para>
diff --git a/chapter01/how.xml b/chapter01/how.xml
index 1a1adf9ca..d416d3d59 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -27,7 +27,7 @@ environment to work in.</para>
<para><xref linkend="chapter-temporary-tools"/> then discusses the installation of a number
of packages that will form the basic development suite (or <emphasis>toolchain</emphasis>) which is
used to build the actual system in <xref linkend="chapter-building-system"/>. Some of these
-packages are needed to resolve circular dependencies -- for example, to compile
+packages are needed to resolve circular dependencies - for example, to compile
a compiler you need a compiler.</para>
<para>The first thing to be done in <xref linkend="chapter-temporary-tools"/> is build a
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index d69978ebb..5b0bd32c0 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -7,6 +7,9 @@
<title>Creating a file system</title>
<?dbhtml filename="creatingfilesystem.html"?>
+<para>See testing</para>
+
+<!--
<para>Now that we have a blank partition, we can create a file system on it.
Most widely used in the Linux world is the second extended file system (ext2),
but with the high-capacity hard disks of today the so-called journaling file
@@ -29,5 +32,6 @@ swap partition too (also known as formatting, like you did above with
<para>Replace <replaceable>[yyy]</replaceable> with the name of the swap
partition.</para>
+-->
</sect1>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index 82b4184e4..dfb1ea387 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -7,6 +7,9 @@
<title>Creating a new partition</title>
<?dbhtml filename="creatingpartition.html"?>
+<para>See testing</para>
+
+<!--
<para>In order to build our new Linux system, we will need some space:
an empty disk partition. If you don't have a free partition, and no room
on any of your hard disks to make one, then you could build LFS on the
@@ -22,7 +25,7 @@ will probably want to install additional software, and will need more space
than this, probably around 2 or 3 GB.</para>
<para>As we almost never have enough RAM in our box, it is a good idea to
-use a small disk partition as swap space -- this space is used by the kernel
+use a small disk partition as swap space - this space is used by the kernel
to store seldom-used data to make room in memory for more urgent stuff.
The swap partition for your LFS system can be the same one as for your host
system, so you won't have to create another if your host system already uses
@@ -30,15 +33,16 @@ a swap partition.</para>
<para>Start a disk partitioning program such as <command>cfdisk</command>
or <command>fdisk</command> with an argument naming the hard disk upon
-which the new partition must be created -- for example
+which the new partition must be created - for example
<filename>/dev/hda</filename> for the primary IDE disk. Create a Linux native
partition and a swap partition, if needed. Please refer to the man pages of
<command>cfdisk</command> or <command>fdisk</command> if you don't yet
know how to use the programs.</para>
-<para>Remember the designation of your new partition -- something like
+<para>Remember the designation of your new partition - something like
<filename>hda5</filename>. This book will refer to it as the LFS partition.
If you (now) also have a swap partition, remember its designation too. These
names will later be needed for the <filename>/etc/fstab</filename> file.</para>
+-->
</sect1>
diff --git a/chapter02/introduction.xml b/chapter02/introduction.xml
index f1609dab9..38b6c20fa 100644
--- a/chapter02/introduction.xml
+++ b/chapter02/introduction.xml
@@ -7,8 +7,12 @@
<title>Introduction</title>
<?dbhtml filename="introduction.html"?>
+<para>See testing</para>
+
+<!--
<para>In this chapter the partition which will host the LFS system is
prepared. We will create the partition itself, make a file system on it,
and mount it.</para>
+-->
</sect1>
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
index 87331dcfb..52e4409aa 100644
--- a/chapter02/mounting.xml
+++ b/chapter02/mounting.xml
@@ -7,6 +7,9 @@
<title>Mounting the new partition</title>
<?dbhtml filename="mounting.html"?>
+<para>See testing</para>
+
+<!--
<para>Now that we've created a file system, we want to be able to access
the partition. For that, we need to mount it, and have to choose a mount
point. In this book we assume that the file system is mounted under
@@ -46,5 +49,6 @@ you see nosuid, nodev or noatime, you will need to remount it.</para>
<para>Now that we've made ourselves a place to work in, we're ready to download
the packages.</para>
+-->
</sect1>
diff --git a/chapter09/getcounted.xml b/chapter09/getcounted.xml
index 4eeaa7b74..24ae18c7b 100644
--- a/chapter09/getcounted.xml
+++ b/chapter09/getcounted.xml
@@ -7,6 +7,9 @@
<title>Get Counted</title>
<?dbhtml filename="getcounted.html"?>
+<para>See testing</para>
+
+<!--
<para>Want to be counted as an LFS user now that you have finished the
book? Head over
to <ulink url="&lfs-root;cgi-bin/lfscounter.cgi"/> and
@@ -14,5 +17,6 @@ register as an LFS user by entering your name and the first LFS version
you have used.</para>
<para>Let's reboot into LFS now...</para>
+-->
</sect1>
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index 96969a9d4..018b13f8f 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -7,8 +7,8 @@
<title>Rebooting the system</title>
<?dbhtml filename="reboot.html"?>
-<para>Now that all of the software has been installed, it is time to reboot
-your computer. First exit from the chroot environment:</para>
+<para>Now that all of the software has been installed, it is time to
+reboot the computer. First exit from the chroot environment:</para>
<screen><userinput>logout</userinput></screen>
@@ -20,25 +20,25 @@ umount $LFS/dev
umount $LFS/proc
umount $LFS/sys</userinput></screen>
-<para>And unmount the LFS file system:</para>
+<para>Unmount the LFS file system itself:</para>
<screen><userinput>umount $LFS</userinput></screen>
-<para>If at the start you decided to create multiple partitions, you'll need to
-unmount the other partitions before unmounting the main one, like this:</para>
+<para>If multiple partitions were created, unmount the other
+partitions before unmounting the main one, like this:</para>
<screen><userinput>umount $LFS/usr
umount $LFS/home
umount $LFS</userinput></screen>
-<para>Now reboot your system with:</para>
+<para>Now, reboot the system with:</para>
<screen><userinput>shutdown -r now</userinput></screen>
<para>Assuming the Grub boot loader was set up as outlined earlier, the menu
-is set to boot <emphasis>LFS &milestone;</emphasis> automatically.</para>
+is set to boot <emphasis>LFS &version;</emphasis> automatically.</para>
-<para>When the reboot is complete, your LFS system is ready for use and you
-can start adding your own software.</para>
+<para>When the reboot is complete, the LFS system is ready for use and
+software can be added.</para>
</sect1>
diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index c29cc6f8a..8099c8cf9 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -9,6 +9,7 @@
<indexterm zone="ch-finish-theend"><primary sortas="e-/etc/lfs-release">/etc/lfs-release</primary></indexterm>
+<!--
<para>Well done! You have finished installing your LFS system. It may have
been a long process, but we hope it was worth it. We wish you a lot of fun
with your new shiny custom built Linux system.</para>
@@ -17,6 +18,7 @@ with your new shiny custom built Linux system.</para>
file. By having this file it is very easy for you (and for us if you are going
to ask for help with something at some point) to find out which LFS version
you have installed on your system. Create this file by running:</para>
+-->
<screen><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
diff --git a/chapter09/whatnow.xml b/chapter09/whatnow.xml
index 4bc76c04a..50e48d63f 100644
--- a/chapter09/whatnow.xml
+++ b/chapter09/whatnow.xml
@@ -7,6 +7,9 @@
<title>What now?</title>
<?dbhtml filename="whatnow.html"?>
+<para>See testing</para>
+
+<!--
<para>We thank you for reading the LFS Book and hope that you've found this
book useful and worth your time.</para>
@@ -41,5 +44,6 @@ of HOWTOs, Guides and man pages; it may be found at
<ulink url="http://www.tldp.org/"/>.</para></listitem>
</itemizedlist>
+-->
</sect1>