Index: BOOK/bootscripts/common/inputrc.xml
===================================================================
--- BOOK/bootscripts/common/inputrc.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/bootscripts/common/inputrc.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -37,5 +37,5 @@
   using the following command:</para>
 
-<screen><userinput>cat &gt; ${CLFS}/etc/inputrc &lt;&lt; "EOF"
+<screen><?dbfo keep-together="auto"?><userinput>cat &gt; ${CLFS}/etc/inputrc &lt;&lt; "EOF"
 <literal># Begin /etc/inputrc
 # Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt;
Index: BOOK/cross-tools/arm/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/arm/glibc-headers.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/cross-tools/arm/glibc-headers.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -27,5 +27,5 @@
     because this only installs the headers; no compiling takes place. In the
     next Glibc chapter, we use the GCC that's built right after this chapter.</para>
- 	
+
 <screen os="s2"><userinput>cp configure{,.orig}
 sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen>
@@ -73,5 +73,5 @@
     <variablelist os="dj">
        <title>The meaning of the configure options:</title>
- 	
+
           <varlistentry os="dj1">
              <term><parameter>CC=gcc</parameter></term>
@@ -80,5 +80,5 @@
              </listitem>
           </varlistentry>
- 	
+
        <varlistentry os="dj2">
            <term><parameter>--with-headers=${CLFS}/usr/include</parameter></term>
@@ -90,7 +90,7 @@
            </listitem>
        </varlistentry>
-	
+
      </variablelist>
- 	
+
    <para os="k">Now, install the headers:</para>
 
@@ -100,5 +100,5 @@
     we will copy the additional header files we need.</para>
 
-   <para os="n">First we will copy a common file over to <filename 
+   <para os="n">First we will copy a common file over to <filename
    class="directory">${CLFS}/usr/include</filename>:</para>
 
@@ -110,6 +110,7 @@
 
    <para os="r">Another header is needed for NPTL:</para>
-   
-<screen os="s"><userinput>cp -v ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h \
+
+<screen os="s"><userinput>cp -v \
+    ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h \
     ${CLFS}/usr/include/bits</userinput></screen>
 
Index: BOOK/cross-tools/arm/variables.xml
===================================================================
--- BOOK/cross-tools/arm/variables.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/cross-tools/arm/variables.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -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
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/cross-tools/common/glibc.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -89,10 +89,9 @@
 <screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/usr --libexecdir=/usr/lib/glibc \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/usr/include \
-    --cache-file=config.cache</userinput></screen>
+    ../glibc-&glibc-version;/configure --prefix=/usr \
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \
+    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
+    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \
+    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
 
     <variablelist os="j">
@@ -134,5 +133,5 @@
         <term><parameter>--disable-profile</parameter></term>
         <listitem>
-          <para>This builds the libraries without profiling information. 
+          <para>This builds the libraries without profiling information.
 	  Omit this option if profiling on the temporary tools is necessary.</para>
         </listitem>
@@ -226,8 +225,10 @@
 export I18NPATH=${PWD}/localedata
 export GCONV_PATH=${PWD}/iconvdata
-export LOCALEDEF="${PWD}/locale/localedef-native --alias-file=../intl/locale.alias"
+export LOCALEDEF="${PWD}/locale/localedef-native
+    --alias-file=../intl/locale.alias"
 cd ../glibc-&glibc-version;/localedata
 ${LOCALEDEF} -i locales/de_DE -f charmaps/ISO-8859-1 --prefix=${CLFS} de_DE
-${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 --prefix=${CLFS} de_DE@euro
+${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 \
+    --prefix=${CLFS} de_DE@euro
 ${LOCALEDEF} -i locales/en_HK -f charmaps/ISO-8859-1 --prefix=${CLFS} en_HK
 ${LOCALEDEF} -i locales/en_PH -f charmaps/ISO-8859-1 --prefix=${CLFS} en_PH
@@ -236,5 +237,6 @@
 ${LOCALEDEF} -i locales/fa_IR -f charmaps/UTF-8 --prefix=${CLFS} fa_IR
 ${LOCALEDEF} -i locales/fr_FR -f charmaps/ISO-8859-1 --prefix=${CLFS} fr_FR
-${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 --prefix=${CLFS} fr_FR@euro
+${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 \
+    --prefix=${CLFS} fr_FR@euro
 ${LOCALEDEF} -i locales/it_IT -f charmaps/ISO-8859-1 --prefix=${CLFS} it_IT
 ${LOCALEDEF} -i locales/ja_JP -f charmaps/EUC-JP --prefix=${CLFS} ja_JP
Index: BOOK/cross-tools/common/shadow.xml
===================================================================
--- BOOK/cross-tools/common/shadow.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/cross-tools/common/shadow.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -42,6 +42,7 @@
 
 <screen><userinput>./configure --prefix=${CLFS}/cross-tools --sbindir=${CLFS}/cross-tools/bin \
-    --sysconfdir=$CLFS/etc --disable-shared --without-libpam --without-audit \
-    --without-selinux --program-prefix=${CLFS_TARGET}- --cache-file=config.cache</userinput></screen>
+    --sysconfdir=$CLFS/etc --disable-shared --without-libpam \
+    --without-audit --without-selinux --program-prefix=${CLFS_TARGET}- \
+    --cache-file=config.cache</userinput></screen>
 
     <para>Add the proper prefix to the <filename>passwd</filename> program:</para>
Index: BOOK/cross-tools/hppa/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/hppa/glibc-headers.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/cross-tools/hppa/glibc-headers.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -108,6 +108,7 @@
     xpointer="xpointer(//*[@os='r'])"/>
 
-<screen os="s"><userinput>cp -v ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h \
-    ${CLFS}/usr/include/bits</userinput></screen>
+<screen os="s"><userinput>cp -v \
+   ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h \
+   ${CLFS}/usr/include/bits</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/hppa/variables.xml
===================================================================
--- BOOK/cross-tools/hppa/variables.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/cross-tools/hppa/variables.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -39,7 +39,11 @@
   <table os="g">
     <title>Processor Type and  Target Triplets</title>
+    <?dbfo table-width="5in" ?>
+
     <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Triplet"/>
+
+      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
+      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
+
       <thead>
         <row>
@@ -48,4 +52,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -62,5 +67,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/x86/variables.xml
===================================================================
--- BOOK/cross-tools/x86/variables.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/cross-tools/x86/variables.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -37,7 +37,11 @@
   <table os="g">
     <title>Processor Type and  Target Triplets</title>
+    <?dbfo table-width="5in" ?>
+
     <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Triplet"/>
+
+      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
+      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
+
       <thead>
         <row>
@@ -46,4 +50,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -64,5 +69,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/final-system/common/coreutils.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -69,6 +69,6 @@
 
 <screen os="j"><userinput>mv -v ${CLFS}/usr/bin/{cat,chgrp,chmod,chown,cp,date} ${CLFS}/bin
-mv -v ${CLFS}/usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} ${CLFS}/bin
-mv -v ${CLFS}/usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} ${CLFS}/bin
+mv -v ${CLFS}/usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir} ${CLFS}/bin
+mv -v ${CLFS}/usr/bin/{mknod,mv,pwd,rm,rmdir,stty,true,uname} ${CLFS}/bin
 mv -v ${CLFS}/usr/bin/chroot ${CLFS}/usr/sbin</userinput></screen>
 
Index: BOOK/final-system/common/findutils.xml
===================================================================
--- BOOK/final-system/common/findutils.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/final-system/common/findutils.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -59,5 +59,5 @@
     scripts in the CLFS-Bootscripts package. As <filename
     class="directory">/usr</filename> may not be available during the early
-    stages of booting, the <command>find</command>  binary need to be on 
+    stages of booting, the <command>find</command>  binary need to be on
     the root partition:</para>
 
@@ -68,5 +68,6 @@
 
 <screen os="k"><userinput>cp ${CLFS}/usr/bin/updatedb{,.orig}
-sed 's@find:=${BINDIR}@find:=/bin@' ${CLFS}/usr/bin/updatedb.orig &gt; ${CLFS}/usr/bin/updatedb
+sed 's@find:=${BINDIR}@find:=/bin@' ${CLFS}/usr/bin/updatedb.orig &gt; \
+    ${CLFS}/usr/bin/updatedb
 rm ${CLFS}/usr/bin/updatedb.orig</userinput></screen>
 
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/final-system/common/gcc.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -37,5 +37,6 @@
 
 <screen os="b"><userinput>cp libiberty/Makefile.in{,.orig}
-sed 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in.orig > libiberty/Makefile.in</userinput></screen>
+sed 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in.orig &gt; \
+    libiberty/Makefile.in</userinput></screen>
 
     <para os="e1">GCC provides a <command>gccbug</command> script which detects at
@@ -101,5 +102,5 @@
       <seglistitem>
         <seg>c++, cc (link to gcc), cpp, g++, gcc, gccbug, and gcov</seg>
-        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libmudflap.[a,so], 
+        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libmudflap.[a,so],
         libmudflapth.[a,so], libstdc++.[a,so], and
         libsupc++.a</seg>
Index: BOOK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/final-system/common/gzip.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -41,5 +41,6 @@
     <para os="g">Now we will move some of utilities to /usr/bin to meet FHS compliance:</para>
 
-<screen os="h"><userinput>mv ${CLFS}/bin/z{egrep,cmp,diff,fgrep,force,grep,less,more,new} ${CLFS}/usr/bin</userinput></screen>
+<screen os="h"><userinput>mv ${CLFS}/bin/z{egrep,cmp,diff,fgrep,force,grep,less,more,new} \
+    ${CLFS}/usr/bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/final-system/common/m4.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -57,5 +57,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/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/final-system/common/ncurses.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -46,5 +46,6 @@
     <para os="g">Move the Ncurses static libraries to the proper location:</para>
 
-<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a ${CLFS}/usr/lib</userinput></screen>
+<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \
+    ${CLFS}/usr/lib</userinput></screen>
 
     <para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision 68ed0891bbd9670f1d7608026999e4c2b3fae18c)
+++ BOOK/final-system/common/shadow.xml	(revision a074923d142c24bcba1618e5d92a0021ba03faa4)
@@ -58,5 +58,5 @@
       <listitem><para>Tells Shadow to install its configuration files into
       /etc, rather than /usr/etc.</para></listitem>
-    </varlistentry> 
+    </varlistentry>
     <varlistentry>
       <term><parameter>--without-libpam</parameter></term>
@@ -123,5 +123,6 @@
 
 <screen role="nodump"><userinput>cp ${CLFS}/etc/login.defs login.defs.orig
-sed 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' login.defs.orig &gt; ${CLFS}/etc/login.defs</userinput></screen>
+sed 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' login.defs.orig \
+    &gt; ${CLFS}/etc/login.defs</userinput></screen>
     </note>
 
