aboutsummaryrefslogtreecommitdiffstats
path: root/chapter02
diff options
context:
space:
mode:
Diffstat (limited to 'chapter02')
-rw-r--r--chapter02/aboutlfs.xml8
-rw-r--r--chapter02/askforhelp.xml22
-rw-r--r--chapter02/install.xml8
-rw-r--r--chapter02/platform.xml6
4 files changed, 22 insertions, 22 deletions
diff --git a/chapter02/aboutlfs.xml b/chapter02/aboutlfs.xml
index de840e166..6f9d7ed9f 100644
--- a/chapter02/aboutlfs.xml
+++ b/chapter02/aboutlfs.xml
@@ -3,7 +3,7 @@
<?dbhtml filename="aboutlfs.html" dir="chapter02"?>
<para>Please read the following carefully: throughout this book
-the variable $LFS will be used frequently. $LFS must at all times be
+the variable LFS will be used frequently. $LFS must at all times be
replaced with the directory where the partition that contains the LFS system
is mounted. How to create and where to mount the partition will be
explained in full detail in Chapter 4. For example, let's assume that
@@ -28,18 +28,18 @@ it literally. Your shell will replace $LFS with /mnt/lfs when it processes
the command line (meaning when you hit enter after having typed the
command).</para>
-<para>If you plan to use $LFS, do not forget to set the $LFS variable at all
+<para>If you plan to use $LFS, do not forget to set the LFS variable at all
times. If the variable is not set and is used in a command, $LFS will
be ignored and whatever is left will be executed. A command like
<userinput>echo "root:x:0:0:root:/root:/bin/bash" &gt;
-$LFS/etc/passwd</userinput> without the $LFS variable set will
+$LFS/etc/passwd</userinput> without the LFS variable set will
re-create your host system's /etc/passwd file. Simply put: it will
destroy your current password database file.</para>
<para>One way to make sure that $LFS is set at all times is adding it to
the /root/.bash_profile and /root/.bashrc files so that every time
you login as user root, or you <userinput>su</userinput> to user root,
-the $LFS variable is set.</para>
+the LFS variable is set.</para>
</sect1>
diff --git a/chapter02/askforhelp.xml b/chapter02/askforhelp.xml
index 6fb4becec..8cbc00f31 100644
--- a/chapter02/askforhelp.xml
+++ b/chapter02/askforhelp.xml
@@ -24,7 +24,7 @@ essential things to include in your request are:</para>
</itemizedlist>
<para>(Note that saying that you've deviated from the book doesn't mean
-that we won't help you. After all, LFS is about choice. It'll just
+that we won't help you. After all, LFS is about choice. It'll just
help us to see other possible causes of your problem.)</para>
</sect2>
@@ -45,17 +45,17 @@ Include those relevant lines if you decide to ask for help.</para>
<para>To help us find the cause of the problem, both screen output and
the contents of various files are useful. The screen output from both
-the ./configure script and the make run can be useful. Don't blindly
+the ./configure script and the make run can be useful. Don't blindly
include the whole thing but on the other hand, don't include too little.
As an example, here is some screen output from make:</para>
-<para><screen>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
--DLOCALEDIR=\"/mnt/lfs/usr/share/locale\" -DLIBDIR=\"/mnt/lfs/usr/lib\"
--DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
+<para><screen>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
+-DLOCALEDIR=\"/mnt/lfs/usr/share/locale\" -DLIBDIR=\"/mnt/lfs/usr/lib\"
+-DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
-g -O2 -c getopt1.c
-gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o expand.o file.o
-function.o getopt.o implicit.o job.o main.o misc.o read.o remake.o rule.o
-signame.o variable.o vpath.o default.o remote-stub.o version.o opt1.o
+gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o expand.o file.o
+function.o getopt.o implicit.o job.o main.o misc.o read.o remake.o rule.o
+signame.o variable.o vpath.o default.o remote-stub.o version.o opt1.o
-lutil job.o: In function `load_too_high':
/lfs/tmp/make-3.79.1/job.c:1565: undefined reference to `getloadavg'
collect2: ld returned 1 exit status
@@ -66,16 +66,16 @@ make[1]: Leaving directory `/lfs/tmp/make-3.79.1'
make: *** [all-recursive-am] Error 2</screen></para>
<para>In this case, many people just include the bottom section where it
-says <screen>make [2]: *** [make] Error 1</screen> and onwards. This
+says <screen>make [2]: *** [make] Error 1</screen> and onwards. This
isn't enough for us to diagnose the problem because it only tells us
that <emphasis>something</emphasis> went wrong, not
-<emphasis>what</emphasis> went wrong. The whole section, as
+<emphasis>what</emphasis> went wrong. The whole section, as
in the example above, is what should be included to be helpful, because it
includes the command that was executed and the command's error
message(s).</para>
<para>An excellent article on asking for help on the Internet in general
-has been written by Eric S. Raymond. It is available online at <ulink
+has been written by Eric S. Raymond. It is available online at <ulink
url="http://www.tuxedo.org/~esr/faqs/smart-questions.html"/>.
Read and follow the hints in that document and you are much more likely
to get a response to start with and also to get the help you actually
diff --git a/chapter02/install.xml b/chapter02/install.xml
index a37a71da0..866e18501 100644
--- a/chapter02/install.xml
+++ b/chapter02/install.xml
@@ -3,8 +3,8 @@
<?dbhtml filename="install.html" dir="chapter02"?>
<para>Before you start using the LFS book, we should point out that all
-of the commands here assume that you are using the bash shell. If you
-aren't, the commands may work, but we can't guarantee it. If you want a
+of the commands here assume that you are using the bash shell. If you
+aren't, the commands may work, but we can't guarantee it. If you want a
simple life, use bash.</para>
<para>Before you can actually start doing something with a package, you need
@@ -31,7 +31,7 @@ running:</para>
<para><screen><userinput>bzcat filename.tar.bz2 | tar -xv</userinput></screen></para>
<para>Nowadays most tar programs, but not all, are
-patched to be able to use bzip2 files directly. They use either
+patched to be able to use bzip2 files directly. They use either
the -I, the -y, or the -j parameter, which work the same as the -z
parameter for handling gzip files. The above construction, however,
works no matter how your host system decided to patch tar.</para>
@@ -76,7 +76,7 @@ available for when you need it again.</para>
<para>There is one exception; the kernel source tree. Keep it around as you
will need it later in this book when building a kernel. Nothing before then
-will use the kernel tree, so the source tree won't be in your way. If,
+will use the kernel tree, so the source tree won't be in your way. If,
however, you are short of disk space, you can remove the kernel tree and
re-untar it later when required.</para>
diff --git a/chapter02/platform.xml b/chapter02/platform.xml
index 81fcd9024..1c0ea4865 100644
--- a/chapter02/platform.xml
+++ b/chapter02/platform.xml
@@ -5,11 +5,11 @@
<para>LFS intends to be, as far as possible, platform independent. Having
said that, the main LFS development work occurs on the x86 platform. We
attempt to include information where possible on differences for other
-platforms such as PPC. If you come across a problem compiling which is
+platforms such as PPC. If you come across a problem compiling which is
not related to the x86 platform, still feel free to ask for help on the
-mailing lists. Even better, if you come up with a solution to a
+mailing lists. Even better, if you come up with a solution to a
particular problem related to one of the other platforms, please let us
-know at the lfs-dev mailing list. We will then (subject to confirming
+know at the lfs-dev mailing list. We will then (subject to confirming
it works) include that in the book.</para>
</sect1>