Index: chapter06/autoconf-inst.xml
===================================================================
--- chapter06/autoconf-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/autoconf-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/automake-inst.xml
===================================================================
--- chapter06/automake-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/automake-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,8 +6,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/bash-inst.xml
===================================================================
--- chapter06/bash-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/bash-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,13 +6,13 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --with-curses
-		 &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>logout</userinput>
-	<userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug
-		$LFS/bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --with-curses &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>logout</userinput>
+<userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug $LFS/bin</userinput>
+</screen>
+</para>
 
 <para>
@@ -21,7 +21,9 @@
 </para>
 
-<blockquote><literallayout>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+&c6-chrootcmd;
+</screen>
+</para>
 
 </sect2>
Index: chapter06/bashprofile.xml
===================================================================
--- chapter06/bashprofile.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/bashprofile.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -15,5 +15,6 @@
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; $LFS/root/.bash_profile &lt;&lt; "EOF"</userinput>
 # Begin /root/.bash_profile
@@ -26,5 +27,6 @@
 # End /root/.bash_profile
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
Index: chapter06/bin86-inst.xml
===================================================================
--- chapter06/bin86-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/bin86-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,8 +6,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make PREFIX=/usr install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make PREFIX=/usr install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/binutils-inst.xml
===================================================================
--- chapter06/binutils-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/binutils-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -5,10 +5,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --enable-shared &amp;&amp;</userinput>
-	<userinput>make -e tooldir=/usr &amp;&amp;</userinput>
-	<userinput>make -e tooldir=/usr install &amp;&amp;</userinput>
-	<userinput>make -e tooldir=/usr install-info</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --enable-shared &amp;&amp;</userinput>
+<userinput>make -e tooldir=/usr &amp;&amp;</userinput>
+<userinput>make -e tooldir=/usr install &amp;&amp;</userinput>
+<userinput>make -e tooldir=/usr install-info</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/bison-inst.xml
===================================================================
--- chapter06/bison-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/bison-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,11 +6,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--datadir=/usr/share/bison
-		 &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--datadir=/usr/share/bison &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 <para>
@@ -26,5 +27,6 @@
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /usr/bin/yacc &lt;&lt; "EOF"</userinput>
 #!/bin/sh
@@ -36,5 +38,6 @@
 <userinput>EOF</userinput>
 <userinput>chmod 755 /usr/bin/yacc</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/bzip2-inst.xml
===================================================================
--- chapter06/bzip2-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/bzip2-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,21 +6,23 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>make -f Makefile-libbz2_so &amp;&amp;</userinput>
-	<userinput>make bzip2recover libbz2.a &amp;&amp;</userinput>
-	<userinput>cp bzip2-shared /bin/bzip2 &amp;&amp;</userinput>
-	<userinput>cp bzip2recover /bin &amp;&amp;</userinput>
-	<userinput>cp bzip2.1 /usr/share/man/man1 &amp;&amp;</userinput>
-	<userinput>cp bzlib.h /usr/include &amp;&amp;</userinput>
-	<userinput>cp -a libbz2.so* libbz2.a /lib &amp;&amp;</userinput>
-	<userinput>rm /usr/lib/libbz2.a &amp;&amp;</userinput>
-	<userinput>cd /bin &amp;&amp;</userinput>
-	<userinput>ln -sf bzip2 bunzip2 &amp;&amp;</userinput>
-	<userinput>ln -sf bzip2 bzcat &amp;&amp;</userinput>
-	<userinput>cd /usr/share/man/man1 &amp;&amp;</userinput>
-	<userinput>ln -s bzip2.1 bunzip2.1 &amp;&amp;</userinput>
-	<userinput>ln -s bzip2.1 bzcat.1 &amp;&amp;</userinput>
-	<userinput>ln -s bzip2.1 bzip2recover.1</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>make -f Makefile-libbz2_so &amp;&amp;</userinput>
+<userinput>make bzip2recover libbz2.a &amp;&amp;</userinput>
+<userinput>cp bzip2-shared /bin/bzip2 &amp;&amp;</userinput>
+<userinput>cp bzip2recover /bin &amp;&amp;</userinput>
+<userinput>cp bzip2.1 /usr/share/man/man1 &amp;&amp;</userinput>
+<userinput>cp bzlib.h /usr/include &amp;&amp;</userinput>
+<userinput>cp -a libbz2.so* libbz2.a /lib &amp;&amp;</userinput>
+<userinput>rm /usr/lib/libbz2.a &amp;&amp;</userinput>
+<userinput>cd /bin &amp;&amp;</userinput>
+<userinput>ln -sf bzip2 bunzip2 &amp;&amp;</userinput>
+<userinput>ln -sf bzip2 bzcat &amp;&amp;</userinput>
+<userinput>cd /usr/share/man/man1 &amp;&amp;</userinput>
+<userinput>ln -s bzip2.1 bunzip2.1 &amp;&amp;</userinput>
+<userinput>ln -s bzip2.1 bzcat.1 &amp;&amp;</userinput>
+<userinput>ln -s bzip2.1 bzip2recover.1</userinput>
+</screen>
+</para>
 
 <para>
Index: chapter06/chroot.xml
===================================================================
--- chapter06/chroot.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/chroot.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -14,7 +14,9 @@
 </para>
 
-<blockquote><literallayout>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+&c6-chrootcmd;
+</screen>
+</para>
 
 <para>
Index: chapter06/chrootcmd.xml
===================================================================
--- chapter06/chrootcmd.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/chrootcmd.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -1,4 +1,3 @@
-	<userinput>cd $LFS &amp;&amp;</userinput>
-	<userinput>chroot $LFS /usr/bin/env -i HOME=/root
-		\</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;TERM=$TERM /bin/bash --login</userinput>
+<userinput>cd $LFS &amp;&amp;</userinput>
+<userinput>chroot $LFS /usr/bin/env -i HOME=/root \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;TERM=$TERM /bin/bash --login</userinput>
Index: chapter06/config-glibc.xml
===================================================================
--- chapter06/config-glibc.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/config-glibc.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -13,5 +13,6 @@
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"</userinput>
 # Begin /etc/nsswitch.conf
@@ -35,5 +36,6 @@
 # End /etc/nsswitch.conf
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
@@ -49,9 +51,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>cd /etc &amp;&amp;</userinput>
-	<userinput>ln -sf ../usr/share/zoneinfo/&lt;tzselect's output&gt; 
-		localtime</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd /etc &amp;&amp;</userinput>
+<userinput>ln -sf ../usr/share/zoneinfo/&lt;tzselect's output&gt; localtime</userinput>
+</screen>
+</para>
 
 <para>
@@ -64,7 +67,9 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput> 
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput> 
+</screen>
+</para>
 
 <para>
@@ -72,8 +77,9 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime
-		</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime </userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/config-ldso.xml
===================================================================
--- chapter06/config-ldso.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/config-ldso.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -18,5 +18,6 @@
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
 # Begin /etc/ld.so.conf
@@ -28,5 +29,6 @@
 # End /etc/ld.so.conf
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
Index: chapter06/config-shadowpwd.xml
===================================================================
--- chapter06/config-shadowpwd.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/config-shadowpwd.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -16,7 +16,9 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>/usr/sbin/pwconv</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>/usr/sbin/pwconv</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/config-sysklogd.xml
===================================================================
--- chapter06/config-sysklogd.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/config-sysklogd.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,5 +6,6 @@
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"</userinput>
 # Begin /etc/syslog.conf
@@ -20,5 +21,6 @@
 # End /etc/syslog.conf
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/config-sysvinit.xml
===================================================================
--- chapter06/config-sysvinit.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/config-sysvinit.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,5 +6,6 @@
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"</userinput>
 # Begin /etc/inittab
@@ -35,5 +36,6 @@
 # End /etc/inittab
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/config-vim.xml
===================================================================
--- chapter06/config-vim.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/config-vim.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -8,5 +8,6 @@
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /root/.vimrc &lt;&lt; "EOF"</userinput>
 " Begin /root/.vimrc
@@ -17,5 +18,6 @@
 " End /root/.vimrc
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/create-password.xml
===================================================================
--- chapter06/create-password.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/create-password.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -7,7 +7,9 @@
 </para>
 
-<blockquote><literallayout>
+<para>
+<screen>
 <userinput>passwd root</userinput>
-</literallayout></blockquote>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/create-utmp.xml
===================================================================
--- chapter06/create-utmp.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/create-utmp.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -16,12 +16,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>touch /var/run/utmp /var/log/wtmp \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp; /var/log/btmp
-		/var/log/lastlog &amp;&amp;</userinput>
-	<userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;/var/log/btmp /var/log/lastlog
-		</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>touch /var/run/utmp /var/log/wtmp \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp; /var/log/btmp /var/log/lastlog &amp;&amp;</userinput>
+<userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;/var/log/btmp /var/log/lastlog</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/diffutils-inst.xml
===================================================================
--- chapter06/diffutils-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/diffutils-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/e2fsprogs-inst.xml
===================================================================
--- chapter06/e2fsprogs-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/e2fsprogs-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -11,12 +11,14 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --with-root-prefix= \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--enable-elf-shlibs &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>make install-libs &amp;&amp;</userinput>
-	<userinput>mv /usr/sbin/mklost+found /sbin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --with-root-prefix= \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--enable-elf-shlibs &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>make install-libs &amp;&amp;</userinput>
+<userinput>mv /usr/sbin/mklost+found /sbin</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/ed-inst.xml
===================================================================
--- chapter06/ed-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/ed-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,10 +6,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/file-inst.xml
===================================================================
--- chapter06/file-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/file-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,10 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr 
-		--datadir=/usr/share/misc &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 <para>
@@ -27,7 +28,9 @@
 </para>
 
-<blockquote><literallayout>
-        <userinput>file -C</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>file -C</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/fileutils-inst.xml
===================================================================
--- chapter06/fileutils-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/fileutils-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,11 +6,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --bindir=/bin \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/bin 
-		&amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --bindir=/bin \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/bin &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/findutils-inst.xml
===================================================================
--- chapter06/findutils-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/findutils-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -10,10 +10,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;</userinput>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make libexecdir=/usr/bin install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;</userinput>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make libexecdir=/usr/bin install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/flex-inst.xml
===================================================================
--- chapter06/flex-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/flex-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,11 +6,13 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd /usr/bin &amp;&amp;</userinput>
-	<userinput>ln -s flex lex</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd /usr/bin &amp;&amp;</userinput>
+<userinput>ln -s flex lex</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/gcc-inst.xml
===================================================================
--- chapter06/gcc-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/gcc-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -16,15 +16,15 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>mkdir /usr/src/gcc-build &amp;&amp;</userinput>
-	<userinput>cd /usr/src/gcc-build &amp;&amp;</userinput>
-	<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--with-slibdir=/lib
-		--enable-shared \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--enable-languages=c,c++
-		&amp;&amp;</userinput>
-	<userinput>make bootstrap &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mkdir /usr/src/gcc-build &amp;&amp;</userinput>
+<userinput>cd /usr/src/gcc-build &amp;&amp;</userinput>
+<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--with-slibdir=/lib --enable-shared \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ &amp;&amp;</userinput>
+<userinput>make bootstrap &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/gettext-inst.xml
===================================================================
--- chapter06/gettext-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/gettext-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/glibc-inst.xml
===================================================================
--- chapter06/glibc-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/glibc-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -11,32 +11,26 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
-	<userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
-	<userinput>mkdir /usr/src/glibc-build &amp;&amp;</userinput>
-	<userinput>cd /usr/src/glibc-build &amp;&amp;</userinput>
-	<userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;../glibc-&glibc-version;/malloc/Makefile
-		&gt; tmp~ &amp;&amp;</userinput>
-	<userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile &amp;&amp;
-		</userinput>
-	<userinput>sed "s/root/0/" ../glibc-&glibc-version;/login/Makefile 
-		&gt; tmp~ &amp;&amp; </userinput>
-	<userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile &amp;&amp;
-		</userinput>
-	<userinput>../glibc-&glibc-version;/configure \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-add-ons 
-		\</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin &amp;&amp;
-		</userinput>
-	<userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ 
-		\</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;config.make &gt; config.make~
-		&amp;&amp;</userinput>
-	<userinput>mv config.make~ config.make &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>make localedata/install-locales</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
+<userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
+<userinput>mkdir /usr/src/glibc-build &amp;&amp;</userinput>
+<userinput>cd /usr/src/glibc-build &amp;&amp;</userinput>
+<userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;../glibc-&glibc-version;/malloc/Makefile &gt; tmp~ &amp;&amp;</userinput>
+<userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile &amp;&amp;</userinput>
+<userinput>sed "s/root/0/" ../glibc-&glibc-version;/login/Makefile &gt; tmp~ &amp;&amp;</userinput>
+<userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile &amp;&amp;</userinput>
+<userinput>../glibc-&glibc-version;/configure \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-add-ons \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin &amp;&amp;</userinput>
+<userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;config.make &gt; config.make~ &amp;&amp;</userinput>
+<userinput>mv config.make~ config.make &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>make localedata/install-locales</userinput>
+</screen>
+</para>
 
 <para>
@@ -70,8 +64,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>logout</userinput>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>logout</userinput>
+&c6-chrootcmd;
+</screen>
+</para>
 
 </sect2>
Index: chapter06/grep-inst.xml
===================================================================
--- chapter06/grep-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/grep-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/groff-inst.xml
===================================================================
--- chapter06/groff-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/groff-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,10 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;
-		</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/gzip-inst.xml
===================================================================
--- chapter06/gzip-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/gzip-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,17 +6,19 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd /usr/bin &amp;&amp;</userinput>
-	<userinput>mv gzip /bin &amp;&amp;</userinput>
-	<userinput>rm gunzip zcat &amp;&amp;</userinput>
-	<userinput>cd /bin &amp;&amp;</userinput>
-	<userinput>ln -sf gzip gunzip &amp;&amp;</userinput>
-	<userinput>ln -s gzip zcat &amp;&amp;</userinput>
-	<userinput>ln -s gzip compress &amp;&amp;</userinput>
-	<userinput>ln -s gunzip uncompress</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd /usr/bin &amp;&amp;</userinput>
+<userinput>mv gzip /bin &amp;&amp;</userinput>
+<userinput>rm gunzip zcat &amp;&amp;</userinput>
+<userinput>cd /bin &amp;&amp;</userinput>
+<userinput>ln -sf gzip gunzip &amp;&amp;</userinput>
+<userinput>ln -s gzip zcat &amp;&amp;</userinput>
+<userinput>ln -s gzip compress &amp;&amp;</userinput>
+<userinput>ln -s gunzip uncompress</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/kbd-inst.xml
===================================================================
--- chapter06/kbd-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/kbd-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,11 +6,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --datadir=/usr/share/kbd &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>rm
-	/usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --datadir=/usr/share/kbd &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput>
+</screen>
+</para>
 
 <para>
@@ -20,8 +21,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>cd /usr/share/kbd/keymaps &amp;&amp;</userinput>
-	<userinput>ln -s &lt;path-to-keymap&gt; defkeymap.map.gz</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd /usr/share/kbd/keymaps &amp;&amp;</userinput>
+<userinput>ln -s &lt;path-to-keymap&gt; defkeymap.map.gz</userinput>
+</screen>
+</para>
 
 <para>
Index: chapter06/less-inst.xml
===================================================================
--- chapter06/less-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/less-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/libtool-inst.xml
===================================================================
--- chapter06/libtool-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/libtool-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/lilo-inst.xml
===================================================================
--- chapter06/lilo-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/lilo-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -14,8 +14,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 <para>
Index: chapter06/m4-inst.xml
===================================================================
--- chapter06/m4-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/m4-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 <para>
@@ -30,5 +32,6 @@
 </para>
 
-<blockquote><literallayout>
+<para>
+<screen>
 <userinput>logout</userinput>
 <userinput>cd $LFS/usr/src/m4-1.4</userinput>
@@ -36,5 +39,6 @@
 <userinput>make LDFLAGS=-static</userinput>
 <userinput>make prefix=$LFS/usr install</userinput>
-</literallayout></blockquote>
+</screen>
+</para>
 
 <para>
@@ -45,7 +49,9 @@
 </para>
 
-<blockquote><literallayout>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+&c6-chrootcmd;
+</screen>
+</para>
 
 </sect2>
Index: chapter06/make-inst.xml
===================================================================
--- chapter06/make-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/make-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/makedev-inst.xml
===================================================================
--- chapter06/makedev-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/makedev-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -11,11 +11,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>cp MAKEDEV-1.1 /dev/MAKEDEV &amp;&amp;
-		</userinput>
-	<userinput>cd /dev &amp;&amp;</userinput>
-	<userinput>chmod 755 MAKEDEV &amp;&amp;</userinput>
-	<userinput>./MAKEDEV -v generic</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cp MAKEDEV-1.1 /dev/MAKEDEV &amp;&amp;</userinput>
+<userinput>cd /dev &amp;&amp;</userinput>
+<userinput>chmod 755 MAKEDEV &amp;&amp;</userinput>
+<userinput>./MAKEDEV -v generic</userinput>
+</screen>
+</para>
 
 <para>
Index: chapter06/man-inst.xml
===================================================================
--- chapter06/man-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/man-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,11 +6,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../man-&man-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>./configure -default &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../man-&man-version;.patch &amp;&amp;</userinput>
+<userinput>./configure -default &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 <para>
Index: chapter06/manpages-inst.xml
===================================================================
--- chapter06/manpages-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/manpages-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/mawk-inst.xml
===================================================================
--- chapter06/mawk-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/mawk-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,13 +6,14 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make BINDIR=/usr/bin \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;MANDIR=/usr/share/man/man1 install
-		 &amp;&amp;</userinput>
-	<userinput>cd /usr/bin &amp;&amp;</userinput>
-	<userinput>ln -s mawk awk</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make BINDIR=/usr/bin \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;MANDIR=/usr/share/man/man1 install &amp;&amp;</userinput>
+<userinput>cd /usr/bin &amp;&amp;</userinput>
+<userinput>ln -s mawk awk</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/modutils-inst.xml
===================================================================
--- chapter06/modutils-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/modutils-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -12,9 +12,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/ncurses-inst.xml
===================================================================
--- chapter06/ncurses-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/ncurses-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,13 +6,13 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=/usr --libdir=/lib \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--with-shared 
-		--disable-termcap &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch &amp;&amp;</userinput>
+<userinput>./configure --prefix=/usr --libdir=/lib \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--with-shared --disable-termcap &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/netkitbase-inst.xml
===================================================================
--- chapter06/netkitbase-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/netkitbase-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,12 +6,13 @@
 </para>
 
-<blockquote><literallayout>
-        
-	<userinput>./configure &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd etc.sample &amp;&amp;</userinput>
-	<userinput>cp services protocols /etc</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd etc.sample &amp;&amp;</userinput>
+<userinput>cp services protocols /etc</userinput>
+</screen>
+</para>
 
 <para>
Index: chapter06/nettools-inst.xml
===================================================================
--- chapter06/nettools-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/nettools-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,8 +6,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/patch-inst.xml
===================================================================
--- chapter06/patch-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/patch-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/perl-inst.xml
===================================================================
--- chapter06/perl-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/perl-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./Configure -Dprefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./Configure -Dprefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 <para>
@@ -20,9 +22,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./Configure -Dprefix=/usr -d -e &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./Configure -Dprefix=/usr -d -e &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/procinfo-inst.xml
===================================================================
--- chapter06/procinfo-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/procinfo-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f -
-		&amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f - &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/procps-inst.xml
===================================================================
--- chapter06/procps-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/procps-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,10 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make XSCPT='' install
-		&amp;&amp;</userinput>	
-	<userinput>mv /usr/bin/kill /bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make XSCPT='' install &amp;&amp;</userinput>	
+<userinput>mv /usr/bin/kill /bin</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/psmisc-inst.xml
===================================================================
--- chapter06/psmisc-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/psmisc-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/removeoldnss.xml
===================================================================
--- chapter06/removeoldnss.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/removeoldnss.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -8,7 +8,9 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput>
+</screen>
+</para>
 
 </sect1>
Index: chapter06/sed-inst.xml
===================================================================
--- chapter06/sed-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/sed-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,9 +6,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/shadowpwd-inst.xml
===================================================================
--- chapter06/shadowpwd-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/shadowpwd-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,14 +6,15 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../shadow-20001016.patch &amp;&amp;</userinput>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd etc &amp;&amp;</userinput>
-	<userinput>cp limits login.access /etc &amp;&amp;</userinput>
-	<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux &gt;
-		/etc/login.defs</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../shadow-20001016.patch &amp;&amp;</userinput>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd etc &amp;&amp;</userinput>
+<userinput>cp limits login.access /etc &amp;&amp;</userinput>
+<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux &gt; /etc/login.defs</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/shellutils-inst.xml
===================================================================
--- chapter06/shellutils-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/shellutils-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,12 +6,14 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd /usr/bin &amp;&amp;</userinput>
-	<userinput>mv date echo false pwd stty /bin &amp;&amp;</userinput>
-	<userinput>mv su true uname hostname /bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd /usr/bin &amp;&amp;</userinput>
+<userinput>mv date echo false pwd stty /bin &amp;&amp;</userinput>
+<userinput>mv su true uname hostname /bin</userinput>
+</screen>
+</para>
 
 </sect2>
@@ -29,7 +31,9 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>ln -s test [</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>ln -s test [</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/sysklogd-inst.xml
===================================================================
--- chapter06/sysklogd-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/sysklogd-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,8 +6,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/sysvinit-inst.xml
===================================================================
--- chapter06/sysvinit-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/sysvinit-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -18,7 +18,9 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../sysvinit-2.78.patch</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../sysvinit-2.78.patch</userinput>
+</screen>
+</para>
 
 <para>
@@ -26,8 +28,10 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>make -C src &amp;&amp;</userinput>
-	<userinput>make -C src install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>make -C src &amp;&amp;</userinput>
+<userinput>make -C src install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/tar-inst.xml
===================================================================
--- chapter06/tar-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/tar-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -14,9 +14,11 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>cd src &amp;&amp;</userinput>
-	<userinput>patch -i ../../gnutarpatch.txt &amp;&amp;</userinput>
-	<userinput>cd ..</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd src &amp;&amp;</userinput>
+<userinput>patch -i ../../gnutarpatch.txt &amp;&amp;</userinput>
+<userinput>cd ..</userinput>
+</screen>
+</para>
 
 <para>
@@ -25,11 +27,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --libexecdir=/usr/bin
-		\</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--bindir=/bin &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput>
+	<userinput>--bindir=/bin &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/texinfo-inst.xml
===================================================================
--- chapter06/texinfo-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/texinfo-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,12 +6,13 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>make TEXMF=/usr/share/texmf install-tex</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &amp;&amp;</userinput>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>make TEXMF=/usr/share/texmf install-tex</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/textutils-inst.xml
===================================================================
--- chapter06/textutils-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/textutils-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -6,10 +6,12 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>mv /usr/bin/cat /bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>mv /usr/bin/cat /bin</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/utillinux-inst.xml
===================================================================
--- chapter06/utillinux-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/utillinux-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -8,12 +8,13 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|"
-		\</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;hwclock/hwclock.c &gt; hwclock~
-		&amp;&amp;</userinput>
-	<userinput>mv hwclock~ hwclock/hwclock.c &amp;&amp;</userinput>
-	<userinput>mkdir /var/lib/hwclock</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|" \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;hwclock/hwclock.c &gt; hwclock~ &amp;&amp;</userinput>
+<userinput>mv hwclock~ hwclock/hwclock.c &amp;&amp;</userinput>
+<userinput>mkdir /var/lib/hwclock</userinput>
+</screen>
+</para>
+
 </sect2>
 
@@ -25,13 +26,14 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;MCONFIG &gt; MCONFIG~
-		&amp;&amp;</userinput>
-	<userinput>mv MCONFIG~ MCONFIG &amp;&amp;</userinput>
-	<userinput>./configure &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;MCONFIG &gt; MCONFIG~ &amp;&amp;</userinput>
+<userinput>mv MCONFIG~ MCONFIG &amp;&amp;</userinput>
+<userinput>./configure &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
Index: chapter06/vim-inst.xml
===================================================================
--- chapter06/vim-inst.xml	(revision b4ffa369d68fbce4b8e9bc30474e01630a41f303)
+++ chapter06/vim-inst.xml	(revision 3229c6b8a21173d078d03094e1dfc931bd6146bc)
@@ -19,11 +19,13 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd /usr/bin &amp;&amp;</userinput>
-	<userinput>ln -s vim vi</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd /usr/bin &amp;&amp;</userinput>
+<userinput>ln -s vim vi</userinput>
+</screen>
+</para>
 
 <para>
@@ -47,12 +49,14 @@
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd /usr/bin &amp;&amp;</userinput>
-	<userinput>ln -s vim vi &amp;&amp;</userinput>
-	<userinput>mkdir /var/lib/vim</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd /usr/bin &amp;&amp;</userinput>
+<userinput>ln -s vim vi &amp;&amp;</userinput>
+<userinput>mkdir /var/lib/vim</userinput>
+</screen>
+</para>
 
 </sect2>
