Changed literallayout's to screen's

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

chapter01/conventions.xml

@@ -47,13 +47,15 @@ This form of text is used for hyperlinks, both within the book and to external
 pages such as HowTo's,download locations and websites etc. 
 </para></blockquote>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
 	root:x:0:
 	bin:x:1:
 	......
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <blockquote><para>
 This type of section is used mainly when creating configuration files.  The

chapter06/autoconf-inst.xml

@@ -5,11 +5,13 @@
 Install Autoconf by running the following commands:
 </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>
 

chapter06/automake-inst.xml

@@ -5,10 +5,12 @@
 Install Automake by running the following commands:
 </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>
 

chapter06/bash-inst.xml

@@ -5,24 +5,26 @@
 Install Bash by running the following commands:
 </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>
 The static bash is replaced with the dynamic bash and the chroot'ed
 environment is re-entered by running:
 </para>
 
-<blockquote><literallayout>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+&c6-chrootcmd;
+</screen>
+</para>
 
 </sect2>
 

chapter06/bashprofile.xml

@@ -14,7 +14,8 @@ Create a new file <filename>$LFS/root/.bash_profile</filename>
 by running the following.
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; $LFS/root/.bash_profile &lt;&lt; "EOF"</userinput>
 # Begin /root/.bash_profile
 
@@ -25,7 +26,8 @@ export PS1 PATH
 
 # End /root/.bash_profile
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 The PS1 variable is an environment variable that controls the appearance of

chapter06/bin86-inst.xml

@@ -5,10 +5,12 @@
 Install Bin86 by running the following commands:
 </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>
 

chapter06/binutils-inst.xml

@@ -4,12 +4,14 @@
 Install Binutils by running the following commands:
 </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>
 

chapter06/bison-inst.xml

@@ -5,13 +5,14 @@
 Install Bison by running the following commands:
 </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>
 Some programs don't know about bison and try to find the yacc program
@@ -25,7 +26,8 @@ Create a new file <filename>/usr/bin/yacc</filename> by running the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /usr/bin/yacc &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /usr/bin/yacc
@@ -35,7 +37,8 @@ following:
 # End /usr/bin/yacc
 <userinput>EOF</userinput>
 <userinput>chmod 755 /usr/bin/yacc</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
 

chapter06/bzip2-inst.xml

@@ -5,23 +5,25 @@
 Install Bzip2 by running the following commands:
 </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>
 Although it's not strictly a part of a basic LFS system it's worth

chapter06/chroot.xml

@@ -13,9 +13,11 @@ everything a user does will be restricted to the LFS partition (since / is
 actually /mnt/lfs but the shell doesn't know that).
 </para>
 
-<blockquote><literallayout>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+&c6-chrootcmd;
+</screen>
+</para>
 
 <para>
 The -i option will clear all environment variables for as long as you

chapter06/chrootcmd.xml

@@ -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>

chapter06/config-glibc.xml

@@ -12,7 +12,8 @@ Create a new file <filename>/etc/nsswitch.conf</filename> by running the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"</userinput>
 # Begin /etc/nsswitch.conf
 
@@ -34,7 +35,8 @@ netgroup: db files
 
 # End /etc/nsswitch.conf
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 The <userinput>tzselect</userinput> script has to be run and the questions 
@@ -48,11 +50,12 @@ Create the <filename class="directory">/etc/localtime</filename> symlink
 by running:
 </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>
 tzselect's output can be something like <emphasis>EST5EDT</emphasis> or
@@ -63,18 +66,21 @@ tzselect's output can be something like <emphasis>EST5EDT</emphasis> or
 The symlink you'd create with that information would be:
 </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>
 Or:
 </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>
 

chapter06/config-ldso.xml

@@ -17,7 +17,8 @@ Create a new file <filename>/etc/ld.so.conf</filename> by running the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
 # Begin /etc/ld.so.conf
 
@@ -27,7 +28,8 @@ following:
 
 # End /etc/ld.so.conf
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 Although it's not necessary to add the 

chapter06/config-shadowpwd.xml

@@ -15,9 +15,11 @@ be able to work with shadow'ed passwords.
 To enable shadow'ed passwords, run the following command:
 </para>
 
-<blockquote><literallayout>
-	<userinput>/usr/sbin/pwconv</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>/usr/sbin/pwconv</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter06/config-sysklogd.xml

@@ -5,7 +5,8 @@ Create a new file <filename>/etc/syslog.conf</filename> by running the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"</userinput>
 # Begin /etc/syslog.conf
 
@@ -19,7 +20,8 @@ user.* -/var/log/user.log
 
 # End /etc/syslog.conf
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
 

chapter06/config-sysvinit.xml

@@ -5,7 +5,8 @@ Create a new file <filename>/etc/inittab</filename> by running the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"</userinput>
 # Begin /etc/inittab
 
@@ -34,7 +35,8 @@ su:S016:respawn:/sbin/sulogin
 
 # End /etc/inittab
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
 

chapter06/config-vim.xml

@@ -7,7 +7,8 @@ have included Vim in this book but the original Vi). Create the
 <filename>/root/.vimrc</filename> by running the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /root/.vimrc &lt;&lt; "EOF"</userinput>
 " Begin /root/.vimrc
 
@@ -16,7 +17,8 @@ set bs=2
 
 " End /root/.vimrc
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect2>
 

chapter06/create-password.xml

@@ -6,9 +6,11 @@ Choose a password for user root and create it by running the following
 command:
 </para>
 
-<blockquote><literallayout>
+<para>
+<screen>
 <userinput>passwd root</userinput>
-</literallayout></blockquote>
+</screen>
+</para>
 
 </sect2>
 

chapter06/create-utmp.xml

@@ -15,14 +15,14 @@ Create these files with their proper permissions by running the
 following commands:
 </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>
 

chapter06/diffutils-inst.xml

@@ -5,11 +5,13 @@
 Install Diffutils by running the following commands:
 </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>
 

chapter06/e2fsprogs-inst.xml

@@ -10,14 +10,16 @@ Please note that the empty --with-root-prefix= option below is supposed
 to be like this. We did not forget to supply a value there.
 </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>
 

chapter06/ed-inst.xml

@@ -5,12 +5,14 @@
 Install Ed by running the following commands:
 </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>
 

chapter06/file-inst.xml

@@ -5,12 +5,13 @@
 Install File by running the following commands:
 </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>
 File uses magic numbers to determine a file type. These magic numbers come with
@@ -26,9 +27,11 @@ compile this file, because it's faster, fixes that annoying warning and is how
 it was meant to be:
 </para>
 
-<blockquote><literallayout>
-        <userinput>file -C</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>file -C</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter06/fileutils-inst.xml

@@ -5,13 +5,14 @@
 Install Fileutils by running the following commands:
 </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>
 

chapter06/findutils-inst.xml

@@ -9,12 +9,14 @@ Before Findutils is installed the findutils patch file has to be unpacked.
 Install Findutils by running the following commands:
 </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>
 

chapter06/flex-inst.xml

@@ -5,13 +5,15 @@
 Install Flex by running the following commands:
 </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>
 

chapter06/gcc-inst.xml

@@ -15,17 +15,17 @@ Note: the build of other compilers is not tested by the people
 who actively work on LFS.
 </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>
 

chapter06/gettext-inst.xml

@@ -5,11 +5,13 @@
 Install Gettext by running the following commands:
 </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>
 

chapter06/glibc-inst.xml

@@ -10,34 +10,28 @@ Unpack the glibc-linuxthreads in the glibc-&glibc-version; directory, not in
 Install Glibc by running the following commands:
 </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>
 During the configure stage you will see the following warning:
@@ -69,10 +63,12 @@ to ensure a properly working bash.
 Run the following commands to accomplish this:
 </para>
 
-<blockquote><literallayout>
-	<userinput>logout</userinput>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>logout</userinput>
+&c6-chrootcmd;
+</screen>
+</para>
 
 </sect2>
 

chapter06/grep-inst.xml

@@ -5,11 +5,13 @@
 Install Grep by running the following commands:
 </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>
 

chapter06/groff-inst.xml

@@ -5,12 +5,13 @@
 Install Groff by running the following commands:
 </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>
 

chapter06/gzip-inst.xml

@@ -5,19 +5,21 @@
 Install Gzip by running the following commands:
 </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>
 

chapter06/kbd-inst.xml

@@ -5,13 +5,14 @@
 Install Kbd by running the following commands:
 </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>
 Now we have to choose a default keymap. Explore the
@@ -19,10 +20,12 @@ Now we have to choose a default keymap. Explore the
 as a default. Then execute this command:
 </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>
 Replace <userinput>&lt;path-to-keymap&gt;</userinput> with the path to the

chapter06/less-inst.xml

@@ -5,11 +5,13 @@
 Install Less by running the following commands:
 </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>
 

chapter06/libtool-inst.xml

@@ -5,11 +5,13 @@
 Install Libtool by running the following commands:
 </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>
 

chapter06/lilo-inst.xml

@@ -13,10 +13,12 @@ http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt</ulink>,
 Install Lilo by running the following commands:
 </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>
 It appears that compilation of this package fails on certain machines

chapter06/m4-inst.xml

@@ -5,11 +5,13 @@
 Install M4 by running the following commands:
 </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>
 If the base system is running a 2.0 kernel and the Glibc version is
@@ -29,13 +31,15 @@ To create a statically linked version of M4, execute the following
 commands:
 </para>
 
-<blockquote><literallayout>
+<para>
+<screen>
 <userinput>logout</userinput>
 <userinput>cd $LFS/usr/src/m4-1.4</userinput>
 <userinput>./configure --prefix=/usr</userinput>
 <userinput>make LDFLAGS=-static</userinput>
 <userinput>make prefix=$LFS/usr install</userinput>
-</literallayout></blockquote>
+</screen>
+</para>
 
 <para>
 Now the chroot'ed environment can be re-entered and the
@@ -44,9 +48,11 @@ this can be done
 after having rebooted into the LFS system rather than chrooting into it.
 </para>
 
-<blockquote><literallayout>
-	&c6-chrootcmd;
-</literallayout></blockquote>
+<para>
+<screen>
+&c6-chrootcmd;
+</screen>
+</para>
 
 </sect2>
 

chapter06/make-inst.xml

@@ -5,11 +5,13 @@
 Install Make by running the following commands:
 </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>
 

chapter06/makedev-inst.xml

@@ -10,13 +10,14 @@ won't create a directory for you to cd into.
 Create the device files by running the following commands:
 </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>
 MAKEDEV will create hda[1-20] and hdb[1-20] and such but keep in mind

chapter06/man-inst.xml

@@ -5,13 +5,14 @@
 Before Man is installed, the man patch file needs to be unpacked.
 </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>
 You may want to take a look at the man hint at <ulink

chapter06/manpages-inst.xml

@@ -5,11 +5,12 @@
 Install Man-pages by running the following command:
 </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>
 

chapter06/mawk-inst.xml

@@ -5,15 +5,16 @@
 Install Mawk by running the following commands:
 </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>
 

chapter06/modutils-inst.xml

@@ -11,11 +11,13 @@ downgrade to modutils 2.4.5 which seems to be working better.
 Install Modutils by running the following commands:
 </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>
 

chapter06/ncurses-inst.xml

@@ -5,15 +5,15 @@
 Install Ncurses by running the following commands:
 </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>
 

chapter06/netkitbase-inst.xml

@@ -5,14 +5,15 @@
 Install Netkit-base by running the following commands:
 </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>
 There are other files in the <filename

chapter06/nettools-inst.xml

@@ -5,10 +5,12 @@
 Install Net-tools by running the following commands:
 </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>
 

chapter06/patch-inst.xml

@@ -5,11 +5,13 @@
 Install Patch by running the following commands:
 </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>
 

chapter06/perl-inst.xml

@@ -5,11 +5,13 @@
 Install Perl by running the following commands:
 </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>
 If you don't want to answer all those questions Perl asks, you can
@@ -19,11 +21,13 @@ after the config.sh file has been created you can pass the -e parameter
 to perl as well. The commands with these parameters included will be:
 </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>
 

chapter06/procinfo-inst.xml

@@ -5,11 +5,12 @@
 Install Procinfo by running the following commands:
 </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>
 

chapter06/procps-inst.xml

@@ -5,12 +5,13 @@
 Install Procps by running the following commands:
 </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>
 

chapter06/psmisc-inst.xml

@@ -5,11 +5,13 @@
 Install Psmisc by running the following commands:
 </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>
 

chapter06/removeoldnss.xml

@@ -7,9 +7,11 @@ LFS system (because the normal system runs glibc-2.0) it's time to remove
 them now by running:
 </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>
 

chapter06/sed-inst.xml

@@ -5,11 +5,13 @@
 Install Sed by running the following commands:
 </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>
 

chapter06/shadowpwd-inst.xml

@@ -5,16 +5,17 @@
 Install the Shadow Password Suite by running the following commands:
 </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>
 

chapter06/shellutils-inst.xml

@@ -5,14 +5,16 @@
 Install Shellutils by running the following commands:
 </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>
 
@@ -28,9 +30,11 @@ the bash interpreter, but the FHS dictates that there should be a
 <filename>/usr/bin</filename> directory:
 </para>
 
-<blockquote><literallayout>
-	<userinput>ln -s test [</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>ln -s test [</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter06/sysklogd-inst.xml

@@ -5,10 +5,12 @@
 Install Sysklogd by running the following commands:
 </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>
 

chapter06/sysvinit-inst.xml

@@ -17,18 +17,22 @@ processes started by init the TERM signal".
 Apply the patch by running the following command:
 </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>
 Install Sysvinit by running the following commands:
 </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>
 

chapter06/tar-inst.xml

@@ -13,24 +13,27 @@ for gzip files).
 Apply the patch by running the following command:
 </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>
 Install Tar by running the following commands from the toplevel
 directory:
 </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>
 

chapter06/texinfo-inst.xml

@@ -5,14 +5,15 @@
 Install Texinfo by running the following commands:
 </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>
 

chapter06/textutils-inst.xml

@@ -5,12 +5,14 @@
 Install Textutils by running the following commands:
 </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>
 

chapter06/utillinux-inst.xml

@@ -7,14 +7,15 @@ file, instead of the usual /etc. To make hwclock, which is part of the
 util-linux package, FHS-compliant, run the following.
 </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>
 
 <sect2>
@@ -24,15 +25,16 @@ util-linux package, FHS-compliant, run the following.
 Install Util-Linux by running the following commands:
 </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>
 

chapter06/vim-inst.xml

@@ -18,13 +18,15 @@ won't overwrite any files from the other package. So it doesn't matter
 in which order it is done. Install Vim by running the following commands:
 </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>
 If you plan on installing the X Window system on your LFS
@@ -46,14 +48,16 @@ conform to the FHS, you should use this command set instead of the one presented
 above:
 </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>
 

chapter07/checkfs.xml

@@ -6,7 +6,8 @@ A new file <filename>/etc/init.d/checkfs</filename> is created containing
 the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; checkfs &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/checkfs
@@ -108,7 +109,8 @@ fi
 
 # End /etc/init.d/checkfs
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/createdirs.xml

@@ -6,12 +6,13 @@ We need to start by creating a few extra directories that are used by
 the boot scripts. These directories are created by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>cd /etc &amp;&amp;</userinput>
-	<userinput>mkdir rc{0,1,2,3,4,5,6,S}.d init.d sysconfig
-		&amp;&amp;</userinput>
-	<userinput>cd init.d</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd /etc &amp;&amp;</userinput>
+<userinput>mkdir rc{0,1,2,3,4,5,6,S}.d init.d sysconfig	&amp;&amp;</userinput>
+<userinput>cd init.d</userinput>
+</screen>
+</para>
 
 </sect1>
 

chapter07/ethnet.xml

@@ -11,7 +11,8 @@ A new file <filename>/etc/init.d/ethnet</filename> is created containing the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/init.d/ethnet &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/ethnet
@@ -114,7 +115,8 @@ esac
 
 # End /etc/init.d/ethnet
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <sect2>
 <title>Adding default gateway to /etc/sysconfig/network</title>
@@ -123,12 +125,14 @@ esac
 If a default gateway is required to be setup, the following command does that:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt;&gt; /etc/sysconfig/network &lt;&lt; "EOF"</userinput>
 GATEWAY=192.168.1.2
 GATEWAY_IF=eth0
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 GATEWAY and GATEWAY_IF need to be changed to match the network setup.
@@ -153,9 +157,11 @@ identification number (or whatever a user named it).
 First the nic-config directory is created by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>mkdir /etc/sysconfig/nic-config</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mkdir /etc/sysconfig/nic-config</userinput>
+</screen>
+</para>
 
 <para>
 
@@ -163,16 +169,17 @@ Now, new files are created in that directory containing the following.
 This creates a sample file ifcfg-eth0:
 </para>
 
-<literallayout>
-<userinput>cat &gt; /etc/sysconfig/nic-config/ifcfg-eth0
-	&lt;&lt; "EOF"</userinput>
+<para>
+<screen>
+<userinput>cat &gt; /etc/sysconfig/nic-config/ifcfg-eth0 &lt;&lt; "EOF"</userinput>
 ONBOOT=yes
 DEVICE=eth0
 IP=192.168.1.1
 NETMASK=255.255.255.0
 BROADCAST=192.168.1.255
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 Of course, the values of those four variables have to be changed 

chapter07/functions.xml

@@ -6,7 +6,8 @@ A new file <filename>/etc/init.d/functions</filename> is created containing
 the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; functions &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/functions
@@ -484,7 +485,8 @@ statusproc()
 
 # End /etc/init.d/functions
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/halt.xml

@@ -6,7 +6,8 @@ A new file <filename>/etc/init.d/halt</filename> is created containing the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; halt &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/halt
@@ -19,7 +20,8 @@ following:
 
 # End /etc/init.d/halt
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/hosts.xml

@@ -7,21 +7,25 @@ IP-address, FQDN and possible aliases for use in the /etc/hosts file. An
 example is:
 </para>
 
-<blockquote><literallayout>
-	&lt;my-IP&gt; myhost.mydomain.org aliases
-</literallayout></blockquote>
+<para>
+<screen>
+&lt;my-IP&gt; myhost.mydomain.org aliases
+</screen>
+</para>
 
 <para>
 It should made sure that the IP-address is in the private network
 IP-address range. Valid ranges are:
 </para>
 
-<blockquote><literallayout>
+<para>
+<screen>
 	Class Networks
 	A     10.0.0.0
 	B     172.16.0.0 through 172.31.0.0
 	C     192.168.0.0 through 192.168.255.0
-</literallayout></blockquote>
+</screen>
+</para>
 
 <para>
 A valid IP address could be 192.168.1.1. A valid FQDN for this IP could
@@ -39,7 +43,8 @@ If a network card is not going to be configured, a new file
 <filename>/etc/hosts</filename> is created by running:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"</userinput>
 # Begin /etc/hosts (no network card version)
 
@@ -47,14 +52,16 @@ If a network card is not going to be configured, a new file
 
 # End /etc/hosts (no network card version)
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 If a network card is to be configured, a new file
 <filename>/etc/hosts</filename> is created containing:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"</userinput>
 # Begin /etc/hosts (network card version)
 
@@ -63,7 +70,8 @@ If a network card is to be configured, a new file
 
 # End /etc/hosts (network card version)
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 Of course, the 192.168.1.1 and www.mydomain.org have to be changed to the 

chapter07/loadkeys.xml

@@ -8,7 +8,8 @@ US keyboard layout. A new file
 created:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; loadkeys &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/loadkeys
@@ -29,7 +30,8 @@ evaluate_retval
 
 # End /etc/init.d/loadkeys
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/localnet.xml

@@ -6,7 +6,8 @@ A new file <filename>/etc/init.d/localnet</filename> is created containing
 the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/init.d/localnet &lt;&lt; "EOF"</userinput>
 #!/bin/sh 
 # Begin /etc/init.d/localnet
@@ -49,7 +50,8 @@ esac
 
 # End /etc/init.d/localnet
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/mountfs.xml

@@ -6,7 +6,8 @@ A new file <filename>/etc/init.d/mountfs</filename> is created containing
 the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; mountfs &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/mountfs
@@ -102,7 +103,8 @@ esac
 
 # End /etc/init.d/mountfs
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/network.xml

@@ -6,9 +6,11 @@ A new file <filename>/etc/sysconfig/network</filename> is created and the
 hostname is put in it by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>echo "HOSTNAME=lfs" &gt; /etc/sysconfig/network</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>echo "HOSTNAME=lfs" &gt; /etc/sysconfig/network</userinput>
+</screen>
+</para>
 
 <para>
 <quote>lfs</quote> needs to be replaced by the name the computer is to be 

chapter07/rc.xml

@@ -6,7 +6,8 @@ The first main boot script is the <filename>/etc/init.d/rc</filename> script.
 A new file <filename>/etc/init.d/rc</filename> is created containing the
 following: </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; rc &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/rc
@@ -245,7 +246,8 @@ fi
 
 # End /etc/init.d/rc
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/rcS.xml

@@ -6,7 +6,8 @@ The second main boot script is the <filename>rcS</filename> script. Create a
 new file <filename>/etc/init.d/rcS</filename> containing the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; rcS &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/rcS
@@ -35,7 +36,8 @@ done
 
 # End /etc/init.d/rcS
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/reboot.xml

@@ -6,7 +6,8 @@ Create a new file <filename>/etc/init.d/reboot</filename> containing the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; reboot &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/reboot
@@ -22,7 +23,8 @@ echo "System reboot in progress..."
 
 # End /etc/init.d/reboot
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/sendsignals.xml

@@ -6,7 +6,8 @@ Create a new file <filename>/etc/init.d/sendsignals</filename>
 containing the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; sendsignals &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/sendsignals
@@ -36,7 +37,8 @@ evaluate_retval
 
 # End /etc/init.d/sendsignals
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/setclock.xml

@@ -20,7 +20,8 @@ hardware clock is set to GMT, then the UTC variable below has to be changed
 value of <emphasis>1</emphasis>.
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; setclock &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/setclock
@@ -61,7 +62,8 @@ evaluate_retval
 
 # End /etc/init.d/setclock
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <sect2>
 <title>Creating the /etc/sysconfig/clock file</title>
@@ -71,7 +73,8 @@ Create a new file <filename>/etc/sysconfig/clock</filename> by running
 the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/sysconfig/clock &lt;&lt; "EOF"</userinput>
 # Begin /etc/sysconfig/clock
 
@@ -79,7 +82,8 @@ UTC=1
 
 # End /etc/sysconfig/clock
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 If the hardware clock (also known as BIOS or CMOS clock) is not set to

chapter07/symperm.xml

@@ -17,49 +17,47 @@ S20mydaemon, but S020mydaemon. And don't use K2otherdaemon, but
 K002otherdaemon.
 </para>
 
-<blockquote><literallayout>
-	<userinput>cd /etc/init.d &amp;&amp;</userinput>
-	<userinput>chmod 754 rc rcS functions checkfs halt loadkeys mountfs 
-		reboot &amp;&amp;</userinput>
-	<userinput>chmod 754 sendsignals setclock sysklogd template 
-		&amp;&amp;</userinput>
-	<userinput>chmod 754 localnet ethnet &amp;&amp;</userinput>
-	<userinput>cd ../rc0.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sendsignals S800sendsignals &amp;&amp;
-		</userinput>
-	<userinput>ln -s ../init.d/mountfs S900mountfs &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/halt S999halt &amp;&amp;</userinput>
-	<userinput>cd ../rc6.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sendsignals S800sendsignals &amp;&amp;
-		</userinput>
-	<userinput>ln -s ../init.d/mountfs S900mountfs &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/reboot S999reboot &amp;&amp;</userinput>
-	<userinput>cd ../rcS.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/localnet S100localnet &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/checkfs S200checkfs &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/mountfs S300mountfs &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/setclock S400setclock &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/loadkeys S500loadkeys &amp;&amp;</userinput>
-	<userinput>cd ../rc1.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
-	<userinput>cd ../rc2.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
-	<userinput>cd ../rc3.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
-	<userinput>cd ../rc4.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
-	<userinput>cd ../rc5.d &amp;&amp;</userinput>
-	<userinput>ln -s ../init.d/sysklogd S100sysklogd</userinput>
-	<userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd /etc/init.d &amp;&amp;</userinput>
+<userinput>chmod 754 rc rcS functions checkfs halt loadkeys mountfs reboot &amp;&amp;</userinput>
+<userinput>chmod 754 sendsignals setclock sysklogd template &amp;&amp;</userinput>
+<userinput>chmod 754 localnet ethnet &amp;&amp;</userinput>
+<userinput>cd ../rc0.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sendsignals S800sendsignals &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/mountfs S900mountfs &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/halt S999halt &amp;&amp;</userinput>
+<userinput>cd ../rc6.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sendsignals S800sendsignals &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/mountfs S900mountfs &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/reboot S999reboot &amp;&amp;</userinput>
+<userinput>cd ../rcS.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/localnet S100localnet &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/checkfs S200checkfs &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/mountfs S300mountfs &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/setclock S400setclock &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/loadkeys S500loadkeys &amp;&amp;</userinput>
+<userinput>cd ../rc1.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
+<userinput>cd ../rc2.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
+<userinput>cd ../rc3.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
+<userinput>cd ../rc4.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
+<userinput>cd ../rc5.d &amp;&amp;</userinput>
+<userinput>ln -s ../init.d/sysklogd S100sysklogd</userinput>
+<userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
+</screen>
+</para>
 
 </sect1>
 

chapter07/sysklogd.xml

@@ -6,7 +6,8 @@ A new file <filename>/etc/init.d/sysklogd</filename> is created containing
 the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; sysklogd &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/sysklogd
@@ -59,7 +60,8 @@ esac
 
 # End /etc/init.d/sysklogd
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter07/template.xml

@@ -6,7 +6,8 @@ A new file <filename>/etc/init.d/template</filename> is created containing
 the following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; template &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin /etc/init.d/
@@ -52,7 +53,8 @@ esac
 
 # End /etc/init.d/
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter08/fstab.xml

@@ -8,7 +8,8 @@ used. A new file <filename>/etc/fstab</filename> is created containing the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"</userinput>
 # Begin /etc/fstab
 
@@ -18,7 +19,8 @@ proc /proc proc defaults 0 0
 
 # End /etc/fstab
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 <para>
 &lt;LFS-partition designation&gt;, &lt;swap-partition

chapter08/kernel.xml

@@ -9,18 +9,19 @@ with the kernel source tree, and find out what the options are. The
 following commands are run to build the kernel:
 </para>
 
-<blockquote><literallayout>
-	<userinput>cd /usr/src/linux &amp;&amp;</userinput>
-	<userinput>make mrproper &amp;&amp;</userinput>
-	<userinput>make menuconfig &amp;&amp;</userinput>
-	<userinput>make dep &amp;&amp;</userinput>
-	<userinput>make bzImage &amp;&amp;</userinput>
-	<userinput>make modules &amp;&amp;</userinput>
-	<userinput>make modules_install &amp;&amp;</userinput>
-	<userinput>cp arch/i386/boot/bzImage /boot/lfskernel &amp;&amp;
-		</userinput>
-	<userinput>cp System.map /boot</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd /usr/src/linux &amp;&amp;</userinput>
+<userinput>make mrproper &amp;&amp;</userinput>
+<userinput>make menuconfig &amp;&amp;</userinput>
+<userinput>make dep &amp;&amp;</userinput>
+<userinput>make bzImage &amp;&amp;</userinput>
+<userinput>make modules &amp;&amp;</userinput>
+<userinput>make modules_install &amp;&amp;</userinput>
+<userinput>cp arch/i386/boot/bzImage /boot/lfskernel &amp;&amp;</userinput>
+<userinput>cp System.map /boot</userinput>
+</screen>
+</para>
 
 <para>
 Note: the arch/i386/boot/bzImage path may vary on different platforms.

chapter08/lilo.xml

@@ -18,24 +18,28 @@ the host system or the LFS system).
 First we'll exit chroot and copy the lfskernel file to the host system:
 </para>
 
-<blockquote><literallayout>
-	<userinput>logout</userinput>
-	<userinput>cp $LFS/boot/lfskernel /boot</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>logout</userinput>
+<userinput>cp $LFS/boot/lfskernel /boot</userinput>
+</screen>
+</para>
 
 <para>
 The next step is adding an entry to /etc/lilo.conf so that we can
 choose LFS when booting the computer:
 </para>
 
-<literallayout>
-	<userinput>cat &gt;&gt; /etc/lilo.conf &lt;&lt; "EOF"</userinput>
-	image=/boot/lfskernel
-	        label=lfs
-	        root=&lt;partition&gt;
-	        read-only
-	<userinput>EOF</userinput>
-</literallayout>
+<para>
+<screen>
+<userinput>cat &gt;&gt; /etc/lilo.conf &lt;&lt; "EOF"</userinput>
+image=/boot/lfskernel
+        label=lfs
+        root=&lt;partition&gt;
+        read-only
+<userinput>EOF</userinput>
+</screen>
+</para>
 
 <para>
 &lt;partition&gt; must be replaced by the LFS partition's designation.
@@ -45,19 +49,23 @@ choose LFS when booting the computer:
 Now the boot loader gets updated by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>/sbin/lilo</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>/sbin/lilo</userinput>
+</screen>
+</para>
 
 <para>
 The last step is syncing the host system lilo config. files with the
 LFS system:
 </para>
 
-<blockquote><literallayout>
-	<userinput>cp /etc/lilo.conf $LFS/etc &amp;&amp;</userinput>
-	<userinput>cp &lt;kernel images&gt; $LFS/boot</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cp /etc/lilo.conf $LFS/etc &amp;&amp;</userinput>
+<userinput>cp &lt;kernel images&gt; $LFS/boot</userinput>
+</screen>
+</para>
 
 <para>
 To find out which kernel images files are being used, look at the

chapter08/reboot.xml

@@ -7,18 +7,22 @@ it's time to reboot the computer. Before we reboot let's exit the
 chroot'ed environment first and unmount the LFS partition by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>umount $LFS/proc &amp;&amp;</userinput>
-	<userinput>umount $LFS</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>umount $LFS/proc &amp;&amp;</userinput>
+<userinput>umount $LFS</userinput>
+</screen>
+</para>
 
 <para>
 And you can reboot your system by running something like:
 </para>
 
-<blockquote><literallayout>
-	<userinput>/sbin/shutdown -r now</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>/sbin/shutdown -r now</userinput>
+</screen>
+</para>
 
 <para>
 At the LILO: prompt make sure that you tell it to boot 

chapter09/theend.xml

@@ -37,10 +37,11 @@ is to not run strip on libraries (other than --strip-debug) just to be
 on the safe side.
 </para>
 
-<blockquote><literallayout>
-	<userinput>find / -type f -exec strip --strip-debug '{}' ';'
-	</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>find / -type f -exec strip --strip-debug '{}' ';'</userinput>
+</screen>
+</para>
 
 <para>
 If you plan to ever upgrade to a newer LFS version in the future it
@@ -51,9 +52,11 @@ you have installed on your system. This can just be a null-byte file by
 running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>touch /etc/lfs-&version;</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>touch /etc/lfs-&version;</userinput>
+</screen>
+</para>
 
 <para>
 One final thing you may want to do is run lilo now that you are booted
@@ -68,9 +71,11 @@ Either way, run the following to make the lilo version installed on LFS
 active:
 </para>
 
-<blockquote><literallayout>
-	<userinput>/sbin/lilo</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>/sbin/lilo</userinput>
+</screen>
+</para>
 
 <para>
 If you are wondering: "Well, where to go now?" you'll be glad to hear that