[Bug 164] XML Tidy up

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1329 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

18 files changed, 115 insertions, 112 deletions

diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
index 70ff6a243..82572cbc4 100644
--- a/chapter05/bash-inst.xml
+++ b/chapter05/bash-inst.xml
@@ -15,18 +15,18 @@ or you just installed it, check for the two files again. Often the
 create <filename>libcurses.a</filename> as a symlink by running the 
 following commands:</para>
 
-<para><screen><userinput>cd /usr/lib &amp;&amp;</userinput>
-<userinput>ln -s libncurses.a libcurses.a</userinput></screen></para>
+<para><screen><userinput>cd /usr/lib &amp;&amp;
+ln -s libncurses.a libcurses.a</userinput></screen></para>
 
 <para>Now we can continue. Install Bash by running the following 
 commands:</para>
 
-<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 -sf bash sh</userinput></screen></para>
+<para><screen><userinput>./configure --enable-static-link --prefix=$LFS/usr \
+&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin --with-curses &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd $LFS/bin &amp;&amp;
+ln -sf bash sh</userinput></screen></para>
 
 <para>If the make install phase ends with something along the lines of</para>
 
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 910cb6bae..ba383cdef 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -9,9 +9,9 @@ it comes with.</para>
 
 <para>Install Binutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-all-static tooldir=$LFS/usr &amp;&amp;</userinput>
-<userinput>make tooldir=$LFS/usr install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-all-static tooldir=$LFS/usr &amp;&amp;
+make tooldir=$LFS/usr install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index 17ca0b59a..3dab1cf4c 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -3,10 +3,10 @@
 
 <para>Install Bzip2 by running the following commands:</para>
 
-<para><screen><userinput>make CC="gcc -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>
+<para><screen><userinput>make CC="gcc -static" &amp;&amp;
+make PREFIX=$LFS/usr install &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para>
 
 <para>Although it's not strictly a part of a basic LFS system it's worth
 mentioning that a patch for Tar can be downloaded which enables the tar
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index c10da0f8d..d0266cf73 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -7,18 +7,18 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
-<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>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+./configure --prefix=$LFS/usr &amp;&amp;
+unset CPPFLAGS &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 <para>If you are using a newer glibc version (2.2.x), you can use the following
 commands to install Diffutils:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml
index 2a117d4e4..089e782ea 100644
--- a/chapter05/fileutils-exp.xml
+++ b/chapter05/fileutils-exp.xml
@@ -5,11 +5,11 @@
 run this command in order to keep a backup of the file we are about to
 change.</para>
 
-<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
-<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
-<userinput>mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen>
+<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;
+sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
+&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
+&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;
+mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen>
 This is used to fix a problem with building fileutils statically on glibc 2.2.3 
 systems.  If this isn't done, then there is the possibility of all of the 
 fileutils programs causing segmentation faults once chroot is entered 
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 00e85a0ec..ab423617e 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -21,19 +21,20 @@ machines, run the following commands. Do <emphasis>not</emphasis>
 attempt this fix if you don't have Glibc-2.2.3 installed. It will more 
 than likely result in all kinds of compile time problems.</para>
 
-<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
-<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
-<userinput>mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para>
-
-<para>Install fileutils by running the following commands:
-<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 -sf ../../bin/install</userinput></screen></para>
+<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;
+sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
+&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
+&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;
+mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para>
+
+<para>Install fileutils by running the following commands:</para>
+
+<para><screen><userinput>./configure --disable-nls \
+&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --libexecdir=$LFS/bin --bindir=$LFS/bin &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+ln -sf ../../bin/install</userinput></screen></para>
 
 <para>Once you have installed fileutils, you can test whether the
 segmentation fault problem has been avoided by running
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index b82a11d39..f7dffd9ad 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -9,19 +9,19 @@ it comes with.</para>
 
 <para>Install GCC by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-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 --enable-languages=c,c++ \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;</userinput>
-<userinput>make BOOT_LDFLAGS=-static bootstrap &amp;&amp;</userinput>
-<userinput>make prefix=$LFS/usr install &amp;&amp;</userinput>
-<userinput>cd $LFS/lib &amp;&amp;</userinput>
-<userinput>ln -sf ../usr/bin/cpp &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/lib &amp;&amp;</userinput>
-<userinput>ln -sf ../bin/cpp &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>ln -sf gcc cc</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
+mkdir ../gcc-build &amp;&amp;
+cd ../gcc-build &amp;&amp;
+../gcc-&gcc-version;/configure --prefix=/usr --enable-languages=c,c++ \
+&nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;
+make BOOT_LDFLAGS=-static bootstrap &amp;&amp;
+make prefix=$LFS/usr install &amp;&amp;
+cd $LFS/lib &amp;&amp;
+ln -sf ../usr/bin/cpp &amp;&amp;
+cd $LFS/usr/lib &amp;&amp;
+ln -sf ../bin/cpp &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+ln -sf gcc cc</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index 945da319d..22102fd1d 100644
--- a/chapter05/grep-inst.xml
+++ b/chapter05/grep-inst.xml
@@ -7,18 +7,18 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
-<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>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+unset CPPFLAGS &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
  
 <para>If you are using a newer glibc version (2.2.x), you can use the
 following commands to install Grep:</para>
  
-<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>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index 09e431d2d..d12031710 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -10,14 +10,15 @@ version, so if you aren't sure, it's best to apply it.</para>
 
 <para>Apply the patch by running the following command:</para>
 
-<para><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></para>
+<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></screen></para>
 
 <para>Install Gzip by running the following commands:</para>
-<para><screen><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>
+
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &amp;&amp;
+rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml
index 3ac2f4e01..4aca35b19 100644
--- a/chapter05/kernel-inst.xml
+++ b/chapter05/kernel-inst.xml
@@ -10,15 +10,15 @@ compile the packages that need the kernel.</para>
 <para>The kernel configuration file is created by running the following 
 command:</para>
 
-<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>
-<userinput>cp -a ../src/linux/include/linux . &amp;&amp;</userinput>
-<userinput>chown -R root.root $LFS/usr/include/linux &amp;&amp;</userinput>
-<userinput>mkdir asm &amp;&amp;</userinput>
-<userinput>cp -a ../src/linux/include/asm/* asm &amp;&amp;</userinput>
-<userinput>chown -R root.root $LFS/usr/include/asm</userinput></screen></para>
+<para><screen><userinput>make mrproper &amp;&amp;
+yes "" | make config &amp;&amp;
+make dep &amp;&amp;
+cd $LFS/usr/include &amp;&amp;
+cp -a ../src/linux/include/linux . &amp;&amp;
+chown -R root.root $LFS/usr/include/linux &amp;&amp;
+mkdir asm &amp;&amp;
+cp -a ../src/linux/include/asm/* asm &amp;&amp;
+chown -R root.root $LFS/usr/include/asm</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml
index 1e358f555..6130f8106 100644
--- a/chapter05/make-inst.xml
+++ b/chapter05/make-inst.xml
@@ -3,9 +3,9 @@
 
 <para>Install Make by running the following commands:</para>
 
-<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>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml
index cd872df6c..030c4b9fc 100644
--- a/chapter05/mawk-inst.xml
+++ b/chapter05/mawk-inst.xml
@@ -3,10 +3,10 @@
 
 <para>Install Mawk by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;</userinput>
-<userinput>make CC="gcc -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>
+<para><screen><userinput>./configure &amp;&amp;
+make CC="gcc -static" &amp;&amp;
+make BINDIR=$LFS/usr/bin \
+&nbsp;&nbsp;&nbsp;MANDIR=$LFS/usr/share/man/man1 install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml
index 7effdd3df..4eebac903 100644
--- a/chapter05/patch-inst.xml
+++ b/chapter05/patch-inst.xml
@@ -3,9 +3,9 @@
 
 <para>Install Patch by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index 82b4d4978..377fd3d6a 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -7,18 +7,18 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
-<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>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
+unset CPPFLAGS &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
  
 <para>If you are using a newer glibc version (2.2.x), you can use the
 following commands to install Sed:</para>
  
-<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index 3aeb04da3..74f8def4f 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -13,12 +13,13 @@ best to apply it.</para>
 <para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>
 
 <para>Install Sh-utils by running the following commands:</para>
-<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>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>
+
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+mv date echo false pwd stty $LFS/bin &amp;&amp;
+mv su true uname hostname $LFS/bin</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml
index 55a7b3699..7b3bcc95d 100644
--- a/chapter05/tar-inst.xml
+++ b/chapter05/tar-inst.xml
@@ -12,10 +12,10 @@ for gzip files).</para>
 
 <para>Install Tar by running the following commands:</para>
 
-<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>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \
+&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin --bindir=$LFS/bin &amp;&amp; 
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
index 84cd6d0df..02cf81fd1 100644
--- a/chapter05/texinfo-inst.xml
+++ b/chapter05/texinfo-inst.xml
@@ -3,9 +3,9 @@
 
 <para>Install Texinfo by running the following commands:</para>
 
-<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>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml
index fc56d6f8d..d9ad8c448 100644
--- a/chapter05/textutils-inst.xml
+++ b/chapter05/textutils-inst.xml
@@ -3,10 +3,10 @@
 
 <para>Install Textutils by running the following commands:</para>
 
-<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>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para>
 
 </sect2>