Index: BOOK/Makefile
===================================================================
--- BOOK/Makefile	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/Makefile	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -34,5 +34,5 @@
 	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
 	$(Q)rm -f $(RENDERTMP)/*-{full,html,pdf}.xml
-	$(Q)rm -f $(RENDERTMP)/*-pdf.fo
+	$(Q)rm -f $(RENDERTMP)/*.fo
 
 ifeq ($(shell which tidy >/dev/null 2>&1 && echo yes),yes)
Index: BOOK/beyond-clfs/common/dropbear.xml
===================================================================
--- BOOK/beyond-clfs/common/dropbear.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/beyond-clfs/common/dropbear.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -59,5 +59,6 @@
     <para os="h">Install the package:</para>
 
-<screen os="i"><userinput>make MULTI=1 PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" install DESTDIR=${CLFS}
+<screen os="i"><userinput>make MULTI=1 PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
+    install DESTDIR=${CLFS}
 ln -svf ../../usr/bin/dropbearmulti ${CLFS}/usr/sbin/dropbear
 ln -svf ../../usr/bin/dropbearmulti ${CLFS}/usr/bin/dbclient
Index: BOOK/beyond-clfs/common/iptables.xml
===================================================================
--- BOOK/beyond-clfs/common/iptables.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/beyond-clfs/common/iptables.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -38,5 +38,6 @@
 
 <screen os="d"><userinput>make CC="${CC} ${BUILD}" COPT_FLAGS="-Os" LD=${LD} DO_MULTI=1 PREFIX=/usr \
-    KERNEL_DIR=${CLFS}/lib/modules/&linux-version;/build LIBDIR=/lib BINDIR=/sbin DESTDIR=${CLFS} install</userinput></screen>
+    KERNEL_DIR=${CLFS}/lib/modules/&linux-version;/build LIBDIR=/lib BINDIR=/sbin \
+    DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/bootable/x86/kernel.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -43,5 +43,5 @@
     packages outside of CLFS at <ulink
     url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
-  
+
     <note os="f"><para>Since we are building for an embedded system we need to make sure
     our key components are built into the kernel and not as modules. Our key
@@ -111,9 +111,10 @@
 <screen os="v"><userinput>cp System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
 
-    <para os="w">If we compiled our kernel with modules and we made sure depmod.pl
-    is avaiable from busybox, we need to create the module dependency list by
-    issuing the following command:</para>
-
-<screen os="x"><userinput>${CLFS}/cross-tools/bin/depmod.pl -F ${CLFS}/boot/System.map -b ${CLFS}/lib/modules/&linux-version;</userinput></screen>
+    <para os="w">If we compiled our kernel with modules and we made sure
+    <command>depmod.pl</command> is avaiable from BusyBox, we need to create the
+    module dependency list by issuing the following command:</para>
+
+<screen os="x"><userinput>${CLFS}/cross-tools/bin/depmod.pl -F ${CLFS}/boot/System.map \
+    -b ${CLFS}/lib/modules/&linux-version;</userinput></screen>
 
     <para os="y">The kernel configuration file <filename>.config</filename>
Index: BOOK/bootscripts/common/inittab.xml
===================================================================
--- BOOK/bootscripts/common/inittab.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/bootscripts/common/inittab.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -12,18 +12,10 @@
 
   <indexterm zone="ch-scripts-inittab">
-    <primary sortas="a-inittab">inittab</primary>
+    <primary sortas="e-/etc/inittab">/etc/inittab</primary>
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
+  <para>Is the file that specifices how to boot and shutdown a system.</para>
 
-    <para>Is the file that specifices how to boot and shutdown a system.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Create /etc/inittab</title>
-
-<para os="a">Now we will create the inittab file for use with our system:</para>
+  <para os="a">Now we will create the inittab file for use with our system:</para>
 
 <screen os="b"><userinput>cat &gt; ${CLFS}/etc/inittab&lt;&lt; "EOF"
@@ -47,5 +39,3 @@
 EOF</userinput></screen>
 
-  </sect2>
-
 </sect1>
Index: BOOK/bootscripts/common/inputrc.xml
===================================================================
--- BOOK/bootscripts/common/inputrc.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/bootscripts/common/inputrc.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -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/bootscripts/common/mdev.xml
===================================================================
--- BOOK/bootscripts/common/mdev.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/bootscripts/common/mdev.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -24,9 +24,13 @@
 
   <sect2>
-    <title>Create /etc/mdev.conf</title>
+    <title>Creating /etc/mdev.conf</title>
+
+    <indexterm zone="ch-scripts-mdev">
+      <primary sortas="e-/etc/mdev.conf">/etc/mdev.conf</primary>
+    </indexterm>
 
 <para os="a">Now we will create the mdev.conf file for use with our system:</para>
 
-<screen os="b"><userinput>cat &gt; ${CLFS}/etc/mdev.conf&lt;&lt; "EOF"
+<screen os="b"><?dbfo keep-together="auto"?><userinput>cat &gt; ${CLFS}/etc/mdev.conf&lt;&lt; "EOF"
 <literal># /etc/mdev/conf
 SLEEP=10
Index: BOOK/bootscripts/common/profile.xml
===================================================================
--- BOOK/bootscripts/common/profile.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/bootscripts/common/profile.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -12,18 +12,10 @@
 
   <indexterm zone="ch-scripts-profile">
-    <primary sortas="a-profile">profile</primary>
+    <primary sortas="e-/etc/profile">/etc/profile</primary>
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
+  <para>Is the file that specifices how to your environment will function.</para>
 
-    <para>Is the file that specifices how to your environment will function.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Create /etc/profile</title>
-
-<para os="a">Now we will create the profile file for use with our system:</para>
+  <para os="a">Now we will create the profile file for use with our system:</para>
 
 <screen os="b"><userinput>cat &gt; ${CLFS}/etc/profile&lt;&lt; "EOF"
@@ -51,5 +43,3 @@
 EOF</userinput></screen>
 
-  </sect2>
-
 </sect1>
Index: BOOK/cleanup/remove-files.xml
===================================================================
--- BOOK/cleanup/remove-files.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cleanup/remove-files.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -25,5 +25,5 @@
 rm -rfv ${CLFS}-final/usr/src/*
 rm -rfv ${CLFS}-final/usr/include
-rm -rfv ${CLFS}-final/usr/man 
+rm -rfv ${CLFS}-final/usr/man
 rm -rfv ${CLFS}-final/usr/share/man</userinput></screen>
 
@@ -32,5 +32,5 @@
 <screen><userinput>FILES="`ls ${CLFS}-final/lib/*.a ${CLFS}-final/usr/lib/*.a`"
 for file in $FILES; do
-        rm -fv $file
+    rm -fv $file
 done</userinput></screen>
 
Index: BOOK/cross-tools/arm/variables.xml
===================================================================
--- BOOK/cross-tools/arm/variables.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/arm/variables.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -38,7 +38,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>
@@ -47,4 +51,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -61,5 +66,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/common/abi.xml
===================================================================
--- BOOK/cross-tools/common/abi.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/common/abi.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -13,5 +13,5 @@
   <para>Setup for a Particular ABI:</para>
 
-<screen><userinput><literal>export BUILD="<replaceable>[From Chart]</replaceable>"</literal></userinput></screen>
+<screen><userinput>export BUILD="<replaceable>[From Chart]</replaceable>"</userinput></screen>
 
   <para>The following table gives the entires for the different ABI's that CLFS Embedded supports. Make
@@ -21,7 +21,11 @@
   <table>
     <title>List of Build Variables</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="ABI to Select"/>
-      <colspec colname="Variable Value"/>
+    <?dbfo table-width="3in" ?>
+
+    <tgroup cols="2">
+
+      <colspec colnum="1" colwidth="1.5in" colname="ABI to Select"/>
+      <colspec colnum="2" colwidth="1.5in" colname="Variable Value"/>
+
       <thead>
         <row>
@@ -30,4 +34,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -52,5 +57,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/common/clear-toolchain.xml
===================================================================
--- BOOK/cross-tools/common/clear-toolchain.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/common/clear-toolchain.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -14,5 +14,5 @@
   the final GCC build from having issues:</para>
 
-<screen><userinput><literal>unset CC
+<screen><userinput>unset CC
 unset CXX
 unset AR
@@ -20,5 +20,5 @@
 unset LD
 unset RANLIB
-unset STRIP</literal></userinput></screen>
+unset STRIP</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -54,6 +54,6 @@
 <screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
     --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
-    --with-sysroot=${CLFS} --disable-nls --disable-shared --disable-threads \
-    --enable-languages=c</userinput></screen>
+    --with-sysroot=${CLFS} --disable-nls --disable-shared \
+    --disable-threads --enable-languages=c</userinput></screen>
 
     <variablelist os="af">
Index: BOOK/cross-tools/common/toolchain.xml
===================================================================
--- BOOK/cross-tools/common/toolchain.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/common/toolchain.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -15,5 +15,5 @@
   then Final System build:</para>
 
-<screen><userinput><literal>export CC="${CLFS_TARGET}-gcc"
+<screen><userinput>export CC="${CLFS_TARGET}-gcc"
 export CXX="${CLFS_TARGET}-g++"
 export AR="${CLFS_TARGET}-ar"
@@ -21,5 +21,5 @@
 export LD="${CLFS_TARGET}-ld"
 export RANLIB="${CLFS_TARGET}-ranlib"
-export STRIP="${CLFS_TARGET}-strip"</literal></userinput></screen>
+export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/mips/uclibc.xml
===================================================================
--- BOOK/cross-tools/mips/uclibc.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/mips/uclibc.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -29,6 +29,7 @@
 
 <screen os="b"><userinput>cp extra/Configs/Config.mips extra/Configs/Config.mips.orig
-sed -e "s:default CONFIG_MIPS_ISA_1:default CONFIG_MIPS_ISA_${CLFS_MIPS_LEVEL}:" \
-   extra/Configs/Config.mips.orig > extra/Configs/Config.mips</userinput></screen>
+sed -e \
+  "s:default CONFIG_MIPS_ISA_1:default CONFIG_MIPS_ISA_${CLFS_MIPS_LEVEL}:" \
+  extra/Configs/Config.mips.orig > extra/Configs/Config.mips</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips/variables.xml
===================================================================
--- BOOK/cross-tools/mips/variables.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/mips/variables.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -46,8 +46,12 @@
   <table os="g">
     <title>Processor Type and  Target Triplets</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Triplet"/>
-      <colspec colname="MIPS Level"/>
+    <?dbfo table-width="5.5in" ?>
+
+    <tgroup cols="2">
+
+      <colspec colnum="1" colwidth="2in"   colname="Processor"/>
+      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
+      <colspec colnum="3" colwidth="1in"   colname="MIPS Level"/>
+
       <thead>
         <row>
@@ -57,4 +61,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -79,5 +84,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/cross-tools/x86/uclibc.xml
===================================================================
--- BOOK/cross-tools/x86/uclibc.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/x86/uclibc.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -36,6 +36,7 @@
 sed -e 's/$(LN) -fs/cp/g' Makefile.orig &gt; Makefile
 for file in `find libc/sysdeps/linux -name Makefile`; do
-        cp $file{,.orig}
-        sed -e 's/$(LN) -fs/cp/g' -e 's@../libc/@$(TOPDIR)libc/@g' $file.orig > $file
+    cp $file{,.orig}
+    sed -e 's/$(LN) -fs/cp/g' -e 's@../libc/@$(TOPDIR)libc/@g' \
+        $file.orig > $file
 done</userinput></screen>
 
@@ -65,15 +66,15 @@
 
 <screen os="k"><userinput>UCLIBC_OPTIONS="DO_C99_MATH UCLIBC_HAS_RPC UCLIBC_HAS_CTYPE_CHECKED
-		UCLIBC_HAS_WCHAR UCLIBC_HAS_HEXADECIMAL_FLOATS UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE
-		UCLIBC_HAS_PRINTF_M_SPEC UCLIBC_HAS_FTW UCLIBC_HAS_IPV6 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
-		UCLIBC_USE_NETLINK LDSO_PRELOAD_FILE_SUPPORT"
+    UCLIBC_HAS_WCHAR UCLIBC_HAS_HEXADECIMAL_FLOATS LDSO_PRELOAD_FILE_SUPPORT
+    UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE UCLIBC_HAS_PRINTF_M_SPEC UCLIBC_HAS_IPV6
+    UCLIBC_HAS_GLIBC_CUSTOM_PRINTF UCLIBC_USE_NETLINK UCLIBC_HAS_FTW"
 for config in $UCLIBC_OPTIONS; do
-        cp .config{,.orig}
-        sed -e "s:# ${config} is not set:${config}=y:" .config.orig > .config
+    cp .config{,.orig}
+    sed -e "s:# ${config} is not set:${config}=y:" .config.orig > .config
 done
 UCLIBC_OPTIONS="UCLIBC_HAS_CTYPE_UNSAFE"
 for config in $UCLIBC_OPTIONS; do
-        cp .config{,.orig}
-        sed -e "s:${config}=y:# ${config} is not set:" .config.orig > .config
+    cp .config{,.orig}
+    sed -e "s:${config}=y:# ${config} is not set:" .config.orig > .config
 done
 echo "UCLIBC_HAS_FULL_RPC=y" &gt;&gt; .config
Index: BOOK/cross-tools/x86/variables.xml
===================================================================
--- BOOK/cross-tools/x86/variables.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/cross-tools/x86/variables.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -20,5 +20,6 @@
   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 target triplet for the target
@@ -38,7 +39,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="4.5in" ?>
+
+    <tgroup cols="2">
+
+      <colspec colnum="1" colwidth="2.5in"   colname="Processor"/>
+      <colspec colnum="2" colwidth="2in" colname="Triplet"/>
+
       <thead>
         <row>
@@ -47,4 +52,5 @@
         </row>
       </thead>
+
       <tbody>
         <row>
@@ -65,5 +71,7 @@
         </row>
       </tbody>
+
     </tgroup>
+
   </table>
 
Index: BOOK/final-system/arm/busybox.xml
===================================================================
--- BOOK/final-system/arm/busybox.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/final-system/arm/busybox.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -72,5 +72,6 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="i"><userinput>make ARCH=arm CROSS_COMPILE="${CLFS_TARGET}-" CFLAGS="${BUILD}" CONFIG_PREFIX="${CLFS}" install</userinput></screen>
+<screen os="i"><userinput>make ARCH=arm CROSS_COMPILE="${CLFS_TARGET}-" CFLAGS="${BUILD}" \
+    CONFIG_PREFIX="${CLFS}" install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -36,6 +36,7 @@
     <para os="c">Prepare E2fsprogs for compilation:</para>
 
-<screen os="d"><userinput>CC="${CC} ${BUILD} -Os" ../configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --prefix=/usr --with-root-prefix="" --with-cc="${CC} ${BUILD} -Os" --with-linker=${LD}</userinput></screen>
+<screen os="d"><userinput>CC="${CC} ${BUILD} -Os" ../configure --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --prefix=/usr --with-root-prefix="" \
+    --with-cc="${CC} ${BUILD} -Os" --with-linker=${LD}</userinput></screen>
 
     <variablelist os="e">
Index: BOOK/final-system/common/toolchain.xml
===================================================================
--- BOOK/final-system/common/toolchain.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/final-system/common/toolchain.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -14,14 +14,14 @@
   and linkers. This time we keep them:</para>
 
-<screen><userinput><literal>echo export CC=\""${CLFS_TARGET}-gcc\"" &gt;&gt; ~/.bashrc
-echo export CXX=\""${CLFS_TARGET}-g++\"" &gt;&gt; ~/.bashrc
-echo export AR=\""${CLFS_TARGET}-ar\"" &gt;&gt; ~/.bashrc
-echo export AS=\""${CLFS_TARGET}-as\"" &gt;&gt; ~/.bashrc
-echo export LD=\""${CLFS_TARGET}-ld\"" &gt;&gt; ~/.bashrc
-echo export RANLIB=\""${CLFS_TARGET}-ranlib\"" &gt;&gt; ~/.bashrc
-echo export READELF=\""${CLFS_TARGET}-readelf\"" &gt;&gt; ~/.bashrc
-echo export STRIP=\""${CLFS_TARGET}-strip\"" &gt;&gt; ~/.bashrc
-echo export BUILD=\""${BUILD}\"" &gt;&gt; ~/.bashrc
-source ~/.bashrc</literal></userinput></screen>
+<screen><userinput>echo <literal>export CC=\""${CLFS_TARGET}-gcc\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export CXX=\""${CLFS_TARGET}-g++\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export AR=\""${CLFS_TARGET}-ar\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export AS=\""${CLFS_TARGET}-as\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export LD=\""${CLFS_TARGET}-ld\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export RANLIB=\""${CLFS_TARGET}-ranlib\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export READELF=\""${CLFS_TARGET}-readelf\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export STRIP=\""${CLFS_TARGET}-strip\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export BUILD=\""${BUILD}\""</literal> &gt;&gt; ~/.bashrc
+source ~/.bashrc</userinput></screen>
 
 </sect1>
Index: BOOK/final-system/mips/busybox.xml
===================================================================
--- BOOK/final-system/mips/busybox.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/final-system/mips/busybox.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -72,5 +72,6 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="i"><userinput>make ARCH=mips CROSS_COMPILE="${CLFS_TARGET}-" CFLAGS="${BUILD}" CONFIG_PREFIX="${CLFS}" install</userinput></screen>
+<screen os="i"><userinput>make ARCH=mips CROSS_COMPILE="${CLFS_TARGET}-" CFLAGS="${BUILD}" \
+    CONFIG_PREFIX="${CLFS}" install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/busybox.xml
===================================================================
--- BOOK/final-system/x86/busybox.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/final-system/x86/busybox.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -58,19 +58,22 @@
 
 <screen os="e"><userinput>BUSYBOX_OPTIONS="CONFIG_DMALLOC CONFIG_BUILD_AT_ONCE CONFIG_BUILD_LIBBUSYBOX
-                 CONFIG_FEATURE_SH_IS_NONE CONFIG_LOCALE_SUPPORT CONFIG_TFTP CONFIG_FTPGET CONFIG_FTPPUT
-                 CONFIG_IPCALC CONFIG_TFTP CONFIG_HUSH CONFIG_LASH CONFIG_MSH CONFIG_INETD CONFIG_DPKG
-                 CONFIG_RPM2CPIO CONFIG_RPM CONFIG_FOLD CONFIG_LOGNAME CONFIG_OD CONFIG_CRONTAB
-                 CONFIG_UUDECODE CONFIG_UUENCODE CONFIG_SULOGIN CONFIG_DC CONFIG_DEBUG_YANK_SUSv2
-                 CONFIG_DEBUG_INIT CONFIG_DEBUG_CROND_OPTION CONFIG_FEATURE_UDHCP_DEBUG CONFIG_TASKSET
-                 CONFIG_CHATTR CONFIG_FSCK CONFIG_LSATTR CONFIG_CHPST CONFIG_SETUIDGID
-                 CONFIG_ENVUIDGID CONFIG_ENVDIR CONFIG_SOFTLIMIT CONFIG_FEATURE_2_4_MODULES"
+    CONFIG_FEATURE_SH_IS_NONE CONFIG_LOCALE_SUPPORT CONFIG_TFTP CONFIG_FTPGET
+    CONFIG_FTPPUT CONFIG_IPCALC CONFIG_TFTP CONFIG_HUSH CONFIG_LASH
+    CONFIG_MSH CONFIG_INETD CONFIG_DPKG CONFIG_RPM2CPIO CONFIG_RPM
+    CONFIG_FOLD CONFIG_LOGNAME CONFIG_OD CONFIG_CRONTAB CONFIG_UUDECODE
+    CONFIG_UUENCODE CONFIG_SULOGIN CONFIG_DC CONFIG_DEBUG_YANK_SUSv2
+    CONFIG_DEBUG_INIT CONFIG_DEBUG_CROND_OPTION CONFIG_FEATURE_UDHCP_DEBUG
+    CONFIG_TASKSET CONFIG_CHATTR CONFIG_FSCK CONFIG_LSATTR CONFIG_CHPST
+    CONFIG_SETUIDGID CONFIG_ENVUIDGID CONFIG_ENVDIR CONFIG_SOFTLIMIT
+    CONFIG_FEATURE_2_4_MODULES"
 for config in $BUSYBOX_OPTIONS; do
-        cp .config{,.orig}
-        sed -e "s:${config}=y:${config}=n:" .config.orig &gt; .config
+    cp .config{,.orig}
+    sed -e "s:${config}=y:${config}=n:" .config.orig &gt; .config
 done
-BUSYBOX_OPTIONS="CONFIG_FEATURE_SH_IS_ASH CONFIG_FEATURE_TRACEROUTE_VERBOSE CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE"
+BUSYBOX_OPTIONS="CONFIG_FEATURE_SH_IS_ASH CONFIG_FEATURE_TRACEROUTE_VERBOSE
+    CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE"
 for config in $BUSYBOX_OPTIONS; do
-        cp .config{,.orig}
-        sed -e "s:# ${config} is not set:${config}=y:" .config.orig &gt; .config
+    cp .config{,.orig}
+    sed -e "s:# ${config} is not set:${config}=y:" .config.orig &gt; .config
 done</userinput></screen>
 
@@ -81,8 +84,9 @@
     <para os="h">Install the package:</para>
 
-<screen os="i"><userinput>make ARCH=i386 CROSS_COMPILE="${CLFS_TARGET}-" CFLAGS="${BUILD}" CONFIG_PREFIX="${CLFS}" install</userinput></screen>
+<screen os="i"><userinput>make ARCH=i386 CROSS_COMPILE="${CLFS_TARGET}-" CFLAGS="${BUILD}" \
+    CONFIG_PREFIX="${CLFS}" install</userinput></screen>
 
     <para os="j">If your going to build your kernel with modules, you will need to make
-    sure depmod.pl is available:</para>
+    sure <command>depmod.pl</command> is available:</para>
 
 <screen os="k"><userinput>cp examples/depmod.pl ${CLFS}/cross-tools/bin
Index: BOOK/introduction/wrt/supporteddevices.xml
===================================================================
--- BOOK/introduction/wrt/supporteddevices.xml	(revision 39a9ea5c4ae540211fe3f7bb887449e8aaa23825)
+++ BOOK/introduction/wrt/supporteddevices.xml	(revision 3ca22086170b2d5c51f88d84b1f17e90fa004c9f)
@@ -11,38 +11,45 @@
 
   <para>In order to build CLFS for your device, we need to know what processor it has, amd more inportantly if it is a big or small edin, and what MIPS ISA level it is. The MIPS ISA level is needed so that we can build uClibc properly. </para>
-  
+
   <para> The following is a list of devices that have been tested and reported as tested and working with this book. Apart from this list, there is no garentee that your device, apart from this list will work. If U secussfully get a device to work, please contact the CLFS Dev team, and we will add it to the list. For the most recent and up to date list, please view the SVN version of this book. </para>
 
   <table os="g">
-	  <title>Supported Devices</title>
-	  <tgroup cols="6" align="center">
-		  <colspec colname="Manufacture"/>
-		  <colspec colname="Device"/>
-		  <colspec colname="Supported/Working"/>
-		  <colspec colname="Processor"/>
-		  <colspec colname="Big or Small Edin"/>
-		  <colspec colname="Mips Level"/>
-		  <thead>
-			  <row>
-				  <entry>Manufacture</entry>
-				  <entry>Device</entry>
-				  <entry>Supported/Working</entry>
-				  <entry>Processor </entry>
-				  <entry>Big or Small Edin </entry>
-				  <entry>Mips Level </entry>
-			  </row>
-		  </thead>
-		  <tbody>
-			  <row>
-				  <entry>Linksys</entry>
-				  <entry>WRT54G Vs. 1</entry>
-				  <entry>Testing</entry>
-				  <entry>Broadcom 4712 @ 200MHz, 2MB Flash, 8MB RAM</entry>
-				  <entry>Small</entry>
-				  <entry>1 or 2, testing</entry>
-			  </row>
-			  
-		  </tbody>
-	  </tgroup>
+    <title>Supported Devices</title>
+    <?dbfo table-width="7.5in" ?>
+
+    <tgroup cols="6">
+
+      <colspec colnum="1" colwidth="1.1in" colname="Manufacturer"/>
+      <colspec colnum="2" colwidth="1.1in" colname="Device"/>
+      <colspec colnum="3" colwidth="1in"   colname="Supported - Working"/>
+      <colspec colnum="4" colwidth="2.2in" colname="Processor"/>
+      <colspec colnum="5" colwidth="1.1in" colname="Big or Small Endian"/>
+      <colspec colnum="6" colwidth="1in"   colname="Mips Level"/>
+
+      <thead>
+        <row>
+          <entry>Manufacturer</entry>
+          <entry>Device</entry>
+          <entry>Supported - Working</entry>
+          <entry>Processor</entry>
+          <entry>Big or Small Endian</entry>
+          <entry>Mips Level</entry>
+        </row>
+      </thead>
+
+      <tbody>
+        <row>
+          <entry>Linksys</entry>
+          <entry>WRT54G Vs. 1</entry>
+          <entry>Testing</entry>
+          <entry>Broadcom 4712 @ 200MHz, 2MB Flash, 8MB RAM</entry>
+          <entry>Small</entry>
+          <entry>1 or 2, testing</entry>
+        </row>
+      </tbody>
+
+    </tgroup>
+
   </table>
+
 </sect1>
