Index: BOOK/boot/common/whatnext.xml
===================================================================
--- BOOK/boot/common/whatnext.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/common/whatnext.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -23,8 +23,12 @@
   <table>
     <title>Boot Methods</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Method"/>
-      <colspec colname="Arch"/>
-      <colspec colname="Link"/>
+    <?dbfo table-width="6in" ?>
+
+    <tgroup cols="3">
+
+      <colspec colnum="1" colwidth="1in"   colname="Method"/>
+      <colspec colnum="2" colwidth="2.5in" colname="Arch"/>
+      <colspec colnum="3" colwidth="2.5in" colname="Link"/>
+
       <thead>
         <row>
@@ -34,4 +38,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -41,5 +46,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/boot/mips64/flags.xml
===================================================================
--- BOOK/boot/mips64/flags.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/mips64/flags.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -16,5 +16,6 @@
 echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
+    ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -43,6 +43,6 @@
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
---enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" --with-linker=${LD} \
---host=${CLFS_TARGET}</userinput></screen>
+    --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
+    --with-linker=${LD} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/ppc64/e2fsprogs.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -55,6 +55,7 @@
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
---enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" --with-linker=${LD} \
---build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
+    --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
+    --with-linker=${LD} --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc64/flags.xml
===================================================================
--- BOOK/boot/sparc64/flags.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/sparc64/flags.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -15,5 +15,6 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
+    ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/boot/x86_64/flags.xml
===================================================================
--- BOOK/boot/x86_64/flags.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/boot/x86_64/flags.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -15,5 +15,6 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
+    ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/bootable/ppc/yaboot.xml
===================================================================
--- BOOK/bootable/ppc/yaboot.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/bootable/ppc/yaboot.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -59,13 +59,13 @@
   way.  At least some of the distros specify a full OF path to the 'device' and
   to the image(s), such as
-  <filename class="devicefile">device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:
-  </filename> for the disk, and
-  <filename class="partition">image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;
-  </filename> which definitely works.</para>
+  <parameter>device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:</parameter>
+  for the disk, and
+  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;</parameter>
+  which definitely works.</para>
 
   <para os="k">Create a <quote>yaboot.conf</quote> file defining yaboot's boot
   menu:</para>
 
-<screen os="l" role="nodump"><userinput>cat &gt; /etc/yaboot.conf &lt;&lt; "EOF"
+<screen os="l" role="nodump"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/yaboot.conf &lt;&lt; "EOF"
 <literal># Begin /etc/yaboot.conf
 
@@ -89,5 +89,5 @@
 root=/dev/hda7
 
-# where ybin is to find yaboot and ofboot 
+# where ybin is to find yaboot and ofboot
 install=/usr/lib/yaboot/yaboot
 magicboot=/usr/lib/yaboot/ofboot
Index: BOOK/bootscripts/common/inputrc.xml
===================================================================
--- BOOK/bootscripts/common/inputrc.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/bootscripts/common/inputrc.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -37,5 +37,5 @@
   using the following command:</para>
 
-<screen><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
+<screen><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
 <literal># Begin /etc/inputrc
 # Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt;
Index: BOOK/cross-tools/alpha/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc-headers.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/alpha/glibc-headers.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -27,5 +27,5 @@
     because this only installs the headers, no compiling takes place. In the
     next Glibc installation, we use the GCC that's built right after this section:</para>
- 	
+
 <screen os="s2"><userinput>cp -v configure{,.orig}
 sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen>
@@ -65,5 +65,5 @@
     <variablelist os="ca">
        <title>The meaning of the configure options:</title>
- 	
+
           <varlistentry os="ca1">
              <term><parameter>CC=gcc</parameter></term>
@@ -72,5 +72,5 @@
              </listitem>
           </varlistentry>
- 	
+
          <varlistentry os="ca2">
             <term><parameter>--prefix=/tools</parameter></term>
@@ -81,5 +81,5 @@
              </listitem>
          </varlistentry>
-	
+
          <varlistentry os="ca3">
             <term><parameter>--build=${CLFS_HOST}</parameter></term>
@@ -89,5 +89,5 @@
             </listitem>
         </varlistentry>
- 	
+
         <varlistentry os="ca4">
            <term><parameter>--host=${CLFS_TARGET}</parameter></term>
@@ -97,5 +97,5 @@
            </listitem>
         </varlistentry>
- 	
+
        <varlistentry os="ca5">
           <term><parameter>--disable-sanity-checks</parameter></term>
@@ -104,5 +104,5 @@
            </listitem>
        </varlistentry>
- 	
+
        <varlistentry os="ca6">
             <term><parameter>--enable-kernel=2.6.0</parameter></term>
@@ -112,5 +112,5 @@
             </listitem>
        </varlistentry>
- 	
+
        <varlistentry os="ca7">
            <term><parameter>--with-headers=/tools/include</parameter></term>
@@ -122,5 +122,5 @@
            </listitem>
        </varlistentry>
- 	
+
        <varlistentry os="ca8">
            <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
@@ -129,7 +129,7 @@
             </listitem>
        </varlistentry>
- 	
+
        </variablelist>
- 	
+
    <para os="cb">Now, install the headers:</para>
 
@@ -139,5 +139,5 @@
     we will copy the additional header files we need.</para>
 
-   <para os="cf">First we will copy a common file over to <filename 
+   <para os="cf">First we will copy a common file over to <filename
    class="directory">/tools/include</filename>:</para>
 
@@ -150,6 +150,7 @@
 
    <para os="cj">Another header is needed for NPTL:</para>
-   
-<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
+
+<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
+    /tools/include/bits/</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/alpha/variables.xml
===================================================================
--- BOOK/cross-tools/alpha/variables.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/alpha/variables.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -45,7 +45,11 @@
   <table os="g">
     <title>Processor Type and Target Triplets</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Triplet"/>
+
+    <tgroup cols="2">
+    <?dbfo table-width="5in" ?>
+
+      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
+      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
+
       <thead>
         <row>
@@ -54,4 +58,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -88,5 +93,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/sparc64-64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/flags.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/sparc64-64/flags.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -14,6 +14,6 @@
    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>export BUILD64="[BUILD64 entries]"
-export GCCTARGET="[GCCTARGET entries]"</userinput></screen>
+<screen os="b"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
+export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -30,8 +30,12 @@
   <table os="f">
     <title>List of architectures, target triplets, and recommended book</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Build64"/>
-      <colspec colname="GCC"/>
+    <?dbfo table-width="7in" ?>
+
+    <tgroup cols="3">
+
+      <colspec colnum="1" colwidth="1in"   colname="Processor"/>
+      <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
+      <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
+
       <thead>
         <row>
@@ -41,4 +45,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -53,5 +58,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/sparc64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64/flags.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/sparc64/flags.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -14,7 +14,7 @@
   from the table at the bottom of the page.</para>
 
-<screen os="b"><userinput>export BUILD32="[BUILD32 entries]"
-export BUILD64="[BUILD64 entries]"
-export GCCTARGET="[GCCTARGET entries]"</userinput></screen>
+<screen os="b"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
+export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
+export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -33,9 +33,13 @@
   <table os="f">
     <title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Build32"/>
-      <colspec colname="Build64"/>
-      <colspec colname="GCC"/>
+    <?dbfo table-width="7in" ?>
+
+    <tgroup cols="4">
+
+      <colspec colnum="1" colwidth="1in" colname="Processor"/>
+      <colspec colnum="2" colwidth="2in" colname="Build32"/>
+      <colspec colnum="3" colwidth="2in" colname="Build64"/>
+      <colspec colnum="4" colwidth="2in" colname="GCC"/>
+
       <thead>
         <row>
@@ -46,4 +50,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -60,5 +65,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/x86/gcc-final.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -67,5 +67,6 @@
 
 <screen os="be"><userinput>cp -v configure{,.orig}
-sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig >configure</userinput></screen>
+sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig > \
+    configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86/variables.xml
===================================================================
--- BOOK/cross-tools/x86/variables.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/x86/variables.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -22,5 +22,6 @@
   following command:</para>
 
-<screen os="b"><userinput>export CLFS_HOST="$(echo $MACHTYPE | sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen>
+<screen os="b"><userinput>export CLFS_HOST="$(echo $MACHTYPE | \
+    sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen>
 
   <para os="c">Now you will need to set the triplet for the target
@@ -42,7 +43,11 @@
   <table os="g">
     <title>Processor Type and  Target Triplets</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Triplet"/>
+    <?dbfo table-width="5in" ?>
+
+    <tgroup cols="2">
+
+      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
+      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
+
       <thead>
         <row>
@@ -51,4 +56,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -73,5 +79,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-final.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/cross-tools/x86_64/gcc-final.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -68,5 +68,6 @@
 
 <screen os="be"><userinput>cp -v configure{,.orig}
-sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig >configure</userinput></screen>
+sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig > \
+    configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/common/m4.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -59,5 +59,6 @@
 
       <varlistentry id="m4">
-        <term><command>m4</command></term>
+         <!-- Don't remove the extra space, it prevet a FOP warning. -->
+        <term><command>m4 </command></term>
         <listitem>
           <para>copies the given files while expanding the macros that they
Index: BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- BOOK/final-system/multilib/shadow-64bit.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/multilib/shadow-64bit.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -41,7 +41,7 @@
       to make sure the correct library is linked:</para>
 
-      <screen role="nodump"><userinput>sed -i libtool \
-         -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g' \
-         -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g'</userinput></screen>
+<screen role="nodump"><userinput>sed -i libtool \
+    -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g' \
+    -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g'</userinput></screen>
     </note>
 
Index: BOOK/final-system/multilib/shadow-n32.xml
===================================================================
--- BOOK/final-system/multilib/shadow-n32.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/multilib/shadow-n32.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -41,7 +41,7 @@
       to make sure the correct library is linked.</para>
 
-      <screen role="nodump"><userinput>sed -i libtool \
-	 -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g' \
-	 -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g'</userinput></screen>
+<screen role="nodump"><userinput>sed -i libtool \
+    -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g' \
+    -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g'</userinput></screen>
     </note>
 
Index: BOOK/final-system/multilib/temp-perl.xml
===================================================================
--- BOOK/final-system/multilib/temp-perl.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/multilib/temp-perl.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -43,5 +43,6 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="c"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc ${BUILD32}"</userinput></screen>
+<screen os="c"><userinput>./configure.gnu --prefix=/tools \
+    -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/udev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/udev-64bit.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/final-system/multilib/udev-64bit.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -32,6 +32,7 @@
 
 <screen os="b"><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
- EXTRAS="extras/cdrom_id extras/floppy extras/firmware extras/scsi_id extras/volume_id \
-            extras/ata_id extras/usb_id extras/edd_id extras/dasd_id extras/path_id"</userinput></screen>
+    EXTRAS="extras/cdrom_id extras/floppy extras/firmware extras/scsi_id \
+            extras/volume_id extras/ata_id extras/usb_id extras/edd_id \
+            extras/dasd_id extras/path_id"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/common/introduction.xml
===================================================================
--- BOOK/temp-system/common/introduction.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/temp-system/common/introduction.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -37,6 +37,6 @@
   messages like the one below. It is safe to ignore these messages.</para>
 
-<blockquote><screen><computeroutput>configure: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used.</computeroutput></screen></blockquote>
+<screen><computeroutput>configure: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used.</computeroutput></screen>
 
 
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -91,6 +91,6 @@
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --with-abi=64 \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
+    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
     <variablelist>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/temp-system/mips64/gcc.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -89,8 +89,8 @@
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} --with-abi=64 \
-    --with-local-prefix=/tools --enable-long-long --enable-c99 \
-    --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
+    --with-abi=64 --with-local-prefix=/tools --enable-long-long \
+    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
+    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/ppc64/choose.xml
===================================================================
--- BOOK/temp-system/ppc64/choose.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/temp-system/ppc64/choose.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -31,5 +31,6 @@
   64-bit Linux 2.6 kernel (with a 64-bit personality):</para>
 
-<screen><userinput>uname -a | grep '^Linux.*2\.6\..*ppc64' &amp;&amp; echo "ok to chroot" || echo "you must boot"</userinput></screen>
+<screen><userinput>uname -a | grep '^Linux.*2\.6\..*ppc64' &amp;&amp; \
+    echo "ok to chroot" || echo "you must boot"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/x86_64-64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64-64/gcc.xml	(revision c304f4c0ad65d0fea77cac4f250b96dd4cdf13bf)
+++ BOOK/temp-system/x86_64-64/gcc.xml	(revision d018b81947a9d10f5bc3cd681d3d6434a30110a1)
@@ -91,6 +91,6 @@
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
+    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
     <variablelist>
