aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorMark Hymers <markh@linuxfromscratch.org>2001-07-22 19:45:10 +0000
committerMark Hymers <markh@linuxfromscratch.org>2001-07-22 19:45:10 +0000
commitb822811980a5f82726cb641cbeff66be9eb6d92a (patch)
tree27c4db3c62aaea065b053e43c39b2ba44c04a05f /chapter05
parent46f5461af92bc70c62bbb92895032b930954d835 (diff)
XML changes
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@827 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/bash-exp.xml36
-rw-r--r--chapter05/bash-inst.xml30
-rw-r--r--chapter05/bash.xml6
-rw-r--r--chapter05/binutils-exp.xml24
-rw-r--r--chapter05/binutils-inst.xml12
-rw-r--r--chapter05/binutils.xml6
-rw-r--r--chapter05/bzip2-exp.xml18
-rw-r--r--chapter05/bzip2-inst.xml12
-rw-r--r--chapter05/bzip2.xml6
-rw-r--r--chapter05/diffutils-exp.xml6
-rw-r--r--chapter05/diffutils-inst.xml12
-rw-r--r--chapter05/diffutils.xml6
-rw-r--r--chapter05/fileutils-exp.xml6
-rw-r--r--chapter05/fileutils-inst.xml11
-rw-r--r--chapter05/fileutils.xml6
-rw-r--r--chapter05/gcc-exp.xml24
-rw-r--r--chapter05/gcc-inst.xml12
-rw-r--r--chapter05/gcc.xml6
-rw-r--r--chapter05/grep-inst.xml12
-rw-r--r--chapter05/grep.xml6
-rw-r--r--chapter05/gzip-inst.xml12
-rw-r--r--chapter05/gzip.xml6
-rw-r--r--chapter05/installasroot.xml12
-rw-r--r--chapter05/introduction.xml50
-rw-r--r--chapter05/kernel-exp.xml30
-rw-r--r--chapter05/kernel-inst.xml19
-rw-r--r--chapter05/kernel.xml6
-rw-r--r--chapter05/make-inst.xml12
-rw-r--r--chapter05/make.xml6
-rw-r--r--chapter05/mawk-inst.xml12
-rw-r--r--chapter05/mawk.xml6
-rw-r--r--chapter05/oldnsslib.xml30
-rw-r--r--chapter05/patch-inst.xml12
-rw-r--r--chapter05/patch.xml6
-rw-r--r--chapter05/proc.xml17
-rw-r--r--chapter05/pwdgroup.xml37
-rw-r--r--chapter05/sed-inst.xml12
-rw-r--r--chapter05/sed.xml6
-rw-r--r--chapter05/shellutils-inst.xml13
-rw-r--r--chapter05/shellutils.xml6
-rw-r--r--chapter05/tar-inst.xml29
-rw-r--r--chapter05/tar.xml6
-rw-r--r--chapter05/texinfo-exp.xml6
-rw-r--r--chapter05/texinfo-inst.xml12
-rw-r--r--chapter05/texinfo.xml6
-rw-r--r--chapter05/textutils-inst.xml12
-rw-r--r--chapter05/textutils.xml6
47 files changed, 195 insertions, 449 deletions
diff --git a/chapter05/bash-exp.xml b/chapter05/bash-exp.xml
index 1412e20f5..0a6f05751 100644
--- a/chapter05/bash-exp.xml
+++ b/chapter05/bash-exp.xml
@@ -1,50 +1,38 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>--enable-static-link:</userinput> This configure
-option causes Bash to be linked statically
-</para>
+<para><userinput>--enable-static-link:</userinput> This configure
+option causes Bash to be linked statically</para>
-<para>
-<userinput>--prefix=$LFS/usr:</userinput> This configure option installs
+<para><userinput>--prefix=$LFS/usr:</userinput> This configure option installs
all of Bash's files under the $LFS/usr directory, which becomes the /usr
directory after the user chroot'ed into $LFS or when he rebooted
-the system into LFS.
-</para>
+the system into LFS.</para>
-<para>
-<userinput>--bindir=$LFS/bin:</userinput> This installs the executable
+<para><userinput>--bindir=$LFS/bin:</userinput> This installs the executable
files in $LFS/bin. We do this because we want bash to be in /bin, not in
/usr/bin. One reason being: the /usr partition might be on a separate
partition which has to be mounted at some point. Before that partition is
mounted a user needs and will want to have bash available (it will be hard to
-execute the boot scripts without a shell for instance).
-</para>
+execute the boot scripts without a shell for instance).</para>
-<para>
-<userinput>--with-curses:</userinput> This causes Bash to be linked
+<para><userinput>--with-curses:</userinput> This causes Bash to be linked
against the curses library instead of the default termcap library which
-is becoming obsolete.
-</para>
+is becoming obsolete.</para>
-<para>
-<userinput>ln -s bash sh:</userinput> This command creates the sh
+<para><userinput>ln -s bash sh:</userinput> This command creates the sh
symlink that points to bash. Most scripts run themselves via 'sh'
(invoked by the #!/bin/sh as the first line in the scripts) which
invokes a special bash mode. Bash will then behave (as closely as
-possible) as the original Bourne shell.
-</para>
+possible) as the original Bourne shell.</para>
-<para>
-The <userinput>&amp;&amp;</userinput>'s at the end of every line cause
+<para>The <userinput>&amp;&amp;</userinput>'s at the end of every line cause
the next command to be executed only if the previous command exists
with a return value of 0 indicating success. In case all of these
commands are copy&amp;pasted
on the shell, is is important to be ensured that if
./configure fails, make isn't being executed and, likewise, if make fails,
-that make install isn't being executed, and so forth.
-</para>
+that make install isn't being executed, and so forth.</para>
</sect2>
diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
index f25dbaf21..5fbf03ec0 100644
--- a/chapter05/bash-inst.xml
+++ b/chapter05/bash-inst.xml
@@ -1,28 +1,18 @@
<sect2>
<title>Installation of Bash</title>
-<para>
-Install Bash by running the following commands:
-</para>
+<para>Install Bash by running the following commands:</para>
-<para>
-<screen>
-<userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput>
+<para><screen><userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin --with-curses &amp;&amp;</userinput>
<userinput>make &amp;&amp;</userinput>
<userinput>make install &amp;&amp;</userinput>
<userinput>cd $LFS/bin &amp;&amp;</userinput>
-<userinput>ln -s bash sh</userinput>
-</screen>
-</para>
+<userinput>ln -s bash sh</userinput></screen></para>
-<para>
-If the make install phase ends with something along the lines of
-</para>
+<para>If the make install phase ends with something along the lines of</para>
-<blockquote>
-<screen>
-install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir'
+<blockquote><screen>install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir'
usage: install-info [--version] [--help] [--debug] [--maxwidth=nnn]
[--section regexp title] [--infodir=xxx] [--align=nnn]
[--calign=nnn] [--quiet] [--menuentry=xxx]
@@ -31,19 +21,15 @@ usage: install-info [--version] [--help] [--debug] [--maxwidth=nnn]
[--remove] [--] filename
make[1]: *** [install] Error 1
make[1]: Leaving directory `/mnt/lfs/usr/src/bash-2.04/doc'
-make: [install] Error 2 (ignored)
-</screen>
-</blockquote>
+make: [install] Error 2 (ignored)</screen></blockquote>
-<para>
-then that means that you are probably using Debian, and that you have an
+<para>then that means that you are probably using Debian, and that you have an
old version of the texinfo package. This error is not severe by any means: the
info pages will be installed when we recompile bash dynamically in
chapter 6, so you can ignore it. You do, however, have to run the last
two commands manually (the <userinput>cd $LFS/bin</userinput> and
<userinput>ln -s bash sh</userinput> commands) because they won't be
-executed when the error occurs.
-</para>
+executed when the error occurs.</para>
</sect2>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 9815a86dc..f5fa1e19c 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-bash">
<title>Installing Bash</title>
-<screen>
-Estimated build time: &bash-time-static;
-Estimated disk space required: &bash-compsize-static;
-</screen>
+<screen>Estimated build time: &bash-time-static;
+Estimated disk space required: &bash-compsize-static;</screen>
&c5-bash-inst;
&c5-bash-exp;
diff --git a/chapter05/binutils-exp.xml b/chapter05/binutils-exp.xml
index c0ba51bf4..4ac33410a 100644
--- a/chapter05/binutils-exp.xml
+++ b/chapter05/binutils-exp.xml
@@ -1,35 +1,27 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>make -e:</userinput> The -e parameter tells make that
+<para><userinput>make -e:</userinput> The -e parameter tells make that
environment variables take precedence over variables defined in the
Makefile file(s). This is needed in order to successfully link binutils
-statically.
-</para>
+statically.</para>
-<para>
-<userinput>--disable-nls:</userinput> This option disabled
+<para><userinput>--disable-nls:</userinput> This option disabled
internationalization (also known as i18n). We don't need this for our
static programs and nls often causes problems when you're linking
-statically.
-</para>
+statically.</para>
-<para>
-<userinput>LDFLAGS=-all-static:</userinput> Setting the variable LDFLAGS
-to the value -all-static causes binutils to be linked statically.
-</para>
+<para><userinput>LDFLAGS=-all-static:</userinput> Setting the variable LDFLAGS
+to the value -all-static causes binutils to be linked statically.</para>
-<para>
-<userinput>tooldir=$LFS/usr:</userinput> Normally, the tooldir (the
+<para><userinput>tooldir=$LFS/usr:</userinput> Normally, the tooldir (the
directory where the executables from binutils end up in) is set to
$(exec_prefix)/$(target_alias) which expands into, for example,
/usr/i686-pc-linux-gnu. Since we only build for our own system, we don't
need this target specific directory in $LFS/usr. That setup would be used
if the system was used to cross-compile (for example
compiling a package on the Intel machine that generates code that can be
-executed on Apple PowerPC machines).
-</para>
+executed on Apple PowerPC machines).</para>
</sect2>
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 81b4858ec..982b2da78 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -1,17 +1,11 @@
<sect2>
<title>Installation of Binutils</title>
-<para>
-Install Binutils by running the following commands:
-</para>
+<para>Install Binutils by running the following commands:</para>
-<para>
-<screen>
-<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
<userinput>make -e LDFLAGS=-all-static tooldir=$LFS/usr &amp;&amp;</userinput>
-<userinput>make -e tooldir=$LFS/usr install</userinput>
-</screen>
-</para>
+<userinput>make -e tooldir=$LFS/usr install</userinput></screen></para>
</sect2>
diff --git a/chapter05/binutils.xml b/chapter05/binutils.xml
index af286fe85..733fc70bd 100644
--- a/chapter05/binutils.xml
+++ b/chapter05/binutils.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-binutils">
<title>Installing Binutils</title>
-<screen>
-Estimated build time: &binutils-time-static;
-Estimated disk space required: &binutils-compsize-static;
-</screen>
+<screen>Estimated build time: &binutils-time-static;
+Estimated disk space required: &binutils-compsize-static;</screen>
&c5-binutils-inst;
&c5-binutils-exp;
diff --git a/chapter05/bzip2-exp.xml b/chapter05/bzip2-exp.xml
index ca77f5f4d..b53254eab 100644
--- a/chapter05/bzip2-exp.xml
+++ b/chapter05/bzip2-exp.xml
@@ -1,15 +1,12 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>sed: </userinput> The sed command here searches for the
+<para><userinput>sed: </userinput> The sed command here searches for the
string "$(CC) $(CFLAGS) -o" and replaces it by "$(CC) $(CFLAGS)
$(LDFLAGS) -o" in the Makefile file. We make that modification so it
-will be easier to link bzip2 statically.
-</para>
+will be easier to link bzip2 statically.</para>
-<para>
-<userinput>...Makefile | make -f -:</userinput> Makefile
+<para><userinput>...Makefile | make -f -:</userinput> Makefile
is the last parameter of the sed command which indicates the file to
search and replace in. Sed normally sends the modified file to stdout
(standard output), which will be the console. With the construction we
@@ -19,15 +16,12 @@ modified the Makefile file so we don't want make to use it. The "-f -"
parameter tells make to read it's input from another file, or from stdin
(standard input) which the dash (-) implies. This is one way to do it.
Another way would be to have sed write the output to a different file
-and tell make with the -f parameter to read that alternate file.
-</para>
+and tell make with the -f parameter to read that alternate file.</para>
-<para>
-<userinput>LDFLAGS=-static:</userinput> This is the second way we use to
+<para><userinput>LDFLAGS=-static:</userinput> This is the second way we use to
link a package statically. This is also the most common way.
The -all-static value is only used with the binutils package and won't
-be used throughout the rest of this book.
-</para>
+be used throughout the rest of this book.</para>
</sect2>
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index 1df7a7a4b..2c2f04dbc 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -1,20 +1,14 @@
<sect2>
<title>Installation of Bzip2</title>
-<para>
-Install Bzip2 by running the following commands:
-</para>
+<para>Install Bzip2 by running the following commands:</para>
-<para>
-<screen>
-<userinput>sed \</userinput>
+<para><screen><userinput>sed \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;Makefile | make -f - LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make PREFIX=$LFS/usr install &amp;&amp;</userinput>
<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput>
-</screen>
-</para>
+<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para>
</sect2>
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index 7c7368704..7838559b3 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-bzip2">
<title>Installing Bzip2</title>
-<screen>
-Estimated build time: &bzip2-time-static;
-Estimated disk space required: &bzip2-compsize-static;
-</screen>
+<screen>Estimated build time: &bzip2-time-static;
+Estimated disk space required: &bzip2-compsize-static;</screen>
&c5-bzip2-inst;
&c5-bzip2-exp;
diff --git a/chapter05/diffutils-exp.xml b/chapter05/diffutils-exp.xml
index 181f700da..b930cbe07 100644
--- a/chapter05/diffutils-exp.xml
+++ b/chapter05/diffutils-exp.xml
@@ -1,16 +1,14 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput> The
+<para><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput> The
CPPFLAGS variable is a variable that's read by the cpp program (C
PreProcessor). The value of this variable tells the preprocessor to
replace every instance of re_max_failures it finds by re_max_failures2
before handing the source file to the compiler itself for compilation. This
package has problems linking statically on certain platforms (depending
on the Glibc version used on that system) and this construction fixes
-that problem.
-</para>
+that problem.</para>
</sect2>
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index e6e962bef..d2ce49a20 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -1,19 +1,13 @@
<sect2>
<title>Installation of Diffutils</title>
-<para>
-Install Diffutils by running the following commands:
-</para>
+<para>Install Diffutils by running the following commands:</para>
-<para>
-<screen>
-<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
<userinput>unset CPPFLAGS &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen>
-</para>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 5486412a7..3757ec6a8 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-diffutils">
<title>Installing Diffutils</title>
-<screen>
-Estimated build time: &diffutils-time-static;
-Estimated disk space required: &diffutils-compsize-static;
-</screen>
+<screen>Estimated build time: &diffutils-time-static;
+Estimated disk space required: &diffutils-compsize-static;</screen>
&c5-diffutils-inst;
&c5-diffutils-exp;
diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml
index c4cc59b1a..b5ebb1d7b 100644
--- a/chapter05/fileutils-exp.xml
+++ b/chapter05/fileutils-exp.xml
@@ -1,12 +1,10 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>--libexecdir=$LFS/bin:</userinput> This configure option will
+<para><userinput>--libexecdir=$LFS/bin:</userinput> This configure option will
set the program executable directory to $LFS/bin. This is normally set
to /usr/libexec, but nothing is placed in it. Changing it just prevents
-that directory from being created.
-</para>
+that directory from being created.</para>
</sect2>
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 6ef386a53..1fb41f3ca 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -1,19 +1,14 @@
<sect2>
<title>Installation of Fileutils</title>
-<para>
-Install Fileutils by running the following commands:
-</para>
+<para>Install Fileutils by running the following commands:</para>
-<para><screen>
-<userinput>./configure --disable-nls \</userinput>
+<para><screen><userinput>./configure --disable-nls \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --libexecdir=$LFS/bin --bindir=$LFS/bin &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make install &amp;&amp;</userinput>
<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>ln -s ../../bin/install</userinput>
-</screen>
-</para>
+<userinput>ln -s ../../bin/install</userinput></screen></para>
</sect2>
diff --git a/chapter05/fileutils.xml b/chapter05/fileutils.xml
index 49973ab4f..603ba7f4a 100644
--- a/chapter05/fileutils.xml
+++ b/chapter05/fileutils.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-fileutils">
<title>Installing Fileutils</title>
-<screen>
-Estimated build time: &fileutils-time-static;
-Estimated disk space required: &fileutils-compsize-static;
-</screen>
+<screen>Estimated build time: &fileutils-time-static;
+Estimated disk space required: &fileutils-compsize-static;</screen>
&c5-fileutils-inst;
&c5-fileutils-exp;
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index be7d64e48..406b42282 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -1,34 +1,26 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>patch -Np1 -i ../gcc-3.0.patch:</userinput> This patch
+<para><userinput>patch -Np1 -i ../gcc-3.0.patch:</userinput> This patch
changes all instances of re_max_failures to re_max_failures2.
re_max_failures is a variable used within Glibc and with static
compiling this variable sometimes clashes between the package's
re_max_failures and the same variable in glibc. By renaming
re_max_failures in the package to re_max_failures2 we just tell the
-package to use the second variable so that glibc won't be in the way.
-</para>
+package to use the second variable so that glibc won't be in the way.</para>
-<para>
-<userinput>--enable-languages=c,c++:</userinput> This only builds the C
+<para><userinput>--enable-languages=c,c++:</userinput> This only builds the C
and C++ compilers and not the other available compilers as they are, on
the average, not often used. If those other compilers are needed,
-the --enable-languages parameter can be omitted.
-</para>
+the --enable-languages parameter can be omitted.</para>
-<para>
-<userinput>ln -s ../usr/bin/cpp:</userinput> This
+<para><userinput>ln -s ../usr/bin/cpp:</userinput> This
creates the $LFS/lib/cpp symlink. Some packages explicitly try to find
-cpp in /lib.
-</para>
+cpp in /lib.</para>
-<para>
-<userinput>ln -s ../bin/cpp:</userinput> This
+<para><userinput>ln -s ../bin/cpp:</userinput> This
creates the $LFS/usr/lib/cpp symlink as there are packages that expect
-cpp to be in /usr/lib.
-</para>
+cpp to be in /usr/lib.</para>
</sect2>
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 066f8195f..e4d920a8d 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -1,13 +1,9 @@
<sect2>
<title>Installation of GCC</title>
-<para>
-Install GCC by running the following commands:
-</para>
+<para>Install GCC by running the following commands:</para>
-<para>
-<screen>
-<userinput>patch -Np1 -i ../gcc-&gcc-version;.patch &amp;&amp;</userinput>
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;.patch &amp;&amp;</userinput>
<userinput>mkdir ../gcc-build &amp;&amp;</userinput>
<userinput>cd ../gcc-build &amp;&amp;</userinput>
<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
@@ -20,9 +16,7 @@ Install GCC by running the following commands:
<userinput>cd $LFS/usr/lib &amp;&amp;</userinput>
<userinput>ln -s ../bin/cpp &amp;&amp;</userinput>
<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>ln -s gcc cc</userinput>
-</screen>
-</para>
+<userinput>ln -s gcc cc</userinput></screen></para>
</sect2>
diff --git a/chapter05/gcc.xml b/chapter05/gcc.xml
index 490f822a7..7f92e0eb4 100644
--- a/chapter05/gcc.xml
+++ b/chapter05/gcc.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-gcc">
<title>Installing GCC</title>
-<screen>
-Estimated build time: &gcc-time-static;
-Estimated disk space required: &gcc-compsize-static;
-</screen>
+<screen>Estimated build time: &gcc-time-static;
+Estimated disk space required: &gcc-compsize-static;</screen>
&c5-gcc-inst;
&c5-gcc-exp;
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index 6b1058547..f6635c56c 100644
--- a/chapter05/grep-inst.xml
+++ b/chapter05/grep-inst.xml
@@ -1,19 +1,13 @@
<sect2>
<title>Installation of Grep</title>
-<para>
-Install Grep by running the following commands:
-</para>
+<para>Install Grep by running the following commands:</para>
-<para>
-<screen>
-<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
<userinput>unset CPPFLAGS &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen>
-</para>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index f651af762..de0160096 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-grep">
<title>Installing Grep</title>
-<screen>
-Estimated build time: &grep-time-static;
-Estimated disk space required: &grep-compsize-static;
-</screen>
+<screen>Estimated build time: &grep-time-static;
+Estimated disk space required: &grep-compsize-static;</screen>
&c5-grep-inst;
&aa-grep-desc;
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index f1d5d1ca6..9b578e42d 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -1,20 +1,14 @@
<sect2>
<title>Installation of Gzip</title>
-<para>
-Before Gzip is installed, the gzip patch file needs to be unpacked.
-</para>
+<para>Before Gzip is installed, the gzip patch file needs to be unpacked.</para>
-<para>
-<screen>
-<userinput>patch -Np1 -i ../gzip-&gzip-version;.patch &amp;&amp;</userinput>
+<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make install &amp;&amp;</userinput>
<userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &amp;&amp;</userinput>
-<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput>
-</screen>
-</para>
+<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para>
</sect2>
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 627752117..72057c5b0 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-gzip">
<title>Installing Gzip</title>
-<screen>
-Estimated build time: &gzip-time-static;
-Estimated disk space required: &gzip-compsize-static;
-</screen>
+<screen>Estimated build time: &gzip-time-static;
+Estimated disk space required: &gzip-compsize-static;</screen>
&c5-gzip-inst;
&aa-gzip-desc;
diff --git a/chapter05/installasroot.xml b/chapter05/installasroot.xml
index bfb49d62e..27bcd245b 100644
--- a/chapter05/installasroot.xml
+++ b/chapter05/installasroot.xml
@@ -1,23 +1,19 @@
<sect1 id="ch05-installasroot">
<title>Install all software as user root</title>
-<para>
-It's best to log in as root or su's to root when installing the
+<para>It's best to log in as root or su's to root when installing the
packages. That way you are assured that all files are owned by user and
group root (and not owned by the userid of the non-root user), and if a
package wants to set special permissions, it can do so without problems
-due to non-root access.
-</para>
+due to non-root access.</para>
-<para>
-The documentation that comes with Glibc, Gcc, and other
+<para>The documentation that comes with Glibc, Gcc, and other
packages recommend not to compile the packages as user root. We
feel it's safe to ignore that recommendation and compile as user root
anyway. Hundreds of people using LFS have done so without any problems
whatsoever, and we haven't encountered any bugs in the compile processes
that cause harm. So it's pretty safe (never can be 100% safe though, so
-it's up to you what you end up doing).
-</para>
+it's up to you what you end up doing).</para>
</sect1>
diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml
index 8729787e2..6c98ee73d 100644
--- a/chapter05/introduction.xml
+++ b/chapter05/introduction.xml
@@ -1,55 +1,39 @@
<sect1 id="ch05-introduction">
<title>Introduction</title>
-<para>
-In the following chapters we will install all the software that belongs to
-a basic Linux system. After you're done with this and the next chapter,
+<para>In the following chapters we will install all the software that belongs
+to a basic Linux system. After you're done with this and the next chapter,
you'll have a fully working Linux system. The remaining chapters deal
with creating the boot scripts, making the LFS system bootable and
-setting up basic networking.
-</para>
+setting up basic networking.</para>
-<para>
-The software in this chapter will be linked statically. These programs
+<para>The software in this chapter will be linked statically. These programs
will be reinstalled in the next chapter and linked dynamically. The
reason for the static version first is that there is a chance that our
normal Linux system and the LFS system aren't using the same C
Library versions. If the programs in the first part are linked against
an older C library version, those programs might not work well on the
-LFS system.
-</para>
+LFS system.</para>
-<para>
-The key to learn what makes Linux tick is to know exactly what packages
+<para>The key to learn what makes Linux tick is to know exactly what packages
are used for and why a user or the system needs them. Descriptions
of the package content are provided after the Installation subsection of each
-package and in Appendix A as well.
-</para>
+package and in Appendix A as well.</para>
-<para>
-During the installation of various packages, you will more than likely see
+<para>During the installation of various packages, you will more than likely see
all kinds of compiler warnings scrolling by on the screen. These are
normal and can be safely ignored. They are just that, warnings (mostly
about improper use of the C or C++ syntax, but not illegal use. It's just
that, often, C standards changed and packages still use the old standard
-which is not a problem).
-</para>
-
-<para>
-Before we start, make sure the LFS environment variable is setup
-properly if you decided to make use of it. Run the following:
-</para>
-
-<para>
-<screen>
-<userinput>echo $LFS</userinput>
-</screen>
-</para>
-
-<para>
-Check to make sure the output contains the correct directory to the LFS
-partition's mount point (/mnt/lfs for example).
-</para>
+which is not a problem).</para>
+
+<para>Before we start, make sure the LFS environment variable is setup
+properly if you decided to make use of it. Run the following:</para>
+
+<para><screen><userinput>echo $LFS</userinput></screen></para>
+
+<para>Check to make sure the output contains the correct directory to the LFS
+partition's mount point (/mnt/lfs for example).</para>
</sect1>
diff --git a/chapter05/kernel-exp.xml b/chapter05/kernel-exp.xml
index 573ddb1b4..475984ee8 100644
--- a/chapter05/kernel-exp.xml
+++ b/chapter05/kernel-exp.xml
@@ -1,13 +1,10 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>make mrproper:</userinput> This will ensure that the kernel
-tree is absolutely clean.
-</para>
+<para><userinput>make mrproper:</userinput> This will ensure that the kernel
+tree is absolutely clean.</para>
-<para>
-<userinput>yes "" | make config:</userinput> This runs make config and
+<para><userinput>yes "" | make config:</userinput> This runs make config and
answers with the default answer to every question the config script asks
the user (it does this by simply doing the equivalent of hitting the
Enter key, thus accepting the default Y and N answers to the questions).
@@ -15,32 +12,25 @@ We're not configuring the real kernel here, we just need to have some sort
of configure file created so that we can run make dep next that will
create a few files in $LFS/usr/src/linux/include/linux, like version.h,
among others, that we will need to compile Glibc and other packages later
-in chroot.
-</para>
+in chroot.</para>
-<para>
-<userinput>make dep:</userinput> make dep checks dependencies and sets
+<para><userinput>make dep:</userinput> make dep checks dependencies and sets
up the dependencies file. We don't really care about the dependency
checks, but what we do care about is that make dep creates those
aforementioned files in $LFS/usr/src/linux/include/linux we will be
-needing later on.
-</para>
+needing later on.</para>
-<para>
-<userinput>cp -a ../src/linux/include/linux .</userinput> and
+<para><userinput>cp -a ../src/linux/include/linux .</userinput> and
<userinput>mkdir asm &amp;&amp; cp -a ../src/linux/include/asm/* .</userinput>:
These commands copy the kernel headers in the
-<filename>$LFS/usr/include</filename> directory.
-</para>
+<filename>$LFS/usr/include</filename> directory.</para>
-<para>
-<userinput>chown root.root $LFS/usr/include/linux -R </userinput> and
+<para><userinput>chown root.root $LFS/usr/include/linux -R </userinput> and
<userinput>chown root.root $LFS/usr/include/asm -R </userinput>:
These commands change the ownership of the
<filename>$LFS/usr/include/linux</filename> and the
<filename>$LFS/usr/include/asm</filename> directories, plus all the
-files contained therein to the user root and group root.
-</para>
+files contained therein to the user root and group root.</para>
</sect2>
diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml
index 87c7a9509..5d79a5ba3 100644
--- a/chapter05/kernel-inst.xml
+++ b/chapter05/kernel-inst.xml
@@ -1,21 +1,16 @@
<sect2>
<title>Installation of the Linux Kernel</title>
-<para>
-We won't be compiling a new kernel image yet. We'll do that after we
+<para>We won't be compiling a new kernel image yet. We'll do that after we
have finished the installation of the basic system software in this
chapter. But because certain software needs the kernel header files, we're
going to unpack the kernel archive now and set it up so that we can
-compile the packages that need the kernel.
-</para>
+compile the packages that need the kernel.</para>
-<para>
-The kernel configuration file is created by running the following command:
-</para>
+<para>The kernel configuration file is created by running the following
+command:</para>
-<para>
-<screen>
-<userinput>make mrproper &amp;&amp;</userinput>
+<para><screen><userinput>make mrproper &amp;&amp;</userinput>
<userinput>yes "" | make config &amp;&amp;</userinput>
<userinput>make dep &amp;&amp;</userinput>
<userinput>cd $LFS/usr/include &amp;&amp;</userinput>
@@ -23,9 +18,7 @@ The kernel configuration file is created by running the following command:
<userinput>chown root.root $LFS/usr/include/linux -R &amp;&amp;</userinput>
<userinput>mkdir asm &amp;&amp;</userinput>
<userinput>cp -a ../src/linux/include/asm/* asm &amp;&amp;</userinput>
-<userinput>chown root.root $LFS/usr/include/asm -R</userinput>
-</screen>
-</para>
+<userinput>chown root.root $LFS/usr/include/asm -R</userinput></screen></para>
</sect2>
diff --git a/chapter05/kernel.xml b/chapter05/kernel.xml
index c2b98ed49..69a3f7c5c 100644
--- a/chapter05/kernel.xml
+++ b/chapter05/kernel.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-kernel">
<title>Installing Linux Kernel</title>
-<screen>
-Estimated build time: &kernel-time-static;
-Estimated disk space required: &kernel-compsize-static;
-</screen>
+<screen>Estimated build time: &kernel-time-static;
+Estimated disk space required: &kernel-compsize-static;</screen>
&c5-kernel-inst;
&c5-kernel-exp;
diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml
index e07c8205b..1e358f555 100644
--- a/chapter05/make-inst.xml
+++ b/chapter05/make-inst.xml
@@ -1,17 +1,11 @@
<sect2>
<title>Installation of Make</title>
-<para>
-Install Make by running the following commands:
-</para>
+<para>Install Make by running the following commands:</para>
-<para>
-<screen>
-<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen>
-</para>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/make.xml b/chapter05/make.xml
index d517aaed8..a221a7f91 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-make">
<title>Installing Make</title>
-<screen>
-Estimated build time: &make-time-static;
-Estimated disk space required: &make-compsize-static;
-</screen>
+<screen>Estimated build time: &make-time-static;
+Estimated disk space required: &make-compsize-static;</screen>
&c5-make-inst;
&aa-make-desc;
diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml
index e42e77665..a49156287 100644
--- a/chapter05/mawk-inst.xml
+++ b/chapter05/mawk-inst.xml
@@ -1,20 +1,14 @@
<sect2>
<title>Installation of Mawk</title>
-<para>
-Install Mawk by running the following commands:
-</para>
+<para>Install Mawk by running the following commands:</para>
-<para>
-<screen>
-<userinput>./configure &amp;&amp;</userinput>
+<para><screen><userinput>./configure &amp;&amp;</userinput>
<userinput>sed \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;Makefile | make -f - LDFLAGS=-static &amp;&amp; </userinput>
<userinput>make BINDIR=$LFS/usr/bin \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;MANDIR=$LFS/usr/share/man/man1 install</userinput>
-</screen>
-</para>
+<userinput>&nbsp;&nbsp;&nbsp;MANDIR=$LFS/usr/share/man/man1 install</userinput></screen></para>
</sect2>
diff --git a/chapter05/mawk.xml b/chapter05/mawk.xml
index d1df4cb84..6dd7dfc06 100644
--- a/chapter05/mawk.xml
+++ b/chapter05/mawk.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-mawk">
<title>Installing Mawk</title>
-<screen>
-Estimated build time: &mawk-time-static;
-Estimated disk space required: &mawk-compsize-static;
-</screen>
+<screen>Estimated build time: &mawk-time-static;
+Estimated disk space required: &mawk-compsize-static;</screen>
&c5-mawk-inst;
&aa-mawk-desc;
diff --git a/chapter05/oldnsslib.xml b/chapter05/oldnsslib.xml
index 54d5f8a3f..c7b3c2a17 100644
--- a/chapter05/oldnsslib.xml
+++ b/chapter05/oldnsslib.xml
@@ -1,31 +1,19 @@
<sect1 id="ch05-oldnsslib">
<title>Copying old NSS library files</title>
-<para>
-If your normal Linux system runs glibc-2.0, you need to copy the NSS library
-files to the LFS partition. Certain statically linked programs still depend
-on the NSS library, especially programs that need to lookup usernames,userid's
-and groupid's. You can check which C library version your normal Linux system
-uses by simply executing the library, like this:
-</para>
+<para>If your normal Linux system runs glibc-2.0, you need to copy the NSS
+library files to the LFS partition. Certain statically linked programs still
+depend on the NSS library, especially programs that need to lookup
+usernames, userid's and groupid's. You can check which C library version your
+normal Linux system uses by simply executing the library, like this:</para>
-<para>
-<screen>
-<userinput>/lib/libc.so.6</userinput>
-</screen>
-</para>
+<para><screen><userinput>/lib/libc.so.6</userinput></screen></para>
-<para>
-The first line will give you the release version. Following lines contain
+<para>The first line will give you the release version. Following lines contain
interesting information. If you have Glibc-2.0.x installed on your starting
-distribution, copy the NSS library files by running:
-</para>
+distribution, copy the NSS library files by running:</para>
-<para>
-<screen>
-<userinput>cp -av /lib/libnss* $LFS/lib</userinput>
-</screen>
-</para>
+<para><screen><userinput>cp -av /lib/libnss* $LFS/lib</userinput></screen></para>
</sect1>
diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml
index 3442d860b..7effdd3df 100644
--- a/chapter05/patch-inst.xml
+++ b/chapter05/patch-inst.xml
@@ -1,17 +1,11 @@
<sect2>
<title>Installation of Patch</title>
-<para>
-Install Patch by running the following commands:
-</para>
+<para>Install Patch by running the following commands:</para>
-<para>
-<screen>
-<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen>
-</para>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index f0dc91269..257d66fdc 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-patch">
<title>Installing Patch</title>
-<screen>
-Estimated build time: &patch-time-static;
-Estimated disk space required: &patch-compsize-static;
-</screen>
+<screen>Estimated build time: &patch-time-static;
+Estimated disk space required: &patch-compsize-static;</screen>
&c5-patch-inst;
&aa-patch-desc;
diff --git a/chapter05/proc.xml b/chapter05/proc.xml
index 3a13f2be3..c68a9d171 100644
--- a/chapter05/proc.xml
+++ b/chapter05/proc.xml
@@ -1,23 +1,16 @@
<sect1 id="ch05-proc">
<title>Mounting $LFS/proc file system</title>
-<para>
-In order for certain programs to function properly the proc file system
+<para>In order for certain programs to function properly the proc file system
must be mounted and available from within the chroot'ed environment as
well. It's not a problem to mount the proc file system twice
or even more than that, since it's a virtual file system maintained by
-the kernel itself.
-</para>
+the kernel itself.</para>
-<para>
-The proc file system is mounted under $LFS/proc by running the following command:
-</para>
+<para>The proc file system is mounted under $LFS/proc by running the following
+command:</para>
-<para>
-<screen>
-<userinput>mount proc $LFS/proc -t proc</userinput>
-</screen>
-</para>
+<para><screen><userinput>mount proc $LFS/proc -t proc</userinput></screen></para>
</sect1>
diff --git a/chapter05/pwdgroup.xml b/chapter05/pwdgroup.xml
index 28e17442b..eb5d77f4a 100644
--- a/chapter05/pwdgroup.xml
+++ b/chapter05/pwdgroup.xml
@@ -1,10 +1,9 @@
<sect1 id="ch05-pwdgroup">
<title>Creating passwd and group files</title>
-<para>
-In order for the user and group root to be recognized and to be able to login,
-there needs to be an entry in the /etc/passwd and /etc/group file. Besides the
-group root a couple of other groups are recommended and needed by
+<para>In order for the user and group root to be recognized and to be able to
+login, there needs to be an entry in the /etc/passwd and /etc/group file.
+Besides the group root a couple of other groups are recommended and needed by
packages. The groups with their GID's below aren't part of any standard.
The LSB only recommends besides a group root a group bin to be present
with GID 1. Other group names and GID's can be chosen by the user. Well
@@ -13,29 +12,17 @@ name, since it doesn't matter all that much what GID a group has. Since there
aren't any standards for groups I won't follow any conventions used by
Debian, RedHat and others. The groups added here are the groups the
MAKEDEV script (the script that creates the device files in the /dev
-directory) mentions.
-</para>
+directory) mentions.</para>
-<para>
-Create a new file <filename>$LFS/etc/passwd</filename> by running the
-following command:
-</para>
+<para>Create a new file <filename>$LFS/etc/passwd</filename> by running the
+following command:</para>
-<para>
-<screen>
-<userinput>echo "root:x:0:0:root:/root:/bin/bash" &gt; $LFS/etc/passwd
-</userinput>
-</screen>
-</para>
+<para><screen><userinput>echo "root:x:0:0:root:/root:/bin/bash" &gt; $LFS/etc/passwd</userinput></screen></para>
-<para>
-Create a new file <filename>$LFS/etc/group</filename> by running the
-following:
-</para>
+<para>Create a new file <filename>$LFS/etc/group</filename> by running the
+following:</para>
-<para>
-<screen>
-<userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
+<para><screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
root:x:0:
bin:x:1:
sys:x:2:
@@ -48,9 +35,7 @@ disk:x:8:
lp:x:9:
dialout:x:10:
audio:x:11:
-<userinput>EOF</userinput>
-</screen>
-</para>
+<userinput>EOF</userinput></screen></para>
</sect1>
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index c410c0d88..261fe36b0 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -1,19 +1,13 @@
<sect2>
<title>Installation of Sed</title>
-<para>
-Install Sed by running the following commands:
-</para>
+<para>Install Sed by running the following commands:</para>
-<para>
-<screen>
-<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
<userinput>unset CPPFLAGS &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen>
-</para>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index d229c98ad..b4e4a0bef 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-sed">
<title>Installing Sed</title>
-<screen>
-Estimated build time: &sed-time-static;
-Estimated disk space required: &sed-compsize-static;
-</screen>
+<screen>Estimated build time: &sed-time-static;
+Estimated disk space required: &sed-compsize-static;</screen>
&c5-sed-inst;
&aa-sed-desc;
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index 0fa096a4c..6e784c0c0 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -1,21 +1,16 @@
<sect2>
<title>Installation of Sh-utils</title>
-<para>
-Before Sh-utils is installed, the sh-utils patch file needs to be unpacked.
-</para>
+<para>Before Sh-utils is installed, the sh-utils patch file needs
+to be unpacked.</para>
-<para>
-<screen>
-<userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch &amp;&amp;</userinput>
+<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make install &amp;&amp;</userinput>
<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
<userinput>mv date echo false pwd stty $LFS/bin &amp;&amp;</userinput>
-<userinput>mv su true uname hostname $LFS/bin</userinput>
-</screen>
-</para>
+<userinput>mv su true uname hostname $LFS/bin</userinput></screen></para>
</sect2>
diff --git a/chapter05/shellutils.xml b/chapter05/shellutils.xml
index 7a50fb11f..b0b64dbb0 100644
--- a/chapter05/shellutils.xml
+++ b/chapter05/shellutils.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-shutils">
<title>Installing Sh-utils</title>
-<screen>
-Estimated build time: &sh-utils-time-static;
-Estimated disk space required: &sh-utils-compsize-static;
-</screen>
+<screen>Estimated build time: &sh-utils-time-static;
+Estimated disk space required: &sh-utils-compsize-static;</screen>
&c5-shellutils-inst;
&aa-shellutils-desc;
diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml
index 175cab6e9..98202f7d5 100644
--- a/chapter05/tar-inst.xml
+++ b/chapter05/tar-inst.xml
@@ -1,36 +1,23 @@
<sect2>
<title>Installation of Tar</title>
-<para>
-To be able to directly use bzip2 files with tar, use the tar
+<para>To be able to directly use bzip2 files with tar, use the tar
patch available from the LFS FTP site. This patch will add the -y option
to tar which works the same as the -z option to tar (which can be used
-for gzip files).
-</para>
+for gzip files).</para>
-<para>
-Apply the patch by running the following command:
-</para>
+<para>Apply the patch by running the following command:</para>
-<para>
-<screen>
-<userinput>cd src &amp;&amp;</userinput>
+<para><screen><userinput>cd src &amp;&amp;</userinput>
<userinput>patch -i ../../gnutarpatch.txt &amp;&amp;</userinput>
-<userinput>cd ..</userinput>
-</screen>
-</para>
+<userinput>cd ..</userinput></screen></para>
-<para>
-Install Tar by running the following commands:
-</para>
+<para>Install Tar by running the following commands:</para>
-<para>
-<screen>
-<userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin --bindir=$LFS/bin &amp;&amp; </userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen></para>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 80fd0b1e1..241b36e74 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-tar">
<title>Installing Tar</title>
-<screen>
-Estimated build time: &tar-time-static;
-Estimated disk space required: &tar-compsize-static;
-</screen>
+<screen>Estimated build time: &tar-time-static;
+Estimated disk space required: &tar-compsize-static;</screen>
&c5-tar-inst;
&aa-tar-desc;
diff --git a/chapter05/texinfo-exp.xml b/chapter05/texinfo-exp.xml
index 4ab1323f6..7dda4a0d4 100644
--- a/chapter05/texinfo-exp.xml
+++ b/chapter05/texinfo-exp.xml
@@ -1,11 +1,9 @@
<sect2>
<title>Command explanations</title>
-<para>
-<userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch
+<para><userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch
fixes a problem with compiling texinfo on gcc-3.0 systems. More
specifically, it moves an #ifdef out of a printf macro in order to be
-compatible.
-</para>
+compatible.</para>
</sect2>
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
index 2fed3e3b0..84143096b 100644
--- a/chapter05/texinfo-inst.xml
+++ b/chapter05/texinfo-inst.xml
@@ -1,18 +1,12 @@
<sect2>
<title>Installation of Texinfo</title>
-<para>
-Install Texinfo by running the following commands:
-</para>
+<para>Install Texinfo by running the following commands:</para>
-<para>
-<screen>
-<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &amp;&amp;</userinput>
+<para><screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen>
-</para>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index 5a6448dba..e531ad2b7 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-texinfo">
<title>Installing Texinfo</title>
-<screen>
-Estimated build time: &texinfo-time-static;
-Estimated disk space required: &texinfo-compsize-static;
-</screen>
+<screen>Estimated build time: &texinfo-time-static;
+Estimated disk space required: &texinfo-compsize-static;</screen>
&c5-texinfo-inst;
&c5-texinfo-exp;
diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml
index d0485f4d7..fc56d6f8d 100644
--- a/chapter05/textutils-inst.xml
+++ b/chapter05/textutils-inst.xml
@@ -1,18 +1,12 @@
<sect2>
<title>Installation of Textutils</title>
-<para>
-Install Textutils by running the following commands:
-</para>
+<para>Install Textutils by running the following commands:</para>
-<para>
-<screen>
-<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make install &amp;&amp;</userinput>
-<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput>
-</screen>
-</para>
+<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para>
</sect2>
diff --git a/chapter05/textutils.xml b/chapter05/textutils.xml
index 908ef48d6..34ea82247 100644
--- a/chapter05/textutils.xml
+++ b/chapter05/textutils.xml
@@ -1,10 +1,8 @@
<sect1 id="ch05-textutils">
<title>Installing Textutils</title>
-<screen>
-Estimated build time: &textutils-time-static;
-Estimated disk space required: &textutils-compsize-static;
-</screen>
+<screen>Estimated build time: &textutils-time-static;
+Estimated disk space required: &textutils-compsize-static;</screen>
&c5-textutils-inst;
&aa-textutils-desc;