Index: BOOK/boot/common/bc.xml
===================================================================
--- BOOK/boot/common/bc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/common/bc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para>Prepare Bc for compilation:</para>
 
-<screen><userinput>CC=gcc ./configure --prefix=/cross-tools</userinput></screen>
+<screen><userinput>CC=gcc \
+./configure \
+    --prefix=/cross-tools</userinput></screen>
 
     <variablelist>
Index: BOOK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/common/e2fsprogs.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,7 +35,12 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>../configure --prefix=/tools \
-    --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-libblkid --disable-libuuid --disable-fsck \
+<screen os="aa"><userinput>../configure \
+    --prefix=/tools \
+    --enable-elf-shlibs \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
     --disable-uuidd</userinput></screen>
 
Index: BOOK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/common/eudev.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,7 +29,13 @@
    <para os="a">Prepare Eudev for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-introspection --disable-gtk-doc-html \
-    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-introspection \
+    --disable-gtk-doc-html \
+    --disable-gudev \
+    --disable-keymap \
+    --with-firmware-path=/tools/lib/firmware \
     --enable-libkmod</userinput></screen>
 
Index: BOOK/boot/common/kmod.xml
===================================================================
--- BOOK/boot/common/kmod.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/common/kmod.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,6 +35,10 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --with-xz \
+    --with-zlib</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/boot/common/shadow.xml
===================================================================
--- BOOK/boot/common/shadow.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/common/shadow.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -44,6 +44,9 @@
     <para os="e">Prepare Shadow for compilation:</para>
 
-<screen os="f"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache \
+<screen os="f"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --cache-file=config.cache \
     --enable-subordinate-ids=no</userinput></screen>
 
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -41,7 +41,12 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-libblkid --disable-libuuid --disable-fsck \
+<screen os="aa"><userinput>../configure \
+    --prefix=/tools \
+    --enable-elf-shlibs \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
     --disable-uuidd</userinput></screen>
 
Index: BOOK/boot/multilib/eudev.xml
===================================================================
--- BOOK/boot/multilib/eudev.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/multilib/eudev.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,8 +26,16 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
-    --disable-introspection --disable-gtk-doc-html --disable-gudev \
-    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 \
+    --with-rootlibdir=/tools/lib64 \
+    --disable-introspection \
+    --disable-gtk-doc-html \
+    --disable-gudev \
+    --disable-keymap \
+    --with-firmware-path=/lib/firmware \
+    --enable-libkmod</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/multilib/grub-build.xml
===================================================================
--- BOOK/boot/multilib/grub-build.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/multilib/grub-build.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,8 +39,12 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ab"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --disable-werror \
-    --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
+<screen os="ab"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 \
+    --disable-werror \
+    --enable-grub-mkfont=no \
+    --with-bootdir=tools/boot</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/multilib/kmod.xml
===================================================================
--- BOOK/boot/multilib/kmod.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/multilib/kmod.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,7 +35,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 \
+    --with-xz \
+    --with-zlib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/ppc/hfsutils.xml
===================================================================
--- BOOK/boot/ppc/hfsutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/ppc/hfsutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -40,5 +40,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC}" ./configure --prefix=/tools</userinput></screen>
+<screen><userinput>CC="${CC}" \
+./configure \
+    --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/ppc64/e2fsprogs-libs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs-libs.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/ppc64/e2fsprogs-libs.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -47,8 +47,14 @@
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD32}" \
-  ../configure --prefix=/tools --enable-elf-shlibs \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-libblkid --disable-libuuid --disable-fsck \
-    --disable-uuidd --cache-file=config.cache</userinput></screen>
+../configure \
+    --prefix=/tools \
+    --enable-elf-shlibs \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
+    --disable-uuidd \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/ppc64/e2fsprogs.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -54,8 +54,14 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-libblkid --disable-libuuid --disable-fsck \
-    --disable-uuidd --cache-file=config.cache</userinput></screen>
+<screen os="aa"><userinput>../configure \
+    --prefix=/tools \
+    --enable-elf-shlibs \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
+    --disable-uuidd \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/x86/grub-build.xml
===================================================================
--- BOOK/boot/x86/grub-build.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/boot/x86/grub-build.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -38,7 +38,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ab"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
+<screen os="ab"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-werror \
+    --enable-grub-mkfont=no \
+    --with-bootdir=tools/boot</userinput></screen>
 
 <para os="b">The meaning of the new configure option:</para>
Index: BOOK/cross-tools/64/binutils.xml
===================================================================
--- BOOK/cross-tools/64/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/64/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -49,9 +49,19 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \
-    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
-    --disable-static --enable-64-bit-bfd --disable-multilib
-    --enable-gold=yes --enable-plugins --enable-threads --disable-werror</userinput></screen>
+<screen os="bc"><userinput>AR=ar AS=as \
+../binutils-&binutils-dir;/configure \
+    --prefix=/cross-tools \
+    --host=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} \
+    --with-lib-path=/tools/lib \
+    --disable-nls \
+    --disable-static \
+    --enable-64-bit-bfd \
+    --disable-multilib \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads \
+    --disable-werror</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/cross-tools/64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/64/gcc-static.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/64/gcc-static.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -40,5 +40,5 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
-    <screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
+<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/64/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,11 +39,17 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
-      AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-      ../glibc-&glibc-version;/configure --prefix=/tools \
-      --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-      --disable-profile --enable-kernel=&glibc-kernel-version; \
-      --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-      --enable-obsolete-rpc</userinput></screen>
+<screen os="df"><userinput>BUILD_CC="gcc" \
+CC="${CLFS_TARGET}-gcc ${BUILD64}" \
+AR="${CLFS_TARGET}-ar" \
+RANLIB="${CLFS_TARGET}-ranlib" \
+../glibc-&glibc-version;/configure \
+    --prefix=/tools \
+    --host=${CLFS_TARGET} \
+    --build=${CLFS_HOST} \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --with-binutils=/cross-tools/bin \
+    --with-headers=/tools/include \
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="dg">
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -49,9 +49,18 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \
-    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
-    --disable-static --disable-multilib --enable-gold=yes --enable-plugins \
-    --enable-threads --disable-werror</userinput></screen>
+<screen os="bc"><userinput>AR=ar AS=as \
+../binutils-&binutils-dir;/configure \
+    --prefix=/cross-tools \
+    --host=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} \
+    --with-lib-path=/tools/lib \
+    --disable-nls \
+    --disable-static \
+    --disable-multilib \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads \
+    --disable-werror</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/cross-tools/common/file.xml
===================================================================
--- BOOK/cross-tools/common/file.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/file.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,5 +36,6 @@
     <para>Prepare File for compilation:</para>
 
-<screen><userinput>./configure --prefix=/cross-tools</userinput></screen>
+<screen><userinput>./configure \
+    --prefix=/cross-tools</userinput></screen>
 
     <variablelist>
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -59,12 +59,23 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --with-sysroot=${CLFS} --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include --disable-nls \
-    --disable-static --enable-languages=c,c++ --disable-multilib \
-    --with-mpc=/cross-tools --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --with-isl=/cross-tools --with-system-zlib</userinput></screen>
+<screen os="bf"><userinput>AR=ar \
+LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+../gcc-&gcc-version;/configure \
+    --prefix=/cross-tools \
+    --build=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --host=${CLFS_HOST} \
+    --with-sysroot=${CLFS} \
+    --with-local-prefix=/tools \
+    --with-native-system-header-dir=/tools/include \
+    --disable-nls \
+    --disable-static \
+    --enable-languages=c,c++ \
+    --disable-multilib \
+    --with-mpc=/cross-tools \
+    --with-mpfr=/cross-tools \
+    --with-gmp=/cross-tools \
+    --with-isl=/cross-tools \
+    --with-system-zlib</userinput></screen>
 
     <variablelist os="bg">
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -70,16 +70,35 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} --with-local-prefix=/tools \
+<screen os="al"><userinput>AR=ar \
+LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+../gcc-&gcc-version;/configure \
+    --prefix=/cross-tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} \
+    --with-local-prefix=/tools \
     --with-native-system-header-dir=/tools/include \
-    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --with-isl=/cross-tools --with-mpc=/cross-tools --without-headers \
-    --with-newlib --disable-decimal-float --disable-libgomp --disable-libssp \
-    --disable-libatomic --disable-libitm --disable-libsanitizer \
-    --disable-libquadmath --disable-libvtv --disable-libcilkrts \
-    --disable-libstdc++-v3 --disable-threads --disable-multilib \
-    --with-system-zlib --enable-languages=c \
+    --disable-shared \
+    --with-mpfr=/cross-tools \
+    --with-gmp=/cross-tools \
+    --with-isl=/cross-tools \
+    --with-mpc=/cross-tools \
+    --without-headers \
+    --with-newlib \
+    --disable-decimal-float \
+    --disable-libgomp \
+    --disable-libssp \
+    --disable-libatomic \
+    --disable-libitm \
+    --disable-libsanitizer \
+    --disable-libquadmath \
+    --disable-libvtv \
+    --disable-libcilkrts \
+    --disable-libstdc++-v3 \
+    --disable-threads \
+    --disable-multilib \
+    --with-system-zlib \
+    --enable-languages=c \
     --with-glibc-version=&glibc-version;</userinput></screen>
 
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,10 +39,16 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
+<screen os="df"><userinput>BUILD_CC="gcc" \
+CC="${CLFS_TARGET}-gcc" \
+AR="${CLFS_TARGET}-ar" \
+RANLIB="${CLFS_TARGET}-ranlib" \
+../glibc-&glibc-version;/configure \
+    --prefix=/tools \
+    --host=${CLFS_TARGET} \
+    --build=${CLFS_HOST} \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --with-binutils=/cross-tools/bin \
+    --with-headers=/tools/include \
     --enable-obsolete-rpc</userinput></screen>
 
Index: BOOK/cross-tools/common/gmp.xml
===================================================================
--- BOOK/cross-tools/common/gmp.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/gmp.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,5 +39,7 @@
     <para os="a">Prepare GMP for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/cross-tools --enable-cxx \
+<screen os="b"><userinput>./configure \
+    --prefix=/cross-tools \
+    --enable-cxx \
     --disable-static</userinput></screen>
 
Index: BOOK/cross-tools/common/isl.xml
===================================================================
--- BOOK/cross-tools/common/isl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/isl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
 
 <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-./configure --prefix=/cross-tools --disable-static \
+./configure \
+    --prefix=/cross-tools \
+    --disable-static \
     --with-gmp-prefix=/cross-tools</userinput></screen>
 
Index: BOOK/cross-tools/common/m4.xml
===================================================================
--- BOOK/cross-tools/common/m4.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/m4.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,5 +31,6 @@
     <para os="a">Prepare M4 for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/cross-tools</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/cross-tools/common/mpc.xml
===================================================================
--- BOOK/cross-tools/common/mpc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/mpc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,9 @@
 
 <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-./configure --prefix=/cross-tools --disable-static \
-    --with-gmp=/cross-tools --with-mpfr=/cross-tools</userinput></screen>
+./configure \
+    --prefix=/cross-tools \
+    --disable-static \
+    --with-gmp=/cross-tools \
+    --with-mpfr=/cross-tools</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/cross-tools/common/mpfr.xml
===================================================================
--- BOOK/cross-tools/common/mpfr.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/mpfr.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,6 +34,8 @@
 
 <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-./configure --prefix=/cross-tools \
-    --disable-static --with-gmp=/cross-tools</userinput></screen>
+./configure \
+    --prefix=/cross-tools \
+    --disable-static \
+    --with-gmp=/cross-tools</userinput></screen>
 
     <variablelist os="b1">
Index: BOOK/cross-tools/common/ncurses.xml
===================================================================
--- BOOK/cross-tools/common/ncurses.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/ncurses.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -43,5 +43,6 @@
     <para os="a">Prepare Ncurses for compilation:</para>
 
-<screen os="b"><userinput>AWK=gawk ./configure --prefix=/cross-tools \
+<screen os="b"><userinput>AWK=gawk ./configure \
+    --prefix=/cross-tools \
     --without-debug</userinput></screen>
 
Index: BOOK/cross-tools/common/pkg-config-lite.xml
===================================================================
--- BOOK/cross-tools/common/pkg-config-lite.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/common/pkg-config-lite.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,5 +35,7 @@
     <para os="b">Prepare Pkg-config-lite for compilation:</para>
 
-<screen os="c"><userinput>./configure --prefix=/cross-tools --host=${CLFS_TARGET}\
+<screen os="c"><userinput>./configure \
+    --prefix=/cross-tools \
+    --host=${CLFS_TARGET} \
     --with-pc-path=/tools/lib/pkgconfig:/tools/share/pkgconfig</userinput></screen>
 
Index: BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -59,12 +59,23 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --with-sysroot=${CLFS} --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include --disable-static \
-    --enable-languages=c,c++ --disable-multilib --with-mpc=/cross-tools \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-isl=/cross-tools \
-    --with-system-zlib --with-abi=64</userinput></screen>
+<screen os="bf"><userinput>AR=ar \
+LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+../gcc-&gcc-version;/configure \
+    --prefix=/cross-tools \
+    --build=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --host=${CLFS_HOST} \
+    --with-sysroot=${CLFS} \
+    --with-local-prefix=/tools \
+    --with-native-system-header-dir=/tools/include \
+    --disable-static \
+    --enable-languages=c,c++ \
+    --disable-multilib \
+    --with-mpc=/cross-tools \
+    --with-mpfr=/cross-tools \
+    --with-gmp=/cross-tools \
+    --with-isl=/cross-tools \
+    --with-system-zlib \
+    --with-abi=64</userinput></screen>
 
     <variablelist os="bg">
Index: BOOK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-static.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/mips64-64/gcc-static.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -72,16 +72,36 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include --disable-shared \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-isl=/cross-tools \
-    --with-mpc=/cross-tools --without-headers --with-newlib \
-    --disable-decimal-float --disable-libgomp --disable-libssp \
-    --disable-libatomic --disable-libitm --disable-libsanitizer \
-    --disable-libquadmath --disable-libvtv --disable-libcilkrts \
-    --disable-libcilkrts --disable-threads --disable-multilib \
-    --with-system-zlib --enable-languages=c --with-abi=64 \
+<screen os="al"><userinput>AR=ar \
+LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+../gcc-&gcc-version;/configure \
+    --prefix=/cross-tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} \
+    --with-local-prefix=/tools \
+    --with-native-system-header-dir=/tools/include \
+    --disable-shared \
+    --with-mpfr=/cross-tools \
+    --with-gmp=/cross-tools \
+    --with-isl=/cross-tools \
+    --with-mpc=/cross-tools \
+    --without-headers \
+    --with-newlib \
+    --disable-decimal-float \
+    --disable-libgomp \
+    --disable-libssp \
+    --disable-libatomic \
+    --disable-libitm \
+    --disable-libsanitizer \
+    --disable-libquadmath \
+    --disable-libvtv \
+    --disable-libcilkrts \
+    --disable-libcilkrts \
+    --disable-threads \
+    --disable-multilib \
+    --with-system-zlib \
+    --enable-languages=c \
+    --with-abi=64 \
     --with-glibc-version=&glibc-version;</userinput></screen>
 
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/mips64/glibc-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -45,10 +45,16 @@
 
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILDN32}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+../glibc-&glibc-version;/configure \
+    --prefix=/tools \
+    --host=${CLFS_TARGET} \
+    --build=${CLFS_HOST} \
+    --libdir=/tools/lib32 \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --with-binutils=/cross-tools/bin \
+    --with-headers=/tools/include \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="fa">
Index: BOOK/cross-tools/multilib/binutils.xml
===================================================================
--- BOOK/cross-tools/multilib/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/multilib/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -48,9 +48,18 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \
-    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
-    --disable-nls --disable-static --enable-64-bit-bfd --enable-gold=yes \
-    --enable-plugins --enable-threads --disable-werror</userinput></screen>
+<screen os="bc"><userinput>AR=ar AS=as \
+../binutils-&binutils-dir;/configure \
+    --prefix=/cross-tools \
+    --host=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} \
+    --with-lib-path=/tools/lib:/tools/lib64 \
+    --disable-nls \
+    --disable-static \
+    --enable-64-bit-bfd \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads \
+    --disable-werror</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/cross-tools/multilib/gcc-final.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-final.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/multilib/gcc-final.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -59,11 +59,21 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --with-sysroot=${CLFS} --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include --disable-static \
-    --enable-languages=c,c++ --with-mpc=/cross-tools --with-mpfr=/cross-tools \
-    --with-gmp=/cross-tools --with-isl=/cross-tools --with-system-zlib</userinput></screen>
+<screen os="bf"><userinput>AR=ar \
+LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+../gcc-&gcc-version;/configure \
+    --prefix=/cross-tools \
+    --build=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --host=${CLFS_HOST} \
+    --with-sysroot=${CLFS} \
+    --with-local-prefix=/tools \
+    --with-native-system-header-dir=/tools/include \
+    --disable-static \
+    --enable-languages=c,c++ \
+    --with-mpc=/cross-tools \
+    --with-mpfr=/cross-tools \
+    --with-gmp=/cross-tools \
+    --with-isl=/cross-tools \
+    --with-system-zlib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/multilib/gcc-static.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-static.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/multilib/gcc-static.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -72,15 +72,34 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include --disable-shared \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-mpc=/cross-tools \
-    --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
-    --disable-libssp --disable-libatomic --disable-libitm \
-    --disable-libsanitizer --disable-libquadmath --disable-libvtv \
-    --disable-libcilkrts --disable-libstdc++-v3 --disable-threads \
-    --with-system-zlib --with-isl=/cross-tools --enable-languages=c \
+<screen os="al"><userinput>AR=ar \
+LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+../gcc-&gcc-version;/configure \
+    --prefix=/cross-tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_HOST} \
+    --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} \
+    --with-local-prefix=/tools \
+    --with-native-system-header-dir=/tools/include \
+    --disable-shared \
+    --with-mpfr=/cross-tools \
+    --with-gmp=/cross-tools \
+    --with-mpc=/cross-tools \
+    --without-headers \
+    --with-newlib \
+    --disable-decimal-float \
+    --disable-libgomp \
+    --disable-libssp \
+    --disable-libatomic \
+    --disable-libitm \
+    --disable-libsanitizer \
+    --disable-libquadmath \
+    --disable-libvtv \
+    --disable-libcilkrts \
+    --disable-libstdc++-v3 \
+    --disable-threads \
+    --with-system-zlib \
+    --with-isl=/cross-tools \ 
+    --enable-languages=c \
     --with-glibc-version=&glibc-version;</userinput></screen>
 
Index: BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -45,10 +45,16 @@
 
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+../glibc-&glibc-version;/configure \
+    --prefix=/tools \
+    --host=${CLFS_TARGET} \
+    --build=${CLFS_HOST} \
+    --libdir=/tools/lib64 \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --with-binutils=/cross-tools/bin \
+    --with-headers=/tools/include \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
Index: BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/multilib/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -40,9 +40,13 @@
 
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
+AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+../glibc-&glibc-version;/configure \
+    --prefix=/tools \
+    --host=${CLFS_TARGET32} \
+    --build=${CLFS_HOST} \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --with-binutils=/cross-tools/bin \
+    --with-headers=/tools/include \
     --enable-obsolete-rpc</userinput></screen>
 
Index: BOOK/cross-tools/multilib/pkg-config-lite.xml
===================================================================
--- BOOK/cross-tools/multilib/pkg-config-lite.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/multilib/pkg-config-lite.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,5 +31,7 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>./configure --prefix=/cross-tools --host=${CLFS_TARGET} \
+<screen os="c"><userinput>./configure \
+    --prefix=/cross-tools \
+    --host=${CLFS_TARGET} \
     --with-pc-path=/tools/lib64/pkgconfig:/tools/share/pkgconfig</userinput></screen>
 
Index: BOOK/cross-tools/ppc64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/gcc-static.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/cross-tools/ppc64-64/gcc-static.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -40,5 +40,5 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
-    <screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
+<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/64/binutils.xml
===================================================================
--- BOOK/final-system/64/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/64/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -65,8 +65,13 @@
 <screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ../binutils-&binutils-dir;/configure --prefix=/usr \
-    --libdir=/usr/lib --enable-shared \
-    --disable-multilib --enable-64-bit-bfd \
-    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
+../binutils-&binutils-dir;/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --enable-shared \
+    --disable-multilib \
+    --enable-64-bit-bfd \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/common/autoconf.xml
===================================================================
--- BOOK/final-system/common/autoconf.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/autoconf.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
     <para os="a">Prepare Autoconf for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/automake.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para os="a">Prepare Automake for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/bash.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -32,6 +32,9 @@
     <para os="a">Prepare Bash for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline \
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --without-bash-malloc \
+    --with-installed-readline \
     --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
 
Index: BOOK/final-system/common/bc.xml
===================================================================
--- BOOK/final-system/common/bc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/bc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,6 +31,9 @@
     <para os="a">Prepare Bc for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --with-readline \
-    --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --with-readline \
+    --mandir=/usr/share/man \
+    --infodir=/usr/share/info</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/binutils.xml
===================================================================
--- BOOK/final-system/common/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -57,6 +57,10 @@
 <screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ../binutils-&binutils-dir;/configure --prefix=/usr \
-    --enable-shared --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
+../binutils-&binutils-dir;/configure \
+    --prefix=/usr \
+    --enable-shared \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads</userinput></screen>
 
     <para os="j">Compile the package:</para>
Index: BOOK/final-system/common/bison.xml
===================================================================
--- BOOK/final-system/common/bison.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/bison.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,6 @@
     <para os="a">Prepare Bison for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/coreutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,7 +36,9 @@
 
 <screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 \
-  ./configure --prefix=/usr \
+./configure \
+    --prefix=/usr \
     --enable-no-install-program=kill,uptime \
-    --enable-install-program=hostname --libexecdir=/usr/lib</userinput></screen>
+    --enable-install-program=hostname \
+    --libexecdir=/usr/lib</userinput></screen>
 
     <variablelist os="d1">
Index: BOOK/final-system/common/diffutils.xml
===================================================================
--- BOOK/final-system/common/diffutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/diffutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -32,5 +32,6 @@
     <para os="a">Prepare Diffutils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="s3">Diffutils wants <command>ed</command> as the default editor
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -37,7 +37,13 @@
     <para os="c">Prepare E2fsprogs for compilation:</para>
 
-<screen os="d"><userinput>../configure --prefix=/usr --bindir=/bin \
-    --with-root-prefix="" --enable-elf-shlibs --disable-libblkid \
-    --disable-libuuid --disable-fsck --disable-uuidd</userinput></screen>
+<screen os="d"><userinput>../configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --with-root-prefix="" \
+    --enable-elf-shlibs \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
+    --disable-uuidd</userinput></screen>
 
     <variablelist os="e">
Index: BOOK/final-system/common/expat.xml
===================================================================
--- BOOK/final-system/common/expat.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/expat.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,6 @@
     <para os="a">Prepare Expat for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/file.xml
===================================================================
--- BOOK/final-system/common/file.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/file.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
     <para os="a">Prepare File for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/findutils.xml
===================================================================
--- BOOK/final-system/common/findutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/findutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
     <para os="a">Prepare Findutils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/locate \
     --localstatedir=/var/lib/locate</userinput></screen>
 
Index: BOOK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/flex.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para os="a">Prepare Flex for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/gawk.xml
===================================================================
--- BOOK/final-system/common/gawk.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/gawk.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para os="a">Prepare Gawk for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,5 @@
     &gcc-version; branch by the GCC developers:</para>
 
-    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
 
     <para os="fix1">Apply a <command>sed</command> substitution that will
@@ -47,8 +47,12 @@
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-languages=c,c++ \
-    --disable-multilib --with-system-zlib \
-    --enable-install-libiberty --disable-bootstrap</userinput></screen>
+../gcc-&gcc-version;/configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib \
+    --enable-languages=c,c++ \
+    --disable-multilib \
+    --with-system-zlib \
+    --enable-install-libiberty \
+    --disable-bootstrap</userinput></screen>
 
     <variablelist os="i1">
Index: BOOK/final-system/common/gdbm.xml
===================================================================
--- BOOK/final-system/common/gdbm.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/gdbm.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
     <para os="a">Prepare GDBM for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --enable-libgdbm-compat</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --enable-libgdbm-compat</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/common/gettext.xml
===================================================================
--- BOOK/final-system/common/gettext.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/gettext.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
     <para os="a">Prepare Gettext for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -68,6 +68,9 @@
     <para os="g">Prepare Glibc for compilation:</para>
 
-<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; --libexecdir=/usr/lib/glibc \
+<screen os="h"><userinput>../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
     --enable-obsolete-rpc</userinput></screen>
 
Index: BOOK/final-system/common/gmp.xml
===================================================================
--- BOOK/final-system/common/gmp.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/gmp.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -51,6 +51,8 @@
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --enable-cxx \
-  --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --enable-cxx \
+    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/grep.xml
===================================================================
--- BOOK/final-system/common/grep.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/grep.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -32,5 +32,7 @@
     <para os="a">Prepare Grep for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --bindir=/bin</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/groff.xml
===================================================================
--- BOOK/final-system/common/groff.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/groff.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -33,5 +33,6 @@
     <para os="b">Prepare Groff for compilation:</para>
 
-<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr</userinput></screen>
+<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="d">Compile the package:</para>
Index: BOOK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/gzip.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para os="a">Prepare Gzip for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --bindir=/bin</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/isl.xml
===================================================================
--- BOOK/final-system/common/isl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/isl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,6 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr</userinput></screen>
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/kbd.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,8 @@
 
 <screen os="b"><userinput>PKG_CONFIG_PATH="/tools/lib/pkgconfig" \
-    ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --disable-vlock \
+    --enable-optional-progs</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/common/kmod.xml
===================================================================
--- BOOK/final-system/common/kmod.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/kmod.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,8 +29,11 @@
     <para os="a">Prepare Kmod for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr \
-    --bindir=/bin --sysconfdir=/etc \
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --sysconfdir=/etc \
     --with-rootlibdir=/lib \
-    --with-zlib --with-xz</userinput></screen>
+    --with-zlib \
+    --with-xz</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/common/less.xml
===================================================================
--- BOOK/final-system/common/less.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/less.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,7 @@
     <para os="a">Prepare Less for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/libpipeline.xml
===================================================================
--- BOOK/final-system/common/libpipeline.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/libpipeline.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para os="a">Prepare Libpipeline for compilation:</para>
 
-<screen os="b"><userinput>PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>PKG_CONFIG_PATH=/tools/lib/pkgconfig \
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/libtool.xml
===================================================================
--- BOOK/final-system/common/libtool.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/libtool.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,6 @@
     <para os="a">Prepare Libtool for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/m4.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,6 @@
     <para os="a">Prepare M4 for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/make.xml
===================================================================
--- BOOK/final-system/common/make.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/make.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,6 @@
     <para os="a">Prepare Make for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/man-db.xml
===================================================================
--- BOOK/final-system/common/man-db.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/man-db.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,8 +28,13 @@
     <para os="a">Prepare Man-DB for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib \
-    --docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \
-    --disable-setuid --with-browser=/usr/bin/lynx \
-    --with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib \
+    --docdir=/usr/share/doc/man-db-&man-db-version; \
+    --sysconfdir=/etc \
+    --disable-setuid \
+    --with-browser=/usr/bin/lynx \
+    --with-vgrind=/usr/bin/vgrind \
+    --with-grap=/usr/bin/grap</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/common/mpc.xml
===================================================================
--- BOOK/final-system/common/mpc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/mpc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/mpfr.xml
===================================================================
--- BOOK/final-system/common/mpfr.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/mpfr.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -33,6 +33,8 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-    LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-    ./configure --prefix=/usr --with-gmp=/usr \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+./configure \
+    --prefix=/usr \
+    --with-gmp=/usr \
     --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
Index: BOOK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/ncurses.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -33,7 +33,12 @@
     <para os="a">Prepare Ncurses for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
-    --with-shared --without-debug --enable-widec \
-    --with-manpage-format=normal --enable-pc-files \
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --libdir=/lib \
+    --with-shared \
+    --without-debug \
+    --enable-widec \
+    --with-manpage-format=normal \
+    --enable-pc-files \
     --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
Index: BOOK/final-system/common/patch.xml
===================================================================
--- BOOK/final-system/common/patch.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/patch.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,6 @@
     <para os="a">Prepare Patch for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/perl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -52,10 +52,11 @@
     that Perl auto-detects, prepare Perl for compilation with:</para>
 
-<screen os="b"><userinput>./configure.gnu --prefix=/usr \
-   -Dvendorprefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dusethreads -Duseshrplib</userinput></screen>
+<screen os="b"><userinput>./configure.gnu \
+    --prefix=/usr \
+    -Dvendorprefix=/usr \
+    -Dman1dir=/usr/share/man/man1 \
+    -Dman3dir=/usr/share/man/man3 \
+    -Dpager="/bin/less -isR" \
+    -Dusethreads -Duseshrplib</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/common/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/common/pkg-config-lite.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/pkg-config-lite.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para os="a">Prepare Pkg-config-lite for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version;</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/pkgmgt.xml
===================================================================
--- BOOK/final-system/common/pkgmgt.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/pkgmgt.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -149,5 +149,6 @@
       not install the package properly:</para>
 
-<screen role="nodump"><userinput>./configure --prefix=/usr/pkg/libfoo/1.1
+<screen role="nodump"><userinput>./configure \
+    --prefix=/usr/pkg/libfoo/1.1
 make
 make install</userinput></screen>
@@ -162,5 +163,6 @@
       approach works as follows:</para>
 
-<screen role="nodump"><userinput>./configure --prefix=/usr
+<screen role="nodump"><userinput>./configure \
+    --prefix=/usr
 make
 make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
Index: BOOK/final-system/common/procps-ng.xml
===================================================================
--- BOOK/final-system/common/procps-ng.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/procps-ng.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,6 +28,9 @@
     <para os="a">Prepare procps-ng for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix= \
-    --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --exec-prefix= \
+    --libdir=/usr/lib \
+    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
     --disable-kill</userinput></screen>
 
Index: BOOK/final-system/common/psmisc.xml
===================================================================
--- BOOK/final-system/common/psmisc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/psmisc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
     <para os="a">Prepare Psmisc for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/readline.xml
===================================================================
--- BOOK/final-system/common/readline.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/readline.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -33,5 +33,7 @@
     <para os="a">Prepare Readline for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --libdir=/lib \
     --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
 
Index: BOOK/final-system/common/sed.xml
===================================================================
--- BOOK/final-system/common/sed.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/sed.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,7 @@
     <para os="a">Prepare Sed for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --bindir=/bin \
     --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/shadow.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -51,5 +51,6 @@
     <para os="d">Prepare Shadow for compilation:</para>
 
-<screen os="e"><userinput>./configure --sysconfdir=/etc</userinput></screen>
+<screen os="e"><userinput>./configure \
+    --sysconfdir=/etc</userinput></screen>
 
 <para os="f">The meaning of the new configure option:</para>
Index: BOOK/final-system/common/tar.xml
===================================================================
--- BOOK/final-system/common/tar.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/tar.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,6 +28,8 @@
     <para os="a">Prepare Tar for compilation:</para>
 
-<screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr \
-    --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+<screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 ./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --libexecdir=/usr/sbin</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/temp-perl.xml
===================================================================
--- BOOK/final-system/common/temp-perl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/temp-perl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -40,5 +40,7 @@
 <para os="c">Prepare Temporary Perl for compilation:</para>
 
-<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dcc="gcc"</userinput></screen>
+<screen os="d"><userinput>./configure.gnu \
+    --prefix=/tools \
+    -Dcc="gcc"</userinput></screen>
 
     <variablelist os="e">
Index: BOOK/final-system/common/texinfo.xml
===================================================================
--- BOOK/final-system/common/texinfo.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/texinfo.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
     <para os="a">Prepare Texinfo for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/util-linux.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -42,6 +42,8 @@
     <para os="a">Prepare Util-linux for compilation:</para>
 
-<screen os="b"><userinput>./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+<screen os="b"><userinput>./configure \
+    ADJTIME_PATH=/var/lib/hwclock/adjtime \
+    --enable-write \
+    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/vim.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -47,5 +47,6 @@
     <para os="d">Prepare Vim for compilation:</para>
 
-<screen os="e"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="e"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="g">Compile the package:</para>
Index: BOOK/final-system/common/xz.xml
===================================================================
--- BOOK/final-system/common/xz.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/xz.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
     <para os="a">Prepare XZ Utils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/zlib.xml
===================================================================
--- BOOK/final-system/common/zlib.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/common/zlib.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,5 +31,6 @@
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr</userinput></screen>
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/mips/dvhtool.xml
===================================================================
--- BOOK/final-system/mips/dvhtool.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/mips/dvhtool.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -38,5 +38,6 @@
     <para os="d">Prepare Dvhtool  for compilation:</para>
 
-<screen os="e"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="e"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
 
     <para os="f">Compile the package:</para>
Index: BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/mips64-64/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -65,6 +65,6 @@
     n32 with the following sed:</para>
 
-    <screen><userinput>sed -i '/default) machine=/s/n32/64/g' \
-       ports/sysdeps/mips/preconfigure</userinput></screen>
+<screen><userinput>sed -i '/default) machine=/s/n32/64/g' \
+    ports/sysdeps/mips/preconfigure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/binutils.xml
===================================================================
--- BOOK/final-system/mips64/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/mips64/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -65,7 +65,12 @@
 <screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib ${BUILD64}" \
-  ../binutils-&binutils-dir;/configure --prefix=/usr \
-    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64 \
-    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
+../binutils-&binutils-dir;/configure \
+    --prefix=/usr \
+    --enable-shared \
+    --enable-64-bit-bfd \
+    --libdir=/usr/lib64 \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/dvhtool.xml
===================================================================
--- BOOK/final-system/mips64/dvhtool.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/mips64/dvhtool.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -38,5 +38,7 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="e"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/mips64/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -53,7 +53,13 @@
 CXX="g++ -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib" \
-  ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --with-abi=64 --enable-languages=c,c++ \
-    --with-system-zlib --enable-install-libiberty --disable-bootstrap</userinput></screen>
+../gcc-&gcc-version;/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64 \
+    --with-abi=64 \
+    --enable-languages=c,c++ \
+    --with-system-zlib \
+    --enable-install-libiberty \
+    --disable-bootstrap</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/mips64/glibc-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -53,8 +53,12 @@
 
 <screen os="h"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib32/glibc --libdir=/usr/lib32 \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib32/glibc \
+    --libdir=/usr/lib32 \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="i">
Index: BOOK/final-system/multilib/autoconf.xml
===================================================================
--- BOOK/final-system/multilib/autoconf.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/autoconf.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/automake.xml
===================================================================
--- BOOK/final-system/multilib/automake.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/automake.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr \
     --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/bash.xml
===================================================================
--- BOOK/final-system/multilib/bash.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/bash.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -40,6 +40,9 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline \
+./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --without-bash-malloc \
+    --with-installed-readline \
     --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/bc.xml
===================================================================
--- BOOK/final-system/multilib/bc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/bc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,6 +34,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --infodir=/usr/share/info</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/binutils.xml
===================================================================
--- BOOK/final-system/multilib/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -65,7 +65,12 @@
 <screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
-  ../binutils-&binutils-dir;/configure --prefix=/usr \
-    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64 \
-    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
+../binutils-&binutils-dir;/configure \
+    --prefix=/usr \
+    --enable-shared \
+    --enable-64-bit-bfd \
+    --libdir=/usr/lib64 \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/bison-64bit.xml
===================================================================
--- BOOK/final-system/multilib/bison-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/bison-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+CXX="g++ ${BUILD64}" \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/bison-n32.xml
===================================================================
--- BOOK/final-system/multilib/bison-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/bison-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" \
+CXX="g++ ${BUILDN32}" \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/bison.xml
===================================================================
--- BOOK/final-system/multilib/bison.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/bison.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ./configure --prefix=/usr</userinput></screen>
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/coreutils.xml
===================================================================
--- BOOK/final-system/multilib/coreutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/coreutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,6 +34,8 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \
-   ./configure --prefix=/usr \
+<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 \
+CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr \
     --enable-no-install-program=kill,uptime \
     --enable-install-program=hostname</userinput></screen>
Index: BOOK/final-system/multilib/diffutils.xml
===================================================================
--- BOOK/final-system/multilib/diffutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/diffutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,5 +34,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -41,7 +41,13 @@
 <screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
 CC="gcc ${BUILD64}"  \
-../configure --prefix=/usr --bindir=/bin --with-root-prefix="" \
-    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
-    --disable-fsck --disable-uuidd</userinput></screen>
+../configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --with-root-prefix="" \
+    --enable-elf-shlibs \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
+    --disable-uuidd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -42,7 +42,13 @@
 <screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
 CC="gcc ${BUILDN32}" \
-../configure --prefix=/usr --bindir=/bin --with-root-prefix="" \
-    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
-    --disable-fsck --disable-uuidd</userinput></screen>
+../configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --with-root-prefix="" \
+    --enable-elf-shlibs \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
+    --disable-uuidd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/e2fsprogs.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -37,7 +37,13 @@
 <screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
 CC="gcc ${BUILD32}" \
-../configure --prefix=/usr --bindir=/bin --with-root-prefix="" \
-    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
-    --disable-fsck --disable-uuidd</userinput></screen>
+../configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --with-root-prefix="" \
+    --enable-elf-shlibs \
+    --disable-libblkid \
+    --disable-libuuid \
+    --disable-fsck \
+    --disable-uuidd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/eudev-n32.xml
===================================================================
--- BOOK/final-system/multilib/eudev-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/eudev-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,9 +29,21 @@
 <screen os="b"><userinput>
 PKG_CONFIG_PATH=${PKG_CONFIG_PATHN32} \
-CC="gcc ${BUILDN32}" ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-rootprefix="" --libexecdir=/lib32 --enable-split-usr \
-    --libdir=/usr/lib32 --with-rootlibdir=/lib32 --sbindir=/sbin \
-    --bindir=/sbin --enable-rule_generator --disable-introspection \
-    --disable-keymap --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
+CC="gcc ${BUILDN32}" \
+./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-rootprefix="" \
+    --libexecdir=/lib32 \
+    --enable-split-usr \
+    --libdir=/usr/lib32 \
+    --with-rootlibdir=/lib32 \
+    --sbindir=/sbin \
+    --bindir=/sbin \
+    --enable-rule_generator \
+    --disable-introspection \
+    --disable-keymap \
+    --disable-gudev \
+    --disable-gtk-doc-html \
+    --enable-libkmod</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/expat-64bit.xml
===================================================================
--- BOOK/final-system/multilib/expat-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/expat-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
-    --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/expat-n32.xml
===================================================================
--- BOOK/final-system/multilib/expat-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/expat-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/expat.xml
===================================================================
--- BOOK/final-system/multilib/expat.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/expat.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure \
-    --prefix=/usr --libdir=/usr/lib</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/file-64bit.xml
===================================================================
--- BOOK/final-system/multilib/file-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/file-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/file-n32.xml
===================================================================
--- BOOK/final-system/multilib/file-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/file-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/file.xml
===================================================================
--- BOOK/final-system/multilib/file.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/file.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" \
+./configure \
+    --prefix=/usr</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/findutils.xml
===================================================================
--- BOOK/final-system/multilib/findutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/findutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libexecdir=/usr/lib64/locate --localstatedir=/var/lib64/locate</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib64/locate \
+    --localstatedir=/var/lib64/locate</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- BOOK/final-system/multilib/flex-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/flex-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex-n32.xml
===================================================================
--- BOOK/final-system/multilib/flex-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/flex-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex.xml
===================================================================
--- BOOK/final-system/multilib/flex.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/flex.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+    --prefix=/usr \
     --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/gawk.xml
===================================================================
--- BOOK/final-system/multilib/gawk.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gawk.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libexecdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -53,7 +53,12 @@
 CXX="g++ -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \
-  ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --enable-languages=c,c++ \
-    --with-system-zlib --enable-install-libiberty --disable-bootstrap</userinput></screen>
+../gcc-&gcc-version;/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64 \
+    --enable-languages=c,c++ \
+    --with-system-zlib \
+    --enable-install-libiberty \
+    --disable-bootstrap</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gdbm-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gdbm-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gdbm-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" \
-  ./configure --prefix=/usr --enable-libgdbm-compat --libdir=/usr/lib64</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --enable-libgdbm-compat \
+    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gdbm-n32.xml
===================================================================
--- BOOK/final-system/multilib/gdbm-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gdbm-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" \
-  ./configure --prefix=/usr --enable-libgdbm-compat --libdir=/usr/lib32</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --enable-libgdbm-compat \
+    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gdbm.xml
===================================================================
--- BOOK/final-system/multilib/gdbm.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gdbm.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" \
-  ./configure --prefix=/usr --enable-libgdbm-compat</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --enable-libgdbm-compat</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gettext-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gettext-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gettext-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/usr/lib64 \
-   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gettext-n32.xml
===================================================================
--- BOOK/final-system/multilib/gettext-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gettext-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,6 +28,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/usr/lib32 \
-   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gettext.xml
===================================================================
--- BOOK/final-system/multilib/gettext.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gettext.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,6 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr \
-   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -53,8 +53,12 @@
 
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib64/glibc \
+    --libdir=/usr/lib64 \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="i">
Index: BOOK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -52,7 +52,10 @@
 
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32} \
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
+    --host=${CLFS_TARGET32} \
     --enable-obsolete-rpc</userinput></screen>
 
Index: BOOK/final-system/multilib/gmp-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gmp-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gmp-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -43,6 +43,8 @@
 CXX="g++ -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --enable-cxx \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --enable-cxx \
     --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/gmp-n32.xml
===================================================================
--- BOOK/final-system/multilib/gmp-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gmp-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -45,6 +45,8 @@
 CXX="g++ -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ABI=n32 ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --enable-cxx</userinput></screen>
+  ABI=n32 ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --enable-cxx</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gmp.xml
===================================================================
--- BOOK/final-system/multilib/gmp.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gmp.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -44,5 +44,7 @@
 CXX="g++ -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ABI=32 ./configure --prefix=/usr --enable-cxx</userinput></screen>
+  ABI=32 ./configure \
+    --prefix=/usr \
+    --enable-cxx</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/grep.xml
===================================================================
--- BOOK/final-system/multilib/grep.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/grep.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,6 +34,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --bindir=/bin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/groff.xml
===================================================================
--- BOOK/final-system/multilib/groff.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/groff.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,5 +31,7 @@
 
 <screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
-   CXX="g++ ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+CXX="g++ ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gzip.xml
===================================================================
--- BOOK/final-system/multilib/gzip.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/gzip.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr \
+    --bindir=/bin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/isl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/isl-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/isl-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/isl-n32.xml
===================================================================
--- BOOK/final-system/multilib/isl-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/isl-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/isl.xml
===================================================================
--- BOOK/final-system/multilib/isl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/isl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --host=${CLFS_TARGET32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/kbd.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="/tools/lib64/pkgconfig" \
-    ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --disable-vlock \
+    --enable-optional-progs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/kmod-64bit.xml
===================================================================
--- BOOK/final-system/multilib/kmod-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/kmod-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,8 +27,12 @@
 
 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
-  ./configure --prefix=/usr \
-    --bindir=/bin --sysconfdir=/etc \
-    --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
-    --with-zlib --with-xz</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --sysconfdir=/etc \
+    --with-rootlibdir=/lib64 \
+    --libdir=/usr/lib64 \
+    --with-zlib \
+    --with-xz</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/kmod-n32.xml
===================================================================
--- BOOK/final-system/multilib/kmod-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/kmod-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,8 +28,12 @@
 
 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
-  ./configure --prefix=/usr \
-    --bindir=/bin --sysconfdir=/etc \
-    --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
-    --with-zlib --with-xz</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --sysconfdir=/etc \
+    --with-rootlibdir=/lib32 \
+    --libdir=/usr/lib32 \
+    --with-zlib \
+    --with-xz</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/kmod.xml
===================================================================
--- BOOK/final-system/multilib/kmod.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/kmod.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,8 +28,12 @@
 
 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
-  ./configure --prefix=/usr \
-    --bindir=/bin --sysconfdir=/etc \
-    --with-rootlibdir=/lib --libdir=/usr/lib \
-    --with-zlib --with-xz</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --sysconfdir=/etc \
+    --with-rootlibdir=/lib \
+    --libdir=/usr/lib \
+    --with-zlib \
+    --with-xz</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/less.xml
===================================================================
--- BOOK/final-system/multilib/less.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/less.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc</userinput></screen>
 
Index: BOOK/final-system/multilib/libpipeline-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libpipeline-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/libpipeline-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,7 @@
 <screen os="b"><userinput>PKG_CONFIG_PATH=/tools/lib64/pkgconfig
     CC="gcc ${BUILD64}" \
-    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/libpipeline-n32.xml
===================================================================
--- BOOK/final-system/multilib/libpipeline-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/libpipeline-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" \
-  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/libpipeline.xml
===================================================================
--- BOOK/final-system/multilib/libpipeline.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/libpipeline.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" \
-  ./configure --prefix=/usr</userinput></screen>
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/libtool-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libtool-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/libtool-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,5 @@
     xpointer="xpointer(//*[@os='a1'])"/>
 
- <screen os="a2"><userinput>echo "lt_cv_sys_dlsearch_path='/lib64 /usr/lib64 /usr/local/lib64 /opt/lib64'" &gt; config.cache</userinput></screen>
+<screen os="a2"><userinput>echo "lt_cv_sys_dlsearch_path='/lib64 /usr/lib64 /usr/local/lib64 /opt/lib64'" &gt; config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -32,6 +32,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libdir=/usr/lib64 --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/libtool-n32.xml
===================================================================
--- BOOK/final-system/multilib/libtool-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/libtool-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -33,6 +33,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32 --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/libtool.xml
===================================================================
--- BOOK/final-system/multilib/libtool.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/libtool.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -37,5 +37,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+    --prefix=/usr \
     --cache-file=config.cache</userinput></screen>
 
Index: BOOK/final-system/multilib/m4.xml
===================================================================
--- BOOK/final-system/multilib/m4.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/m4.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/make.xml
===================================================================
--- BOOK/final-system/multilib/make.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/make.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/man-db.xml
===================================================================
--- BOOK/final-system/multilib/man-db.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/man-db.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,8 +27,15 @@
 
 <screen os="b"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-    CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/lib64 \
-    --docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \
-    --libdir=/usr/lib64 --disable-setuid --with-browser=/usr/bin/lynx \
-    --with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap</userinput></screen>
+    CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib64 \
+    --docdir=/usr/share/doc/man-db-&man-db-version; \
+    --sysconfdir=/etc \
+    --libdir=/usr/lib64 \
+    --disable-setuid \
+    --with-browser=/usr/bin/lynx \
+    --with-vgrind=/usr/bin/vgrind \
+    --with-grap=/usr/bin/grap</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/mpc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/mpc-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/mpc-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,6 +28,8 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64 \
-  --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/mpc-n32.xml
===================================================================
--- BOOK/final-system/multilib/mpc-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/mpc-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/mpc.xml
===================================================================
--- BOOK/final-system/multilib/mpc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/mpc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --host=${CLFS_TARGET32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/mpfr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/mpfr-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,5 +36,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
     LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-    ./configure --prefix=/usr --libdir=/usr/lib64 \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
     --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/mpfr-n32.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/mpfr-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -37,5 +37,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
     LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-    ./configure --prefix=/usr --libdir=/usr/lib32 \
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
     --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/mpfr.xml
===================================================================
--- BOOK/final-system/multilib/mpfr.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/mpfr.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -37,5 +37,7 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
     LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-    ./configure --prefix=/usr --host=${CLFS_TARGET32} \
+./configure \
+    --prefix=/usr \
+    --host=${CLFS_TARGET32} \
     --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/ncurses-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,8 +35,13 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/lib64 \
-   --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal --enable-pc-files \
-   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/lib64 \
+    --with-shared \
+    --without-debug \
+    --enable-widec \
+    --with-manpage-format=normal \
+    --enable-pc-files \
+    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/ncurses-n32.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/ncurses-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,8 +36,13 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/lib32 \
-   --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal --enable-pc-files \
-   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/lib32 \
+    --with-shared \
+    --without-debug \
+    --enable-widec \
+    --with-manpage-format=normal \
+    --enable-pc-files \
+    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/ncurses.xml
===================================================================
--- BOOK/final-system/multilib/ncurses.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/ncurses.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,8 +36,13 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr --libdir=/lib \
-   --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal --enable-pc-files \
-   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/lib \
+    --with-shared \
+    --without-debug \
+    --enable-widec \
+    --with-manpage-format=normal \
+    --enable-pc-files \
+    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/patch.xml
===================================================================
--- BOOK/final-system/multilib/patch.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/patch.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/perl-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/perl-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -46,12 +46,13 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure.gnu --prefix=/usr \
-   -Dvendorprefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
-   -Dcc="gcc ${BUILD64}" \
-   -Dusethreads -Duseshrplib</userinput></screen>
+<screen os="b"><userinput>./configure.gnu \
+    --prefix=/usr \
+    -Dvendorprefix=/usr \
+    -Dman1dir=/usr/share/man/man1 \
+    -Dman3dir=/usr/share/man/man3 \
+    -Dpager="/bin/less -isR" \
+    -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
+    -Dcc="gcc ${BUILD64}" \
+    -Dusethreads -Duseshrplib</userinput></screen>
 
     <variablelist os="m4">
Index: BOOK/final-system/multilib/perl-n32.xml
===================================================================
--- BOOK/final-system/multilib/perl-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/perl-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -49,12 +49,13 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure.gnu --prefix=/usr \
-   -Dvendorprefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dlibpth="/usr/local/lib32 /lib32 /usr/lib32" \
-   -Dcc="gcc ${BUILDN32}" \
-   -Dusethreads -Duseshrplib</userinput></screen>
+<screen os="b"><userinput>./configure.gnu \
+    --prefix=/usr \
+    -Dvendorprefix=/usr \
+    -Dman1dir=/usr/share/man/man1 \
+    -Dman3dir=/usr/share/man/man3 \
+    -Dpager="/bin/less -isR" \
+    -Dlibpth="/usr/local/lib32 /lib32 /usr/lib32" \
+    -Dcc="gcc ${BUILDN32}" \
+    -Dusethreads -Duseshrplib</userinput></screen>
 
     <variablelist os="m4">
Index: BOOK/final-system/multilib/perl.xml
===================================================================
--- BOOK/final-system/multilib/perl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/perl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -47,11 +47,12 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure.gnu --prefix=/usr \
-   -Dvendorprefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dcc="gcc ${BUILD32}" \
-   -Dusethreads -Duseshrplib</userinput></screen>
+<screen os="b"><userinput>./configure.gnu \
+    --prefix=/usr \
+    -Dvendorprefix=/usr \
+    -Dman1dir=/usr/share/man/man1 \
+    -Dman3dir=/usr/share/man/man3 \
+    -Dpager="/bin/less -isR" \
+    -Dcc="gcc ${BUILD32}" \
+    -Dusethreads -Duseshrplib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/multilib/pkg-config-lite.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/pkg-config-lite.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version; --with-pc-path=/usr/share/pkgconfig</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version; \
+    --with-pc-path=/usr/share/pkgconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/procps-ng-64bit.xml
===================================================================
--- BOOK/final-system/multilib/procps-ng-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/procps-ng-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --exec-prefix= \
-    --libdir=/usr/lib64 --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --exec-prefix= \
+    --libdir=/usr/lib64 \
+    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
     --disable-kill</userinput></screen>
 
Index: BOOK/final-system/multilib/procps-ng-n32.xml
===================================================================
--- BOOK/final-system/multilib/procps-ng-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/procps-ng-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --exec-prefix= \
-    --libdir=/usr/lib32 --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
+    --prefix=/usr \
+    --exec-prefix= \
+    --libdir=/usr/lib32 \
+    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
     --disable-kill</userinput></screen>
 
Index: BOOK/final-system/multilib/procps-ng.xml
===================================================================
--- BOOK/final-system/multilib/procps-ng.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/procps-ng.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr --exec-prefix= \
-    --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+    --prefix=/usr \
+    --exec-prefix= \
+    --libdir=/usr/lib \
+    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
     --disable-kill</userinput></screen>
 
Index: BOOK/final-system/multilib/psmisc.xml
===================================================================
--- BOOK/final-system/multilib/psmisc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/psmisc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/readline-64bit.xml
===================================================================
--- BOOK/final-system/multilib/readline-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/readline-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,5 +35,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/lib64 \
+./configure \
+    --prefix=/usr \
+    --libdir=/lib64 \
     --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/readline-n32.xml
===================================================================
--- BOOK/final-system/multilib/readline-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/readline-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,5 +36,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/lib32 \
+./configure \
+    --prefix=/usr \
+    --libdir=/lib32 \
     --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/readline.xml
===================================================================
--- BOOK/final-system/multilib/readline.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/readline.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,5 +36,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr --libdir=/lib \
+./configure \
+    --prefix=/usr \
+    --libdir=/lib \
     --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/sed.xml
===================================================================
--- BOOK/final-system/multilib/sed.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/sed.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/shadow.xml
===================================================================
--- BOOK/final-system/multilib/shadow.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/shadow.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -38,5 +38,6 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --sysconfdir=/etc</userinput></screen>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --sysconfdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/tar.xml
===================================================================
--- BOOK/final-system/multilib/tar.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/tar.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
 
 <screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \
-  ./configure --prefix=/usr \
-    --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --bindir=/bin \
+    --libexecdir=/usr/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/temp-perl.xml
===================================================================
--- BOOK/final-system/multilib/temp-perl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/temp-perl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,5 +39,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>./configure.gnu --prefix=/tools  -Dcc="gcc ${BUILD32}"</userinput></screen>
+<screen os="d"><userinput>./configure.gnu \
+    --prefix=/tools \
+    -Dcc="gcc ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/texinfo.xml
===================================================================
--- BOOK/final-system/multilib/texinfo.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/texinfo.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/util-linux-64bit-pass1.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit-pass1.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/util-linux-64bit-pass1.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,7 @@
 
 <screen os="be"><userinput>./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --libdir=/lib64 --enable-write --docdir=/usr/share/doc/util-linux-2.52.2</userinput></screen>
+    --libdir=/lib64 \
+    --enable-write \
+    --docdir=/usr/share/doc/util-linux-2.52.2</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/util-linux-64bit.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/util-linux-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,5 +31,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --libdir=/lib64 --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+    --libdir=/lib64 \
+    --enable-write \
+    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/util-linux-n32.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/util-linux-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure ADJTIME_PATH=/var/lib/hwclcock/adjtime \
-    --libdir=/lib32 --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+    --libdir=/lib32 \
+    --enable-write \
+    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/util-linux.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --libdir=/lib --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+    --libdir=/lib \
+    --enable-write \
+    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/vim.xml
===================================================================
--- BOOK/final-system/multilib/vim.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/vim.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -47,5 +47,6 @@
 
 <screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-  ./configure --prefix=/usr</userinput></screen>
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/xz-64bit.xml
===================================================================
--- BOOK/final-system/multilib/xz-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/xz-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,6 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
+    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/xz-n32.xml
===================================================================
--- BOOK/final-system/multilib/xz-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/xz-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/xz.xml
===================================================================
--- BOOK/final-system/multilib/xz.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/xz.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+    --prefix=/usr \
     --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
Index: BOOK/final-system/multilib/zlib-64bit.xml
===================================================================
--- BOOK/final-system/multilib/zlib-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/zlib-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -29,5 +29,7 @@
 CXX="g++ -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/zlib-n32.xml
===================================================================
--- BOOK/final-system/multilib/zlib-n32.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/zlib-n32.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
 CXX="g++ -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
- ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/zlib.xml
===================================================================
--- BOOK/final-system/multilib/zlib.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/multilib/zlib.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,6 @@
 CXX="g++ -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ./configure --prefix=/usr</userinput></screen>
+./configure \
+    --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc/hfsutils.xml
===================================================================
--- BOOK/final-system/ppc/hfsutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/ppc/hfsutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,5 +35,7 @@
     <para os="a">Prepare Hfsutils for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
+<screen><userinput>./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/ppc/parted.xml
===================================================================
--- BOOK/final-system/ppc/parted.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/ppc/parted.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,5 +30,7 @@
     <para os="a">Prepare Parted for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --disable-device-mapper</userinput></screen>
+<screen><userinput>./configure \
+    --prefix=/usr \
+    --disable-device-mapper</userinput></screen>
 
     <variablelist os="b">
Index: BOOK/final-system/ppc64-64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/ppc64-64/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -66,8 +66,12 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
+    --libdir=/usr/lib \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -117,5 +121,5 @@
     creating a symlink to the real loader.</para>
 
-    <screen><userinput>ln -sv &glibc-ld-name; /lib/ld.so.1</userinput></screen>
+<screen><userinput>ln -sv &glibc-ld-name; /lib/ld.so.1</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -129,5 +133,5 @@
     <para>Now we can remove this symlink:</para>
 
-    <screen><userinput>rm -v /lib/ld.so.1</userinput></screen>
+<screen><userinput>rm -v /lib/ld.so.1</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/ppc64/glibc-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -52,8 +52,12 @@
 
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib64/glibc \
+    --libdir=/usr/lib64 \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/ppc64/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -68,7 +68,10 @@
 
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32} \
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
+    --host=${CLFS_TARGET32} \
     --enable-obsolete-rpc</userinput></screen>
 
Index: BOOK/final-system/ppc64/hfsutils.xml
===================================================================
--- BOOK/final-system/ppc64/hfsutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/ppc64/hfsutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,5 +34,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
+<screen><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64/parted.xml
===================================================================
--- BOOK/final-system/ppc64/parted.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/ppc64/parted.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,5 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64 \
+<screen><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib64 \
     --disable-device-mapper</userinput></screen>
 
Index: BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/sparc64-64/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -74,8 +74,13 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+<screen os="h"><userinput>CC="gcc ${BUILD64}" \
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
+    --libdir=/usr/lib \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -60,8 +60,12 @@
 
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib64/glibc \
+    --libdir=/usr/lib64 \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86/glibc.xml
===================================================================
--- BOOK/final-system/x86/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/x86/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -50,6 +50,9 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; --libexecdir=/usr/lib/glibc \
+<screen os="h"><userinput>../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
     --enable-obsolete-rpc</userinput></screen>
 
Index: BOOK/final-system/x86/grub.xml
===================================================================
--- BOOK/final-system/x86/grub.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/x86/grub.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -45,6 +45,8 @@
     <para os="a">Prepare GRUB for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr \
-    --sysconfdir=/etc --disable-werror</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --disable-werror</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/x86_64-64/glibc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,7 +34,8 @@
     xpointer="xpointer(//*[@os='l2'])"/>
 
-    <para os="l3">Modify the <command>ldd</command> rewrite script to remove
-    <filename class="directory">lib64</filename> and
-    <filename class="directory">libx32</filename> from RTLDLIST.</para>
+    <para os="l3">Modify the <command>ldd</command> rewrite script to prevent
+    it from adding <filename class="directory">lib64</filename> and
+    <filename class="directory">libx32</filename> to its list of linker
+    search locations:</para>
 
 <screen os="l4"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
@@ -61,8 +62,12 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+<screen os="h"><userinput>../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
+    --libdir=/usr/lib \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/glibc-64bit.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/final-system/x86_64/glibc-64bit.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -55,8 +55,12 @@
 
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib64/glibc \
+    --libdir=/usr/lib64 \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/general.ent	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -3,5 +3,5 @@
 <!ENTITY month "12"> <!-- Use two digits -->
 <!ENTITY month_name "December">
-<!ENTITY day "10"> <!-- Use two digits -->
+<!ENTITY day "13"> <!-- Use two digits -->
 <!ENTITY year "2015"> <!-- Use four digits -->
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/introduction/common/changelog.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -38,4 +38,14 @@
 
     <listitem>
+      <para>13 December 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Edited configure options to have one per line. Fixes
+          ticket <ulink url="&clfs-ticket-root;1091">#1091.</ulink></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>05 December 2015</para>
       <itemizedlist>
Index: BOOK/network/common/dhcpcd.xml
===================================================================
--- BOOK/network/common/dhcpcd.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/network/common/dhcpcd.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,6 +31,10 @@
     <para os="b">Prepare DHCPCD for compilation:</para>
 
-<screen os="c" role="nodump"><userinput>./configure --prefix=/usr --sbindir=/sbin \
-    --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib/dhcpcd</userinput></screen>
+<screen os="c" role="nodump"><userinput>./configure \
+    --prefix=/usr \
+    --sbindir=/sbin \
+    --sysconfdir=/etc \
+    --dbdir=/var/lib/dhcpcd \
+    --libexecdir=/usr/lib/dhcpcd</userinput></screen>
 
     <para os="d">Compile the package:</para>
Index: BOOK/network/common/hosts.xml
===================================================================
--- BOOK/network/common/hosts.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/network/common/hosts.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,5 @@
   <filename>/etc/hosts</filename> file. The syntax is:</para>
 
-  <screen>&lt;IP address&gt; myhost.example.org aliases</screen>
+<screen>&lt;IP address&gt; myhost.example.org aliases</screen>
 
   <para>Unless the computer is to be visible to the Internet (i.e.,
Index: BOOK/network/multilib/dhcpcd.xml
===================================================================
--- BOOK/network/multilib/dhcpcd.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/network/multilib/dhcpcd.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,6 +30,10 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c" role="nodump"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
-    --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib64/dhcpcd \
+<screen os="c" role="nodump"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr \
+    --sbindir=/sbin \
+    --sysconfdir=/etc \
+    --dbdir=/var/lib/dhcpcd \
+    --libexecdir=/usr/lib64/dhcpcd \
     --libdir=/usr/lib64</userinput></screen>
 
Index: BOOK/temp-system/64/binutils.xml
===================================================================
--- BOOK/temp-system/64/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/64/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -45,8 +45,16 @@
 
 <screen os="j"><userinput>../binutils-&binutils-dir;/configure \
-    --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} --with-lib-path=/tools/lib --disable-nls \
-    --enable-shared --enable-64-bit-bfd --disable-multilib \
-    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-lib-path=/tools/lib \
+    --disable-nls \
+    --enable-shared \
+    --enable-64-bit-bfd \
+    --disable-multilib \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/64/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -71,10 +71,16 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --disable-multilib \
-    --enable-languages=c,c++ --with-system-zlib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-local-prefix=/tools \
+    --disable-multilib \
+    --enable-languages=c,c++ \
+    --with-system-zlib \
     --with-native-system-header-dir=/tools/include \
-    --disable-libssp --enable-install-libiberty</userinput></screen>
+    --disable-libssp \
+    --enable-install-libiberty</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/bash.xml
===================================================================
--- BOOK/temp-system/common/bash.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/bash.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -58,7 +58,10 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --without-bash-malloc --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --without-bash-malloc \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/temp-system/common/binutils.xml
===================================================================
--- BOOK/temp-system/common/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -45,8 +45,16 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>../binutils-&binutils-dir;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-lib-path=/tools/lib --disable-nls --enable-shared \
-    --disable-multilib --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
+<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-lib-path=/tools/lib \
+    --disable-nls \
+    --enable-shared \
+    --disable-multilib \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads</userinput></screen>
 
     <variablelist os="k">
Index: BOOK/temp-system/common/bison.xml
===================================================================
--- BOOK/temp-system/common/bison.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/bison.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -32,6 +32,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ca"><userinput>M4=m4 ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="ca"><userinput>M4=m4 \
+./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/check.xml
===================================================================
--- BOOK/temp-system/common/check.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/check.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,6 +31,8 @@
     <para os="c">Prepare Check for compilation:</para>
 
-<screen os="d"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="d"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="f">Build the package:</para>
Index: BOOK/temp-system/common/coreutils.xml
===================================================================
--- BOOK/temp-system/common/coreutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/coreutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,7 +39,10 @@
     <para os="bd">Prepare Coreutils for compilation:</para>
 
-<screen os="be"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
+<screen os="be"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --enable-install-program=hostname \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="be1">
Index: BOOK/temp-system/common/diffutils.xml
===================================================================
--- BOOK/temp-system/common/diffutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/diffutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -25,6 +25,8 @@
     <para os="a">Prepare Diffutils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/file.xml
===================================================================
--- BOOK/temp-system/common/file.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/file.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -25,6 +25,8 @@
     <para os="a">Prepare File for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/findutils.xml
===================================================================
--- BOOK/temp-system/common/findutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/findutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -33,6 +33,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ac"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="ac"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/flex.xml
===================================================================
--- BOOK/temp-system/common/flex.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/flex.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -36,6 +36,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>M4=m4 ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="cb"><userinput>M4=m4 ./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/gawk.xml
===================================================================
--- BOOK/temp-system/common/gawk.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/gawk.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -25,6 +25,8 @@
     <para os="a">Prepare Gawk for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -69,10 +69,16 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --disable-multilib \
-    --enable-languages=c,c++ --with-system-zlib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-local-prefix=/tools \
+    --disable-multilib \
+    --enable-languages=c,c++ \
+    --with-system-zlib \
     --with-native-system-header-dir=/tools/include \
-    --disable-libssp --enable-install-libiberty</userinput></screen>
+    --disable-libssp \
+    --enable-install-libiberty</userinput></screen>
 
     <variablelist os="cl">
Index: BOOK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/gettext.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -37,7 +37,10 @@
     <para os="d">Prepare Gettext for compilation:</para>
 
-<screen os="e"><userinput>EMACS="no" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-shared --cache-file=config.cache</userinput></screen>
+<screen os="e"><userinput>EMACS="no" \
+./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-shared</userinput></screen>
 
 <variablelist os="f">
Index: BOOK/temp-system/common/gmp.xml
===================================================================
--- BOOK/temp-system/common/gmp.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/gmp.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,6 +39,9 @@
     <para os="b">Prepare GMP for compilation:</para>
 
-<screen os="c"><userinput>CC_FOR_BUILD=gcc ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="c"><userinput>CC_FOR_BUILD=gcc \
+./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --enable-cxx</userinput></screen>
 
Index: BOOK/temp-system/common/grep.xml
===================================================================
--- BOOK/temp-system/common/grep.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/grep.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ca"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="ca"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --without-included-regex</userinput></screen>
 
Index: BOOK/temp-system/common/gzip.xml
===================================================================
--- BOOK/temp-system/common/gzip.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/gzip.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/isl.xml
===================================================================
--- BOOK/temp-system/common/isl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/isl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -25,6 +25,8 @@
     <para os="a">Prepare ISL for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/m4.xml
===================================================================
--- BOOK/temp-system/common/m4.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/m4.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -40,6 +40,8 @@
     <para os="a">Prepare M4 for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/make.xml
===================================================================
--- BOOK/temp-system/common/make.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/make.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="aa"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/mpc.xml
===================================================================
--- BOOK/temp-system/common/mpc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/mpc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -25,6 +25,8 @@
     <para os="a">Prepare MPC for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/mpfr.xml
===================================================================
--- BOOK/temp-system/common/mpfr.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/mpfr.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -33,6 +33,8 @@
     <para os="a">Prepare MPFR for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/ncurses.xml
===================================================================
--- BOOK/temp-system/common/ncurses.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/ncurses.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -34,8 +34,13 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools --with-shared \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --without-debug --without-ada \
-    --enable-overwrite --with-build-cc=gcc</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --with-shared \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --without-debug \
+    --without-ada \
+    --enable-overwrite \
+    --with-build-cc=gcc</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/temp-system/common/patch.xml
===================================================================
--- BOOK/temp-system/common/patch.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/patch.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -25,6 +25,8 @@
     <para os="a">Prepare Patch for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/sed.xml
===================================================================
--- BOOK/temp-system/common/sed.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/sed.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -25,6 +25,8 @@
     <para os="a">Prepare Sed for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/tar.xml
===================================================================
--- BOOK/temp-system/common/tar.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/tar.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -42,6 +42,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/texinfo.xml
===================================================================
--- BOOK/temp-system/common/texinfo.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/texinfo.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>PERL=/usr/bin/perl ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>PERL=/usr/bin/perl \
+./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="ba">
Index: BOOK/temp-system/common/util-linux.xml
===================================================================
--- BOOK/temp-system/common/util-linux.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/util-linux.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,7 +27,10 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown --disable-makeinstall-setuid \
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --disable-makeinstall-chown \
+    --disable-makeinstall-setuid \
     --without-python</userinput></screen>
 
Index: BOOK/temp-system/common/vim.xml
===================================================================
--- BOOK/temp-system/common/vim.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/vim.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -64,7 +64,15 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --prefix=/tools --enable-gui=no --disable-gtktest --disable-xim \
-    --disable-gpm --without-x --disable-netbeans --with-tlib=ncurses</userinput></screen>
+<screen os="e"><userinput>./configure \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --prefix=/tools \
+    --enable-gui=no \
+    --disable-gtktest \
+    --disable-xim \
+    --disable-gpm \
+    --without-x \
+    --disable-netbeans \
+    --with-tlib=ncurses</userinput></screen>
 
     <variablelist os="f">
Index: BOOK/temp-system/common/xz.xml
===================================================================
--- BOOK/temp-system/common/xz.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/xz.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="cb"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/zlib.xml
===================================================================
--- BOOK/temp-system/common/zlib.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/common/zlib.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,5 +31,6 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -71,7 +71,13 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-languages=c,c++ --with-system-zlib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
+    --prefix=/tools \
+    --disable-multilib \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-local-prefix=/tools \
+    --enable-languages=c,c++ \
+    --with-system-zlib \
     --with-native-system-header-dir=/tools/include \
     --enable-install-libiberty</userinput></screen>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -71,8 +71,14 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="dc"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} --with-local-prefix=/tools \
-    --enable-languages=c,c++ --with-abi=64 --with-system-zlib \
+<screen os="dc"><userinput>../gcc-&gcc-version;/configure \
+    --prefix=/tools \
+    --libdir=/tools/lib64 \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-local-prefix=/tools \
+    --enable-languages=c,c++ \
+    --with-abi=64 \
+    --with-system-zlib \
     --with-native-system-header-dir=/tools/include \
     --enable-install-libiberty</userinput></screen>
Index: BOOK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/binutils.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -45,8 +45,16 @@
 
 <screen os="j"><userinput>../binutils-&binutils-dir;/configure \
-    --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --disable-nls --enable-shared --enable-64-bit-bfd \
-    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
+    --prefix=/tools \
+    --libdir=/tools/lib64 \
+    --with-lib-path=/tools/lib64:/tools/lib \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --disable-nls \
+    --enable-shared \
+    --enable-64-bit-bfd \
+    --enable-gold=yes \
+    --enable-plugins \
+    --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/check.xml
===================================================================
--- BOOK/temp-system/multilib/check.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/check.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -30,6 +30,9 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64</userinput></screen>
+<screen os="d"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/file.xml
===================================================================
--- BOOK/temp-system/multilib/file.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/file.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-   --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --libdir=/tools/lib64 \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/flex.xml
===================================================================
--- BOOK/temp-system/multilib/flex.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/flex.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,6 +35,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>M4=m4 ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="cb"><userinput>M4=m4 \
+./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -71,10 +71,16 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="dc"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} --with-local-prefix=/tools \
-    --enable-languages=c,c++ --with-system-zlib \
+<screen os="dc"><userinput>../gcc-&gcc-version;/configure \
+    --prefix=/tools \
+    --libdir=/tools/lib64 \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-local-prefix=/tools \
+    --enable-languages=c,c++ \
+    --with-system-zlib \
     --with-native-system-header-dir=/tools/include \
-    --disable-libssp --enable-install-libiberty</userinput></screen>
+    --disable-libssp \
+    --enable-install-libiberty</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/gmp.xml
===================================================================
--- BOOK/temp-system/multilib/gmp.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/gmp.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -41,7 +41,11 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>CC_FOR_BUILD=gcc ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --enable-cxx</userinput></screen>
+<screen os="c"><userinput>CC_FOR_BUILD=gcc \
+./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 \
+    --enable-cxx</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/isl.xml
===================================================================
--- BOOK/temp-system/multilib/isl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/isl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --libdir=/tools/lib64</userinput></screen>
 
Index: BOOK/temp-system/multilib/mpc.xml
===================================================================
--- BOOK/temp-system/multilib/mpc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/mpc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,6 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --libdir=/tools/lib64</userinput></screen>
 
Index: BOOK/temp-system/multilib/mpfr.xml
===================================================================
--- BOOK/temp-system/multilib/mpfr.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/mpfr.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -35,6 +35,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
     --libdir=/tools/lib64</userinput></screen>
 
Index: BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/ncurses.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -39,9 +39,14 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools --with-shared \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --without-debug --without-ada \
-   --enable-overwrite --with-build-cc=gcc \
-   --libdir=/tools/lib64</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --with-shared \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --without-debug \
+    --without-ada \
+    --enable-overwrite \
+    --with-build-cc=gcc \
+    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/util-linux.xml
===================================================================
--- BOOK/temp-system/multilib/util-linux.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/util-linux.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,8 +27,12 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir='${prefix}'/lib64 --disable-makeinstall-chown \
-    --disable-makeinstall-setuid --without-python</userinput></screen>
+<screen os="be"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --libdir='${prefix}'/lib64 \
+    --disable-makeinstall-chown \
+    --disable-makeinstall-setuid \
+    --without-python</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/xz.xml
===================================================================
--- BOOK/temp-system/multilib/xz.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/xz.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,7 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-     --libdir=/tools/lib64</userinput></screen>
+<screen os="cb"><userinput>./configure \
+    --prefix=/tools \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/multilib/zlib.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -31,5 +31,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools \
+    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/ppc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64-64/gcc.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/temp-system/ppc64-64/gcc.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -71,7 +71,13 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-languages=c,c++ --with-system-zlib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
+    --prefix=/tools \
+    --disable-multilib \
+    --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} \
+    --with-local-prefix=/tools \
+    --enable-languages=c,c++ \
+    --with-system-zlib \
     --with-native-system-header-dir=/tools/include \
     --enable-install-libiberty</userinput></screen>
Index: BOOK/testsuite-tools/common/dejagnu.xml
===================================================================
--- BOOK/testsuite-tools/common/dejagnu.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/testsuite-tools/common/dejagnu.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
     <para os="a">Prepare DejaGNU for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
+<screen os="b"><userinput>./configure \
+    --prefix=/tools</userinput></screen>
 
     <para os="c">Build and install the package:</para>
Index: BOOK/testsuite-tools/common/expect.xml
===================================================================
--- BOOK/testsuite-tools/common/expect.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/testsuite-tools/common/expect.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,7 @@
     <para os="c">Now prepare Expect for compilation:</para>
 
-<screen os="d"><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
+<screen os="d"><userinput>./configure \
+    --prefix=/tools \
+    --with-tcl=/tools/lib \
     --with-tclinclude=/tools/include</userinput></screen>
 
Index: BOOK/testsuite-tools/common/tcl.xml
===================================================================
--- BOOK/testsuite-tools/common/tcl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/testsuite-tools/common/tcl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -28,5 +28,6 @@
 
 <screen><userinput>cd unix
-./configure --prefix=/tools</userinput></screen>
+./configure \
+    --prefix=/tools</userinput></screen>
 
     <para os="c">Build the package:</para>
Index: BOOK/testsuite-tools/multilib/expect.xml
===================================================================
--- BOOK/testsuite-tools/multilib/expect.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/testsuite-tools/multilib/expect.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -26,7 +26,10 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
-   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
-   --libdir=/tools/lib64</userinput></screen>
+<screen os="d"><userinput>CC="gcc ${BUILD64}" \
+./configure \
+    --prefix=/tools \
+    --with-tcl=/tools/lib64 \
+    --with-tclinclude=/tools/include  \
+    --libdir=/tools/lib64</userinput></screen>
 
     <variablelist os="e">
Index: BOOK/testsuite-tools/multilib/tcl.xml
===================================================================
--- BOOK/testsuite-tools/multilib/tcl.xml	(revision dbc5b02df8ee22797b280bf9e609fac5bb212cfe)
+++ BOOK/testsuite-tools/multilib/tcl.xml	(revision 991595cfe580bfe3acf63f226b36169ea01bec0b)
@@ -27,5 +27,7 @@
 
 <screen os="b"><userinput>cd unix
-CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
+CC="gcc ${BUILD64}" ./configure \
+    --prefix=/tools \
+    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
