Removed indentation from commands (from <blockquote><literallayout> to

<para><screen>


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

chapter02/install.xml

@@ -13,9 +13,11 @@ section.
 To start with, change to the $LFS/usr/src directory by running:
 </para>
 
-<blockquote><literallayout>
-        <userinput>cd $LFS/usr/src</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd $LFS/usr/src</userinput>
+</screen>
+</para>
 
 <para>
 If a file is tar'ed and gzip'ed, it is unpacked by
@@ -23,10 +25,12 @@ running either one of the following two commands, depending on the
 filename:
 </para>
 
-<blockquote><literallayout>
-        <userinput>tar xvzf filename.tar.gz</userinput>
-        <userinput>tar xvzf filename.tgz</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>tar xvzf filename.tar.gz</userinput>
+<userinput>tar xvzf filename.tgz</userinput>
+</screen>
+</para>
 
 
 <para>
@@ -34,9 +38,11 @@ If a file is tar'ed and bzip2'ed, it is unpacked by
 running:
 </para>
 
-<blockquote><literallayout>
-        <userinput>bzcat filename.tar.bz2 | tar xv</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>bzcat filename.tar.bz2 | tar xv</userinput>
+</screen>
+</para>
 
 <para>
 Some tar programs (most of them nowadays but not all of them) are
@@ -50,9 +56,11 @@ your host system decided to patch bzip2.
 If a file is just tar'ed, it is unpacked by running:
 </para>
 
-<blockquote><literallayout>
-        <userinput>tar xvf filename.tar</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>tar xvf filename.tar</userinput>
+</screen>
+</para>
 
 <para>
 When an archive is unpacked, a new directory will be created under the
@@ -73,17 +81,21 @@ can be used they need to be uncompressed first.
 If a file is gzip'ed, it is unpacked by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>gunzip filename.gz</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>gunzip filename.gz</userinput>
+</screen>
+</para>
 
 <para>
 If a file is bzip2'ed, it is unpacked by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>bunzip2 filename.bz2</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>bunzip2 filename.bz2</userinput>
+</screen>
+</para>
 
 <para>
 After a package has been installed, two things can be done with it:

chapter03/creatingdirs.xml

@@ -8,33 +8,30 @@ url="http://www.pathname.com/fhs/">http://www.pathname.com/fhs/</ulink>.
 Issuing the following commands will create a default directory layout:
 </para>
  
-<blockquote><literallayout>
-	<userinput>cd $LFS</userinput>
-	<userinput>mkdir -p bin boot dev/pts etc/opt home lib mnt proc
-		root sbin tmp var opt</userinput>
-	<userinput>for dirname in $LFS/usr $LFS/usr/local</userinput>
-	<userinput><literal>&nbsp;&nbsp;&nbsp;do</literal></userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;mkdir $dirname</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;cd $dirname</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;mkdir bin etc include lib sbin share 
-		src var</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;ln -s share/man man</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;ln -s share/doc doc</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;ln -s share/info info</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;cd $dirname/share</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;mkdir dict doc info locale man nls misc 
-		terminfo zoneinfo</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;cd $dirname/share/man</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;mkdir man{1,2,3,4,5,6,7,8}</userinput>
-	<userinput>done</userinput>
-	<userinput>cd $LFS/var</userinput>
-	<userinput>mkdir -p lock log mail run spool tmp opt cache lib/misc 
-		local</userinput>
-	<userinput>cd $LFS/opt</userinput>
-	<userinput>mkdir bin doc include info lib man</userinput>
-	<userinput>cd $LFS/usr</userinput>
-	<userinput>ln -s ../var/tmp tmp</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd $LFS</userinput>
+<userinput>mkdir -p bin boot dev/pts etc/opt home lib mnt proc root sbin tmp var opt</userinput>
+<userinput>for dirname in $LFS/usr $LFS/usr/local</userinput>
+<userinput><literal>&nbsp;&nbsp;&nbsp;do</literal></userinput>
+<userinput>&nbsp;&nbsp;&nbsp;mkdir $dirname</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;cd $dirname</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;mkdir bin etc include lib sbin share src var</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;ln -s share/man man</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;ln -s share/doc doc</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;ln -s share/info info</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;cd $dirname/share</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;mkdir dict doc info locale man nls misc terminfo zoneinfo</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;cd $dirname/share/man</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;mkdir man{1,2,3,4,5,6,7,8}</userinput>
+<userinput>done</userinput>
+<userinput>cd $LFS/var</userinput>
+<userinput>mkdir -p lock log mail run spool tmp opt cache lib/misc local</userinput>
+<userinput>cd $LFS/opt</userinput>
+<userinput>mkdir bin doc include info lib man</userinput>
+<userinput>cd $LFS/usr</userinput>
+<userinput>ln -s ../var/tmp tmp</userinput>
+</screen></para>
 
 <para>
 Normally, directories are created with permission mode 755, which isn't
@@ -47,11 +44,13 @@ directory but cannot remove another user's files (the latter is caused
 by the so-called "sticky bit" - bit 1 of the 1777 bit mask).
 </para>
 
-<blockquote><literallayout>
-	<userinput>cd $LFS &amp;&amp;</userinput>
-	<userinput>chmod 0750 root &amp;&amp;</userinput>
-	<userinput>chmod 1777 tmp var/tmp</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cd $LFS &amp;&amp;</userinput>
+<userinput>chmod 0750 root &amp;&amp;</userinput>
+<userinput>chmod 1777 tmp var/tmp</userinput>
+</screen>
+</para>
 
 <para>
 Now that the directories are created, copy the source files that were

chapter03/creatingfs.xml

@@ -15,9 +15,11 @@ To create an ext2 file system, use the mke2fs command. The LFS partition
 is used as the only option to the command and the file system is created.
 </para>
 
-<blockquote><literallayout>
-	<userinput>mke2fs /dev/xxx</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mke2fs /dev/xxx</userinput>
+</screen>
+</para>
 
 <para>
 Replace "xxx" by the partition's designation (like hda11).

chapter03/mounting.xml

@@ -14,17 +14,21 @@ directory is chosen, just make sure you remember what you chose.
 Create the /mnt/lfs directory by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>mkdir -p /mnt/lfs</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mkdir -p /mnt/lfs</userinput>
+</screen>
+</para>
 
 <para>
 Now mount the LFS partition by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>mount /dev/xxx /mnt/lfs</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mount /dev/xxx /mnt/lfs</userinput>
+</screen>
+</para>
 
 <para>
 Replace <quote>xxx</quote> by the partition's designation (like hda11).

chapter05/bash-inst.xml

@@ -5,16 +5,16 @@
 Install Bash by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --enable-static-link --prefix=$LFS/usr
-		\</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin 
-		--with-curses &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd $LFS/bin &amp;&amp;</userinput>
-	<userinput>ln -s bash sh</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin --with-curses &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd $LFS/bin &amp;&amp;</userinput>
+<userinput>ln -s bash sh</userinput>
+</screen>
+</para>
 
 <para>
 If the make install phase ends with something along the lines of

chapter05/binutils-inst.xml

@@ -5,13 +5,13 @@
 Install Binutils by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=$LFS/usr --disable-nls
-		 &amp;&amp;</userinput>
-	<userinput>make -e LDFLAGS=-all-static tooldir=$LFS/usr
-		 &amp;&amp;</userinput>
-	<userinput>make -e tooldir=$LFS/usr install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>make -e LDFLAGS=-all-static tooldir=$LFS/usr &amp;&amp;</userinput>
+<userinput>make -e tooldir=$LFS/usr install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/bzip2-inst.xml

@@ -5,16 +5,18 @@
 Install Bzip2 by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>sed \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) 
-		\$(LDFLAGS) -o"/ \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;Makefile | make -f -
-		LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make PREFIX=$LFS/usr install &amp;&amp;</userinput>
-	<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-	<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>sed \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) 
+\$(LDFLAGS) -o"/ \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;Makefile | make -f -
+LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make PREFIX=$LFS/usr install &amp;&amp;</userinput>
+<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
+<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/diffutils-inst.xml

@@ -5,14 +5,15 @@
 Install Diffutils by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-	<userinput>unset CPPFLAGS &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
+<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
+<userinput>unset CPPFLAGS &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/fileutils-inst.xml

@@ -5,15 +5,16 @@
 Install Fileutils by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --disable-nls \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --libexecdir=$LFS/bin 
-		--bindir=$LFS/bin &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-	<userinput>ln -s ../../bin/install</userinput>
-</literallayout></blockquote>
+<para><screen>
+<userinput>./configure --disable-nls \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --libexecdir=$LFS/bin 
+--bindir=$LFS/bin &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
+<userinput>ln -s ../../bin/install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/gcc-inst.xml

@@ -5,25 +5,23 @@
 Install GCC by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>mkdir $LFS/usr/src/gcc-build &amp;&amp;</userinput>
-	<userinput>cd $LFS/usr/src/gcc-build &amp;&amp;</userinput>
-	<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --disable-nls
-		 \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--disable-shared
-		&amp;&amp;</userinput>
-	<userinput>make -e LDFLAGS=-static bootstrap &amp;&amp;</userinput>
-	<userinput>make prefix=$LFS/usr install &amp;&amp;</userinput>
-	<userinput>cd $LFS/lib &amp;&amp;</userinput>
-	<userinput>ln -s ../usr/bin/cpp
-		 &amp;&amp;</userinput>
-	<userinput>cd $LFS/usr/lib &amp;&amp;</userinput>
-	<userinput>ln -s ../bin/cpp
-		 &amp;&amp;</userinput>
-	<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-	<userinput>ln -s gcc cc</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mkdir $LFS/usr/src/gcc-build &amp;&amp;</userinput>
+<userinput>cd $LFS/usr/src/gcc-build &amp;&amp;</userinput>
+<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --disable-nls \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--disable-shared &amp;&amp;</userinput>
+<userinput>make -e LDFLAGS=-static bootstrap &amp;&amp;</userinput>
+<userinput>make prefix=$LFS/usr install &amp;&amp;</userinput>
+<userinput>cd $LFS/lib &amp;&amp;</userinput>
+<userinput>ln -s ../usr/bin/cpp &amp;&amp;</userinput>
+<userinput>cd $LFS/usr/lib &amp;&amp;</userinput>
+<userinput>ln -s ../bin/cpp &amp;&amp;</userinput>
+<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
+<userinput>ln -s gcc cc</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/grep-inst.xml

@@ -5,15 +5,15 @@
 Install Grep by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=$LFS/usr --disable-nls
-		 &amp;&amp;</userinput>
-	<userinput>unset CPPFLAGS &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
+<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>unset CPPFLAGS &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/gzip-inst.xml

@@ -5,16 +5,16 @@
 Before Gzip is installed, the gzip patch file needs to be unpacked.
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../gzip-&gzip-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip 
-		 $LFS/bin &amp;&amp;</userinput>
-	<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../gzip-&gzip-version;.patch &amp;&amp;</userinput>
+<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &amp;&amp;</userinput>
+<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/introduction.xml

@@ -40,9 +40,11 @@ Before we start, make sure the LFS environment variable is setup
 properly if you decided to make use of it. Run the following:
 </para>
 
-<blockquote><literallayout>
-	<userinput>echo $LFS</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>echo $LFS</userinput>
+</screen>
+</para>
 
 <para>
 Check to make sure the output contains the correct directory to the LFS

chapter05/kernel-inst.xml

@@ -13,21 +13,20 @@ compile the packages that need the kernel.
 The kernel configuration file is created by running the following command:
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../linux-&kernel-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>make mrproper &amp;&amp;</userinput>
-	<userinput>yes "" | make config &amp;&amp;</userinput>
-	<userinput>make dep &amp;&amp;</userinput>
-	<userinput>cd $LFS/usr/include &amp;&amp;</userinput>
-	<userinput>cp -a ../src/linux/include/linux . &amp;&amp;</userinput>
-	<userinput>chown root.root $LFS/usr/include/linux -R
-		&amp;&amp;</userinput>
-	<userinput>mkdir asm &amp;&amp;</userinput>
-	<userinput>cp -a ../src/linux/include/asm/* asm &amp;&amp;</userinput>
-	<userinput>chown root.root $LFS/usr/include/asm -R</userinput>
-
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../linux-&kernel-version;.patch &amp;&amp;</userinput>
+<userinput>make mrproper &amp;&amp;</userinput>
+<userinput>yes "" | make config &amp;&amp;</userinput>
+<userinput>make dep &amp;&amp;</userinput>
+<userinput>cd $LFS/usr/include &amp;&amp;</userinput>
+<userinput>cp -a ../src/linux/include/linux . &amp;&amp;</userinput>
+<userinput>chown root.root $LFS/usr/include/linux -R &amp;&amp;</userinput>
+<userinput>mkdir asm &amp;&amp;</userinput>
+<userinput>cp -a ../src/linux/include/asm/* asm &amp;&amp;</userinput>
+<userinput>chown root.root $LFS/usr/include/asm -R</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/make-inst.xml

@@ -5,12 +5,13 @@
 Install Make by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=$LFS/usr 
-		--disable-nls &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/mawk-inst.xml

@@ -5,17 +5,17 @@
 Install Mawk by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure &amp;&amp;</userinput>
-	<userinput>sed \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;s/"\$(CC) \$(CFLAGS) -o"/"\$(CC)
-\$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;Makefile | make 
-		-f - LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make BINDIR=$LFS/usr/bin \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;MANDIR=$LFS/usr/share/man/man1
-		install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure &amp;&amp;</userinput>
+<userinput>sed \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) 
+\$(LDFLAGS) -o"/ \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;Makefile | make -f - LDFLAGS=-static &amp;&amp; </userinput>
+<userinput>make BINDIR=$LFS/usr/bin \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;MANDIR=$LFS/usr/share/man/man1 install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/oldnsslib.xml

@@ -9,9 +9,11 @@ and groupid's. You can check which C library version your normal Linux system
 uses by simply executing the library, like this:
 </para>
 
-<blockquote><literallayout>
-	<userinput>/lib/libc.so.6</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>/lib/libc.so.6</userinput>
+</screen>
+</para>
 
 <para>
 The first line will give you the release version. Following lines contain
@@ -19,9 +21,11 @@ interesting information. If you have Glibc-2.0.x installed on your starting
 distribution, copy the NSS library files by running:
 </para>
 
-<blockquote><literallayout>
-	<userinput>cp -av /lib/libnss* $LFS/lib</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>cp -av /lib/libnss* $LFS/lib</userinput>
+</screen>
+</para>
 
 </sect1>
 

chapter05/patch-inst.xml

@@ -5,12 +5,13 @@
 Install Patch by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=$LFS/usr 
-		&amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/proc.xml

@@ -13,9 +13,11 @@ the kernel itself.
 The proc file system is mounted under $LFS/proc by running the following command:
 </para>
 
-<blockquote><literallayout>
-	<userinput>mount proc $LFS/proc -t proc</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>mount proc $LFS/proc -t proc</userinput>
+</screen>
+</para>
 
 </sect1>
 

chapter05/pwdgroup.xml

@@ -21,32 +21,36 @@ Create a new file <filename>$LFS/etc/passwd</filename> by running the
 following command:
 </para>
 
-<blockquote><literallayout>
-	<userinput>echo "root:x:0:0:root:/root:/bin/bash" &gt;
-		$LFS/etc/passwd</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>echo "root:x:0:0:root:/root:/bin/bash" &gt; $LFS/etc/passwd
+</userinput>
+</screen>
+</para>
 
 <para>
 Create a new file <filename>$LFS/etc/group</filename> by running the
 following:
 </para>
 
-<literallayout>
+<para>
+<screen>
 <userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
-	root:x:0:
-	bin:x:1:
-	sys:x:2:
-	kmem:x:3:
-	tty:x:4:
-	tape:x:5:
-	daemon:x:6:
-	floppy:x:7:
-	disk:x:8:
-	lp:x:9:
-	dialout:x:10:
-	audio:x:11:
+root:x:0:
+bin:x:1:
+sys:x:2:
+kmem:x:3:
+tty:x:4:
+tape:x:5:
+daemon:x:6:
+floppy:x:7:
+disk:x:8:
+lp:x:9:
+dialout:x:10:
+audio:x:11:
 <userinput>EOF</userinput>
-</literallayout>
+</screen>
+</para>
 
 </sect1>
 

chapter05/sed-inst.xml

@@ -5,15 +5,15 @@
 Install Sed by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=$LFS/usr 
-		--bindir=$LFS/bin &amp;&amp;</userinput>
-	<userinput>unset CPPFLAGS &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
+<userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
+<userinput>unset CPPFLAGS &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/shellutils-inst.xml

@@ -5,17 +5,17 @@
 Before Sh-utils is installed, the sh-utils patch file needs to be unpacked.
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=$LFS/usr 
-		--disable-nls &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-	<userinput>mv date echo false pwd stty $LFS/bin &amp;&amp;</userinput>
-	<userinput>mv su true uname hostname $LFS/bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch &amp;&amp;</userinput>
+<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
+<userinput>mv date echo false pwd stty $LFS/bin &amp;&amp;</userinput>
+<userinput>mv su true uname hostname $LFS/bin</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/tar-inst.xml

@@ -12,24 +12,25 @@ 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:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=$LFS/usr 
-		--disable-nls \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin
-		--bindir=$LFS/bin &amp;&amp; </userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin --bindir=$LFS/bin &amp;&amp; </userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen></para>
 
 </sect2>
 

chapter05/texinfo-inst.xml

@@ -5,14 +5,14 @@
 Install Texinfo by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=$LFS/usr 
-		--disable-nls &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &amp;&amp;</userinput>
+<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
 
 </sect2>
 

chapter05/textutils-inst.xml

@@ -5,13 +5,14 @@
 Install Textutils by running the following commands:
 </para>
 
-<blockquote><literallayout>
-	<userinput>./configure --prefix=$LFS/usr 
-		--disable-nls &amp;&amp;</userinput>
-	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput>
-</literallayout></blockquote>
+<para>
+<screen>
+<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput>
+</screen>
+</para>
 
 </sect2>