Ported the proper r7279 plus r7281 from trunk to alphabetical.

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

13 files changed, 620 insertions, 481 deletions

diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index 47e610e45..b48a17128 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -8,75 +8,75 @@
 <sect1 id="ch-tools-adjusting">
   <?dbhtml filename="adjusting.html"?>
 
-  <title>Ajustar las herramientas</title>
+  <title>Adjusting the Toolchain</title>
 
-  <para>Ahora que se han instalado las librerías de C temporales, todas las
-  herramientas que compilemos en el resto de este capítulo deberían enlazarse
-  contra ellas. Para conseguirlo, deben ajustarse el enlazador y el fichero
-  specs del compilador.</para>
+  <para>Now that the temporary C libraries have been installed, all
+  tools compiled in the rest of this chapter should be linked against
+  these libraries. In order to accomplish this, the linker and the
+  compiler's specs file need to be adjusted.</para>
 
-  <para>El enlazador, que se ajustó al final del primer paso de Binutils,
-  se instala ejecutando el siguiente comando desde el directorio
-  <filename class="directory">binutils-build</filename>:</para>
+  <para>The linker, adjusted at the end of the first pass of Binutils,
+  is installed by running the following command from within the
+  <filename class="directory">binutils-build</filename> directory:</para>
 
 <screen><userinput>make -C ld install</userinput></screen>
 
-  <para>Desde ahora todo se enlazará solamente contra las librerías que hay en
-  <filename class="directory">/tools/lib</filename>.</para>
+  <para>From this point onwards, everything will link only against the
+  libraries in <filename class="directory">/tools/lib</filename>.</para>
 
   <note>
-    <para>Si por alguna razón olvidaste el aviso sobre conservar los directorios
-    de las fuentes y de construcción del primer paso de Binutils, ignora el
-    comando anterior. El resultado es la pequeña pega de que los siguientes
-    programas de pruebas se enlazarán contra las librerías del anfitrión. Esto
-    no es lo ideal, pero no es un gran problema. La situación se corregirá
-    cuando instalemos un poco más adelante la segunda fase de Binutils.</para>
+    <para>If the earlier warning to retain the Binutils source and
+    build directories from the first pass was missed, ignore the above
+    command. This results in a small chance that the subsequent testing
+    programs will link against libraries on the host. This is not ideal,
+    but it is not a major problem. The situation is corrected when the
+    second pass of Binutils is installed later.</para>
   </note>
 
-  <para>Ahora que se ha instalado el enlazador ajustado, debes eliminar los
-  directorios de las fuentes y de construcción de Binutils.</para>
+  <para>Now that the adjusted linker is installed, the Binutils build and source
+  directories should be removed.</para>
 
-  <para>Lo siguiente esapuntar GCC al nuevo enlazador dinámico. Esto se hace
-  volcando el fichero <quote>specs</quote>de GCC a un lugar en el que GCC lo
-  busque por defecto. Entonces una simple sustitución <command>sed</command>
-  altera el enlazdor inámic que GCC usará:</para>
+  <para>The next task is to point GCC to the new dynamic linker. This is done by
+  dumping GCC's <quote>specs</quote> file to a location where GCC will look for it
+  by default. A simple <command>sed</command> substitution then alters the
+  dynamic linker that GCC will use:</para>
 
-<!-- Ampersands are needed to allow cut and paste -->
+<!-- Ampersands are needed to allow copy and paste -->
 <screen><userinput>SPECFILE=`dirname $(gcc -print-libgcc-file-name)`/specs &amp;&amp;
 gcc -dumpspecs > $SPECFILE &amp;&amp;
 sed 's@^/lib/ld-linux.so.2@/tools&amp;@g' $SPECFILE &gt; tempspecfile &amp;&amp;
 mv -vf tempspecfile $SPECFILE &amp;&amp;
 unset SPECFILE</userinput></screen>
 
-  <para><phrase condition="html">Recomendamos que copies y pegues lo anterior
-  para asegurar que no hay errores.</phrase> Alternativamente, puedes editar el
-  fichero specs a mano si quieres. Esto se hace reemplazando cada aparición de
-  <quote>/lib/ld-linux.so.2</quote> con <quote>/tools/lib/ld-linux.so.2</quote>.</para>
+  <para>It is recommended that the above command be copy-and-pasted in order to
+  ensure accuracy. Alternatively, the specs file can be edited by hand. This is
+  done by replacing every occurrence of <quote>/lib/ld-linux.so.2</quote> with
+  <quote>/tools/lib/ld-linux.so.2</quote></para>
 
-  <para>Asegúrate de revisar visualmente el fichero specs para
-  verificar que se han hecho los cambios deseados.</para>
+  <para>Be sure to visually inspect the specs file in order to verify the
+  intended changes have been made.</para>
 
   <important>
-    <para>Si estás trabajando sobre una plataforma en la que el nombre del
-    enlazador dinámico no es <filename class="libraryfile">ld-linux.so.2</filename>,
-    en el anterior comando debes sustituir <filename>ld-linux.so.2</filename> con
-    el nombre del enlazador dinámico de tu plataforma. En caso necesario consulta
-    la <xref linkend="ch-tools-toolchaintechnotes"/>.</para>
+    <para>If working on a platform where the name of the dynamic linker is
+    something other than <filename class="libraryfile">ld-linux.so.2</filename>,
+    replace <quote>ld-linux.so.2</quote> with the name of the platform's
+    dynamic linker in the above commands. Refer back to <xref
+    linkend="ch-tools-toolchaintechnotes" role=","/> if necessary.</para>
   </important>
 
-  <para>Durante el proceso de construcción, GCC ejecuta un guión
-  (<command>fixincludes</command>) que explora el sistema buscando ficheros de
-  cabecera que puedan necesitar ser corregidos (que pueden contener errores de
-  sintaxis, por ejemplo), e instala las versiones corregidas en un directorio
-  privado. Existe la posibilidad de que, como resultado de este proceso, algunos
-  ficheros de cabecera del sistema anfitrión se hayan colado dentro de dicho
-  directorio privado de cabeceras de GCC. Como el resto de este capítulo sólo
-  necesita las cabeceras de GCC y Glibc, que ya han sido instaladas, cualquier
-  cabecera <quote>fijada</quote> puede borrarse sin problemas. Esto ayuda a
-  evitar que cualquier cabecera del anfitrión contamine el entorno de
-  construcción. Ejecuta los siguientes comandos para eliminr dichos ficheros de
-  cabecera (puede que encuentres más facil copiar y pegar estos comandos en vez
-  de teclearlos, debido a su longitud):</para>
+  <para>During the build process, GCC runs a script
+  (<command>fixincludes</command>) that scans the system for header files
+  that may need to be fixed (they might contain syntax errors, for example),
+  and installs the fixed versions in a private include directory. There is a
+  possibility that, as a result of this process, some header files from the
+  host system have found their way into GCC's private include directory. As
+  the rest of this chapter only requires the headers from GCC and Glibc,
+  which have both been installed at this point, any <quote>fixed</quote>
+  headers can safely be removed. This helps to avoid any host headers
+  polluting the build environment. Run the following commands to remove the
+  header files in GCC's private include directory (you may find it easier to
+  copy and paste these commands, rather than typing them by hand, due to
+  their length):</para>
 
 <!-- && used to ease copy and pasting -->
 <screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include &amp;&amp;
@@ -85,52 +85,48 @@ rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*` &amp;&amp;
 unset GCC_INCLUDEDIR</userinput></screen>
 
   <caution>
-    <para>En este punto es obligatorio parar y asegurarse de que las operaciones
-    básicas (compilación y enlazado) de las nuevas herramientas funcionan como
-    se espera. Para esto vamos a hacer una simple comprobación:</para>
+    <para>At this point, it is imperative to stop and ensure that the basic
+    functions (compiling and linking) of the new toolchain are working as
+    expected. To perform a sanity check, run the following commands:</para>
 
 <screen><userinput>echo 'main(){}' &gt; dummy.c
 cc dummy.c
 readelf -l a.out | grep ': /tools'</userinput></screen>
 
-    <para>Si todo funciona correctamente, no debe haber errores y la salida del
-    último comando debe ser:</para>
+    <para>If everything is working correctly, there should be no errors,
+    and the output of the last command will be of the form:</para>
 
 <screen><computeroutput>[Requesting program interpreter:
-    /tools/lib/ld-linux.so.2]
-
-[Intérprete de programa solicitado:
     /tools/lib/ld-linux.so.2]</computeroutput></screen>
 
-    <para>Confirma que <filename class="directory">/tools/lib</filename>
-    aparezca como el prefijo de tu enlazador dinámico.</para>
-
-    <para>Si no recibes una salida como la mostrada arriba, o no hay salida
-    alguna, algo está seriamente mal. Investiga y revisa tus pasos para
-    encontrar el problema y corregirlo. El problema debe resolverse antes de
-    continuar. Primero, repite la comprobación de sanidad usando
-    <command>gcc</command> en vez de <command>cc</command>. Si esto funciona
-    significa que falta el enlace simbólico <filename
-    class="symlink">/tools/bin/cc</filename>. Vuelve a la <xref
-    linkend="ch-tools-gcc-pass1"/> e instala el enlace simbólico. Seguidamente,
-    asegúrate de que tu <envar>PATH</envar> es correcto. Puedes comprobarlo
-    ejecutando <command>echo $PATH</command> y verificando que <filename
-    class="directory">/tools/bin</filename> está en cabeza de la lista. Si
-    el <envar>PATH</envar> está mal puede significar que no has ingresado
-    como usuario <systemitem class="username">lfs</systemitem> o que algo
-    salió mal en la <xref linkend="ch-tools-settingenviron"/>. Otra opción es
-    que algo pudo ir mal en el anterior arreglo del fichero specs. En este caso,
-    repite el arreglo del fichero<phrase condition="html"> asegurándote de
-    copiar y pegar los comandos como se recomendó</phrase>.</para>
-
-    <para>Cuando todo esté bien, borra los ficheros de prueba:</para>
+    <para>Note that <filename class="directory">/tools/lib</filename>
+    appears as the prefix of the dynamic linker.</para>
+
+    <para>If the output is not shown as above or there was no output at all,
+    then something is wrong. Investigate and retrace the steps to find out
+    where the problem is and correct it. This issue must be resolved before
+    continuing on. First, perform the sanity check again, using
+    <command>gcc</command> instead of <command>cc</command>. If this works,
+    then the <filename class="symlink">/tools/bin/cc</filename> symlink is
+    missing. Revisit <xref linkend="ch-tools-gcc-pass1" role=","/> and install
+    the symlink. Next, ensure that the <envar>PATH</envar> is correct. This
+    can be checked by running <command>echo $PATH</command> and verifying that
+    <filename class="directory">/tools/bin</filename> is at the head of the
+    list. If the <envar>PATH</envar> is wrong it could mean that you are not
+    logged in as user <systemitem class="username">lfs</systemitem> or that
+    something went wrong back in <xref linkend="ch-tools-settingenviron"
+    role="."/> Another option is that something may have gone wrong with the
+    specs file amendment above. In this case, redo the specs file amendment,
+    being careful to copy-and-paste the commands.</para>
+
+    <para>Once all is well, clean up the test files:</para>
 
 <screen><userinput>rm -v dummy.c a.out</userinput></screen>
 
-    <para>La construcción de TCL en la siguiente sección servirá como comprobación
-    adicional de que las herramientas se han construido correctamente. Si la
-    construcción de TCL falla, esto es una indicación de que algo fué mal durante
-    la instalación de Binutils, GCC o Glibc, pero no con el propio TCL.</para>
+    <para>Building TCL in the next section will serve as an additional check that
+    the toolchain has been built properly.  If TCL fails to build, it is an
+    indication that something has gone wrong with the Binutils, GCC, or Glibc
+    installation, but not with TCL itself.</para>
   </caution>
 
 </sect1>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 292bf4fc8..e71640991 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-tools-bash">
     <primary sortas="a-Bash">Bash</primary>
-    <secondary>herramientas</secondary>
+    <secondary>tools</secondary>
   </indexterm>
 
   <sect2 role="package">
@@ -39,39 +39,41 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Instalación de Bash</title>
+    <title>Installation of Bash</title>
 
-    <para>Prepara Bash para su compilación:</para>
+    <para>Prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen>
 
     <variablelist>
-      <title>Significado de la opción de configure:</title>
+      <title>The meaning of the configure options:</title>
 
       <varlistentry>
         <term><parameter>--without-bash-malloc</parameter></term>
         <listitem>
-          <para>Esta opción desactiva el uso de la función de ubicación de memoria
-          (<function>malloc</function>) de Bash, que se sabe que provoca
-          violaciones de segmento. Al desactivar esta opción Bash utilizará la
-          función <function>malloc</function> de Glibc, que es más estable.</para>
+          <para>This options turns off the use of Bash's memory allocation
+          (<function>malloc</function>) function which is known to cause
+          segmentation faults. By turning this option off, Bash will use
+          the <function>malloc</function> functions from Glibc which are
+          more stable.</para>
         </listitem>
       </varlistentry>
+
     </variablelist>
 
-    <para>Compila el paquete:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Para comprobar los resultados, ejecuta:
+    <para>To test the results, issue:
     <userinput>make tests</userinput>.</para>
 
-    <para>Instala el paquete:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-    <para>Crea un enlace para los programas que usan <command>sh</command>
-    como intérprete de comandos:</para>
+    <para>Make a link for the programs that use <command>sh</command> for
+    a shell:</para>
 
 <screen><userinput>ln -vs bash /tools/bin/sh</userinput></screen>
 
@@ -80,8 +82,8 @@
   <sect2 role="content">
     <title/>
 
-    <para>Los detalles sobre este paquete se encuentran en la <xref
-    linkend="contents-bash"/>.</para>
+    <para>Details on this package are located in
+    <xref linkend="contents-bash" role="."/></para>
 
   </sect2>
 
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 0ccc33d9a..4435cfca0 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -8,11 +8,11 @@
 <sect1 id="ch-tools-binutils-pass1" role="wrap">
   <?dbhtml filename="binutils-pass1.html"?>
 
-  <title>Binutils-&binutils-version; - Fase 1</title>
+  <title>Binutils-&binutils-version; - Pass 1</title>
 
   <indexterm zone="ch-tools-binutils-pass1">
     <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>herramientas, fase 1</secondary>
+    <secondary>tools, pass 1</secondary>
   </indexterm>
 
   <sect2 role="package">
@@ -39,105 +39,105 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Instalación de Binutils</title>
+    <title>Installation of Binutils</title>
 
-    <para>Es importante que Binutils sea el primer paquete que compiles, pues
-    tanto Glibc como GCC llevan a cabo varias comprobaciones sobre el enlazador y
-    el ensamblador disponibles para determinar qué características activar.</para>
+    <para>It is important that Binutils be the first package compiled
+    because both Glibc and GCC perform various tests on the available
+    linker and assembler to determine which of their own features to
+    enable.</para>
 
-    <para>La documentación de Binutils recomienda construirlo en un directorio
-    dedicado, fuera del árbol de las fuentes:</para>
+    <para>The Binutils documentation recommends building Binutils outside of the
+    source directory in a dedicated build directory:</para>
 
 <screen><userinput>mkdir -v ../binutils-build
 cd ../binutils-build</userinput></screen>
 
     <note>
-      <para>Si quieres que los valores de los SBUs mostrados en el resto del
-      libro sean de utilidad, mide el tiempo que se tarda en construir este
-      paquete desde la compilación hasta la primera instalación. Para ello,
-      envuelve los comandos dentro de un comando <command>time</command> de
-      esta forma: <userinput>time { ./configure ... &amp;&amp; make &amp;&amp;
-      make install; }</userinput>.</para>
+      <para>In order for the SBU values listed in the rest of the book
+      to be of any use, measure the time it takes to build this package from
+      the configuration, up to and including the first install. To achieve
+      this easily, wrap the three commands in a <command>time</command>
+      command like this: <userinput>time { ./configure ... &amp;&amp; make
+      &amp;&amp; make install; }</userinput>.</para>
     </note>
 
-    <para>Prepara Binutils para su compilación:</para>
+    <para>Now prepare Binutils for compilation:</para>
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools --disable-nls</userinput></screen>
 
     <variablelist>
-      <title>Significado de las opciones de configure:</title>
+      <title>The meaning of the configure options:</title>
 
       <varlistentry>
         <term><parameter>--prefix=/tools</parameter></term>
         <listitem>
-          <para>Esto le indica al guión configure que los programas de
-          Binutils se instalarán en el directorio <filename
-          class="directory">/tools</filename>.</para>
+          <para>This tells the configure script to prepare to install the
+          Binutils programs in the <filename class="directory">/tools</filename>
+          directory.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
         <term><parameter>--disable-nls</parameter></term>
         <listitem>
-          <para>Esta opción desactiva la internacionalización, pues i18n no es
-          necesario en las herramientas temporales.</para>
+          <para>This disables internationalization as i18n is not needed for the
+          temporary tools.</para>
         </listitem>
       </varlistentry>
 
     </variablelist>
 
-    <para>Compila el paquete:</para>
+    <para>Continue with compiling the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>La compilación se ha completado. Normalmente deberíamos ejecutar
-    ahora el banco de pruebas, pero en esta temprana fase el entorno de
-    trabajo para los bancos de pruebas (Tcl, Expect y DejaGnu) todavía no
-    está en su sitio. Los beneficios de ejecutar las pruebas ahora son mínimos,
-    pues los programas de esta primera fase pronto serán sustituidos por los
-    de la segunda.</para>
+    <para>Compilation is now complete. Ordinarily we would now run the
+    test suite, but at this early stage the test suite framework (Tcl,
+    Expect, and DejaGNU) is not yet in place. The benefits of running the
+    tests at this point are minimal since the programs from this
+    first pass will soon be replaced by those from the second.</para>
 
-    <para>Instala el paquete:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-    <para>Prepara el enlazador para la posterior fase de
-    <quote>ajuste</quote>:</para>
+    <para>Next, prepare the linker for the <quote>Adjusting</quote> phase
+    later on:</para>
 
 <screen><userinput>make -C ld clean
 make -C ld LIB_PATH=/tools/lib</userinput></screen>
 
     <variablelist>
-      <title>Significado de los parámetros de make:</title>
+      <title>The meaning of the make parameters:</title>
 
       <varlistentry>
         <term><parameter>-C ld clean</parameter></term>
         <listitem>
-          <para>Esto le indica al programa make que elimine todos los ficheros
-          compilados que haya en el subdirectorio
-          <filename class="directory">ld</filename>.</para>
+          <para>This tells the make program to remove all compiled
+          files in the <filename class="directory">ld</filename>
+          subdirectory.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
         <term><parameter>-C ld LIB_PATH=/tools/lib</parameter></term>
         <listitem>
-          <para>Esta opción vuelve a construir todo dentro del subdirectorio
-          <filename class="directory">ld</filename>. Especificar la variable
-          <envar>LIB_PATH</envar> del Makefile en la línea de comandos nos
-          permite obviar su valor por defecto y apuntar a nuestro directorio
-          de herramientas temporales. El valor de esta variable especifica
-          la ruta de búsqueda de librerías por defecto del enlazador. Estos
-          preparativos se utilizan más tarde en este capítulo.</para>
+          <para>This option rebuilds everything in the <filename
+          class="directory">ld</filename> subdirectory. Specifying the
+          <envar>LIB_PATH</envar> Makefile variable on the command line
+          allows us to override the default value and point it to the
+          temporary tools location. The value of this variable specifies
+          the linker's default library search path. This preparation is
+          used later in the chapter.</para>
         </listitem>
       </varlistentry>
 
     </variablelist>
 
     <warning>
-      <para><emphasis>No borres</emphasis> los directorios de fuentes y de
-      construcción de Binutils. Los necesitarás un poco más adelante en este
-      capítulo en el estado en que se encuentran ahora.</para>
+      <para><emphasis>Do not</emphasis> remove the Binutils build and source
+      directories yet. These will be needed again in their current state later
+      in this chapter.</para>
     </warning>
 
   </sect2>
@@ -145,8 +145,8 @@ make -C ld LIB_PATH=/tools/lib</userinput></screen>
   <sect2 role="content">
     <title/>
 
-    <para>Los detalles sobre este paquete se encuentran en la
-    <xref linkend="contents-binutils"/>.</para>
+    <para>Details on this package are located in
+    <xref linkend="contents-binutils" role="."/></para>
 
   </sect2>
 
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 76b2e7fe7..8a7cc53ff 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -5,14 +5,14 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-tools-binutils-pass2">
+<sect1 id="ch-tools-binutils-pass2" role="wrap">
   <?dbhtml filename="binutils-pass2.html"?>
 
-  <title>Binutils-&binutils-version; - Fase 2</title>
+  <title>Binutils-&binutils-version; - Pass 2</title>
 
   <indexterm zone="ch-tools-binutils-pass2">
     <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>herramientas, fase 2</secondary>
+    <secondary>tools, pass 2</secondary>
   </indexterm>
 
   <sect2 role="package">
@@ -39,60 +39,59 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Reinstalación de Binutils</title>
+    <title>Re-installation of Binutils</title>
 
-    <para>Vuelve a crear un directorio dedicado para la construcción:</para>
+    <para>Create a separate build directory again:</para>
 
 <screen><userinput>mkdir -v ../binutils-build
 cd ../binutils-build</userinput></screen>
 
-    <para>Prepara Binutils para su compilación:</para>
+    <para>Prepare Binutils for compilation:</para>
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
     --disable-nls --enable-shared --with-lib-path=/tools/lib</userinput></screen>
 
     <variablelist>
-      <title>Significado de la nueva opción de configure:</title>
+      <title>The meaning of the new configure options:</title>
 
       <varlistentry>
         <term><parameter>--with-lib-path=/tools/lib</parameter></term>
         <listitem>
-          <para>Esto le indica al guión configure que especifique la ruta
-          de búsqueda de librerías por defecto durante la compilación de
-          Binutils, resultando en que se le pase <filename
-          class="directory">/tools/lib</filename> al enlazador. Esto evita
-          que el enlazador busque en los directorios de librerías del
-          anfitrión.</para>
+          <para>This tells the configure script to specify the library
+          search path during the compilation of Binutils, resulting in
+          <filename class="directory">/tools/lib</filename> being passed
+          to the linker. This prevents the linker from searching through
+          library directories on the host.</para>
         </listitem>
       </varlistentry>
 
     </variablelist>
 
-    <para>Compila el paquete:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>La compilación está completa. Como se explicó antes, no recomendamos
-    ejecutar los bancos de pruebas de las herramientas temporales en este
-    capítulo. Si de todas formas deseas ejecutar el banco de pruebas de Binutils,
-    hazlo con el siguiente comando:</para>
+    <para>Compilation is now complete. As discussed earlier, running the
+    test suite is not mandatory for the temporary tools here in this
+    chapter. To run the Binutils test suite anyway, issue the following
+    command:</para>
 
 <screen><userinput>make check</userinput></screen>
 
-    <para>Instala el paquete:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-    <para>Prepara el enlazador para la fase de <quote>Reajuste</quote> del
-    próximo capítulo:</para>
+    <para>Now prepare the linker for the <quote>Re-adjusting</quote> phase in
+    the next chapter:</para>
 
 <screen><userinput>make -C ld clean
 make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen>
 
     <warning>
-      <para><emphasis>No borres</emphasis> todavía los directorios de
-      fuentes y de construcción de Binutils. Se necesitarán durante el
-      siguiente capítulo en el estado en que se encuentran ahora.</para>
+      <para><emphasis>Do not</emphasis> remove the Binutils source and build
+      directories yet. These directories will be needed again in the next
+      chapter in their current state.</para>
     </warning>
 
   </sect2>
@@ -100,8 +99,8 @@ make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen>
   <sect2 role="content">
     <title/>
 
-    <para>Los detalles sobre este paquete se encuentran en la
-    <xref linkend="contents-binutils"/>.</para>
+    <para>Details on this package are located in
+    <xref linkend="contents-binutils" role="."/></para>
 
   </sect2>
 
diff --git a/chapter05/bison.xml b/chapter05/bison.xml
index f15cbb8ae..c2222c6c1 100644
--- a/chapter05/bison.xml
+++ b/chapter05/bison.xml
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-tools-bison">
     <primary sortas="a-Bison">Bison</primary>
-    <secondary>herramientas</secondary>
+    <secondary>tools</secondary>
   </indexterm>
 
   <sect2 role="package">
@@ -39,20 +39,20 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Instalación de Bison</title>
+    <title>Installation of Bison</title>
 
-    <para>Prepara Bison para su compilación:</para>
+    <para>Prepare Bison for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-    <para>Compila el paquete:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Para comprobar los resultados, ejecuta:
+    <para>To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Instala el paquete:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
@@ -61,8 +61,8 @@
   <sect2 role="content">
     <title/>
 
-    <para>Los detalles sobre ste paquete se encuentran en la
-    <xref linkend="contents-bison"/>.</para>
+    <para>Details on this package are located in
+    <xref linkend="contents-bison" role="."/></para>
 
   </sect2>
 
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index 668af8e10..b4f1aefea 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-tools-bzip2">
     <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>herramientas</secondary>
+    <secondary>tools</secondary>
   </indexterm>
 
   <sect2 role="package">
@@ -39,14 +39,14 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Instalación de Bzip2</title>
+    <title>Installation of Bzip2</title>
 
-    <para>El paquete Bzip2 no tiene un guión <command>configure</command>.
-    Compílalo y comprueba los resultados con:</para>
+    <para>The Bzip2 package does not contain a <command>configure</command>
+    script. Compile and test it with:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Instala el paquete:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make PREFIX=/tools install</userinput></screen>
 
@@ -55,8 +55,8 @@
   <sect2 role="content">
     <title/>
 
-    <para>Los detalles sobre este paquete se encuentran en la
-    <xref linkend="contents-bzip2"/>.</para>
+    <para>Details on this package are located in
+    <xref linkend="contents-bzip2" role="."/></para>
 
   </sect2>
 
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 062afa1dc..45eba0073 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -1,57 +1,73 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-coreutils" role="wrap">
-<title>Coreutils-&coreutils-version;</title>
-<?dbhtml filename="coreutils.html"?>
+  <?dbhtml filename="coreutils.html"?>
+
+  <title>Coreutils-&coreutils-version;</title>
+
+  <indexterm zone="ch-tools-coreutils">
+    <primary sortas="a-Coreutils">Coreutils</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-coreutils">
-<primary sortas="a-Coreutils">Coreutils</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/coreutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.9 SBU</seg><seg>53.3 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.9 SBU</seg>
+        <seg>53.3 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/coreutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Coreutils</title>
+  <sect2 role="installation">
+    <title>Installation of Coreutils</title>
 
-<para>Prepare Coreutils for compilation:</para>
+    <para>Prepare Coreutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue: 
-<userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput>.  The
-<parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the
-test suite to run several additional tests that are considered
-relatively expensive (in terms of CPU power and memory usage) on some
-platforms, but generally are not a problem on Linux.</para>
+    <para>To test the results, issue:
+    <userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput>. The
+    <parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the
+    test suite to run several additional tests that are considered
+    relatively expensive (in terms of CPU power and memory usage) on some
+    platforms, but generally are not a problem on Linux.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-coreutils" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-coreutils" role="."/></para>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index c36b1b2cc..bfb09165b 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -1,68 +1,92 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-dejagnu" role="wrap">
-<title>DejaGNU-&dejagnu-version;</title>
-<?dbhtml filename="dejagnu.html"?>
+  <?dbhtml filename="dejagnu.html"?>
+
+  <title>DejaGNU-&dejagnu-version;</title>
+
+  <indexterm zone="ch-tools-dejagnu">
+    <primary sortas="a-DejaGNU">DejaGNU</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The DejaGNU package contains a framework for testing other
+    programs.</para>
 
-<indexterm zone="ch-tools-dejagnu"><primary sortas="a-DejaGNU">DejaGNU</primary></indexterm>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<sect2 role="package"><title/>
-<para>The DejaGNU package contains a framework for testing other programs.</para>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>6.1 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>6.1 MB</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, Expect,
-GCC, Glibc, Grep, Make, Sed, and Tcl</seg></seglistitem>
-</segmentedlist>
-</sect2>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, Expect, GCC, Glibc, Grep,
+        Make, Sed, and Tcl</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of DejaGNU</title>
+  </sect2>
 
-<para>Prepare DejaGNU for compilation:</para>
+  <sect2 role="installation">
+    <title>Installation of DejaGNU</title>
+
+    <para>Prepare DejaGNU for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Build and install the package:</para>
+    <para>Build and install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-</sect2>
+  </sect2>
 
 
-<sect2 id="contents-dejagnu" role="content"><title>Contents of DejaGNU</title>
+  <sect2 id="contents-dejagnu" role="content">
+    <title>Contents of DejaGNU</title>
 
-<segmentedlist>
-<segtitle>Installed program</segtitle>
-<seglistitem><seg>runtest</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
 
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
+      <seglistitem>
+        <seg>runtest</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="runtest">
-<term><command>runtest</command></term>
-<listitem>
-<para>A wrapper script that locates the proper
-<command>expect</command> shell and then runs DejaGNU</para>
-<indexterm zone="ch-tools-dejagnu runtest"><primary sortas="b-runtest">runtest</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="runtest">
+        <term><command>runtest</command></term>
+        <listitem>
+          <para>A wrapper script that locates the proper
+          <command>expect</command> shell and then runs DejaGNU</para>
+          <indexterm zone="ch-tools-dejagnu runtest">
+            <primary sortas="b-runtest">runtest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect1>
+    </variablelist>
 
+  </sect2>
+
+</sect1>
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index d20c51afc..a0ef9c878 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -1,52 +1,68 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-diffutils" role="wrap">
-<title>Diffutils-&diffutils-version;</title>
-<?dbhtml filename="diffutils.html"?>
+  <?dbhtml filename="diffutils.html"?>
+
+  <title>Diffutils-&diffutils-version;</title>
+
+  <indexterm zone="ch-tools-diffutils">
+    <primary sortas="a-Diffutils">Diffutils</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-diffutils">
-<primary sortas="a-Diffutils">Diffutils</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/diffutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>5.6 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>5.6 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/diffutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Diffutils</title>
+  <sect2 role="installation">
+    <title>Installation of Diffutils</title>
 
-<para>Prepare Diffutils for compilation:</para>
+    <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-diffutils" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-diffutils" role="."/></para>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index cb8e23c63..7aebef9d0 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -1,129 +1,164 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-expect" role="wrap">
-<title>Expect-&expect-version;</title>
-<?dbhtml filename="expect.html"?>
+  <?dbhtml filename="expect.html"?>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="ch-tools-expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-expect"><primary sortas="a-Expect">Expect</primary></indexterm>
+    <para>The Expect package contains a program for carrying out scripted
+    dialogues with other interactive programs.</para>
 
-<sect2 role="package"><title/>
-<para>The Expect package contains a program for carrying out scripted dialogues
-with other interactive programs.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>4.0 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>4.0 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Patch, Sed, and Tcl</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Expect</title>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+        Patch, Sed, and Tcl</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>First, fix a bug that can result in false failures during the GCC test
-suite run:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+    <para>First, fix a bug that can result in false failures during the GCC test
+    suite run:</para>
 
 <screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
 
-<para>Now prepare Expect for compilation:</para>
+    <para>Now prepare Expect for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>--with-tcl=/tools/lib</parameter></term>
-<listitem><para>This ensures that the configure script finds the Tcl installation in
-the temporary tools location instead of possibly locating an existing
-one on the host system.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--with-tclinclude=/tools/include</parameter></term>
-<listitem><para>This explicitly tells Expect where to find Tcl's internal headers.
-Using this option avoids conditions where <command>configure</command> fails because
-it cannot automatically discover the location of Tcl's headers.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--with-x=no</parameter></term>
-<listitem><para>This tells the configure script not to search for Tk
-(the Tcl GUI component) or the X Window System libraries, both of
-which may reside on the host system but will not exist in the temporary
-environment.</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>Build the package:</para>
+  --with-tclinclude=/tools/include --with-x=no</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--with-tcl=/tools/lib</parameter></term>
+        <listitem>
+          <para>This ensures that the configure script finds the Tcl
+          installation in the temporary tools location instead of possibly
+          locating an existing one on the host system.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
+        <listitem>
+          <para>This explicitly tells Expect where to find Tcl's internal
+          headers. Using this option avoids conditions where
+          <command>configure</command> fails because it cannot automatically
+          discover the location of Tcl's headers.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-x=no</parameter></term>
+        <listitem>
+          <para>This tells the configure script not to search for Tk (the
+          Tcl GUI component) or the X Window System libraries, both of which
+          may reside on the host system but will not exist in the temporary
+          environment.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>Build the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue: <userinput>make test</userinput>.
-Note that the Expect test suite is known to experience failures under
-certain host conditions that are not within our control. Therefore,
-test suite failures here are not surprising and are not considered
-critical.</para>
+    <para>To test the results, issue: <userinput>make test</userinput>.
+    Note that the Expect test suite is known to experience failures under
+    certain host conditions that are not within our control. Therefore,
+    test suite failures here are not surprising and are not considered
+    critical.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make SCRIPTS="" install</userinput></screen>
 
-<para>The meaning of the make parameter:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>SCRIPTS=""</parameter></term>
-<listitem><para>This prevents installation of the supplementary expect
-scripts, which are not needed.</para></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-<sect2 id="contents-expect" role="content"><title>Contents of Expect</title>
-
-<segmentedlist>
-<segtitle>Installed program</segtitle>
-<segtitle>Installed library</segtitle>
-<seglistitem><seg>expect</seg><seg>libexpect-&expect-lib-version;.a</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="expect">
-<term><command>expect</command></term>
-<listitem>
-<para>Communicates with other interactive
-programs according to a script</para>
-<indexterm zone="ch-tools-expect expect"><primary sortas="b-expect">expect</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="libexpect">
-<term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
-<listitem>
-<para>Contains functions that allow Expect to be used as a Tcl extension or to
-be used directly from C or C++ (without Tcl)</para>
-<indexterm zone="ch-tools-expect libexpect"><primary
-sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+    <variablelist>
+      <title>The meaning of the make parameter:</title>
+
+      <varlistentry>
+        <term><parameter>SCRIPTS=""</parameter></term>
+        <listitem>
+          <para>This prevents installation of the supplementary Expect
+          scripts, which are not needed.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+  <sect2 id="contents-expect" role="content">
+    <title>Contents of Expect</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <segtitle>Installed library</segtitle>
+
+      <seglistitem>
+        <seg>expect</seg>
+        <seg>libexpect-&expect-lib-version;.a</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="expect">
+        <term><command>expect</command></term>
+        <listitem>
+          <para>Communicates with other interactive programs according
+          to a script</para>
+          <indexterm zone="ch-tools-expect expect">
+            <primary sortas="b-expect">expect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libexpect">
+        <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
+        <listitem>
+          <para>Contains functions that allow Expect to be used as a Tcl
+          extension or to be used directly from C or C++ (without Tcl)</para>
+          <indexterm zone="ch-tools-expect libexpect">
+            <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index b360e759e..a5812aa19 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -1,52 +1,69 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-findutils" role="wrap">
-<title>Findutils-&findutils-version;</title>
-<?dbhtml filename="findutils.html"?>
+  <?dbhtml filename="findutils.html"?>
+
+  <title>Findutils-&findutils-version;</title>
+
+  <indexterm zone="ch-tools-findutils">
+    <primary sortas="a-Findutils">Findutils</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-findutils">
-<primary sortas="a-Findutils">Findutils</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/findutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>8.9 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>8.9 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/findutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Findutils</title>
+  <sect2 role="installation">
+    <title>Installation of Findutils</title>
 
-<para>Prepare Findutils for compilation:</para>
+    <para>Prepare Findutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-findutils" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-findutils" role="."/></para>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter05/flex.xml b/chapter05/flex.xml
index d5813dfa2..8dc7eba5a 100644
--- a/chapter05/flex.xml
+++ b/chapter05/flex.xml
@@ -1,65 +1,81 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-flex" role="wrap">
-<title>Flex-&flex-version;</title>
-<?dbhtml filename="flex.html"?>
+  <?dbhtml filename="flex.html"?>
+
+  <title>Flex-&flex-version;</title>
+
+  <indexterm zone="ch-tools-flex">
+    <primary sortas="a-Flex">Flex</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-flex">
-<primary sortas="a-Flex">Flex</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/flex.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.6 SBU</seg><seg>22.5 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.6 SBU</seg>
+        <seg>22.5 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/flex.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Flex</title>
+  <sect2 role="installation">
+    <title>Installation of Flex</title>
 
-<para>Flex contains several known bugs. These can be fixed with the
-following patch:</para>
+    <para>Flex contains several known bugs. These can be fixed with the
+    following patch:</para>
 
 <screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
 
-<para>The GNU autotools will detect that the Flex source code has been
-modified by the previous patch and tries to update the man page
-accordingly.  This does not work on many systems, and the default page is
-fine, so make sure it does not get regenerated:</para>
+    <para>The GNU autotools will detect that the Flex source code has been
+    modified by the previous patch and tries to update the man page
+    accordingly.  This does not work on many systems, and the default page is
+    fine, so make sure it does not get regenerated:</para>
 
 <screen><userinput>touch doc/flex.1</userinput></screen>
 
-<para>Now prepare Flex for compilation:</para>
+    <para>Now prepare Flex for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-flex" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-flex" role="."/></para>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index cca7101fc..fce5b6732 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -1,61 +1,79 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-gawk" role="wrap">
-<title>Gawk-&gawk-version;</title>
-<?dbhtml filename="gawk.html"?>
+  <?dbhtml filename="gawk.html"?>
+
+  <title>Gawk-&gawk-version;</title>
+
+  <indexterm zone="ch-tools-gawk">
+    <primary sortas="a-Gawk">Gawk</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-gawk">
-<primary sortas="a-Gawk">Gawk</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gawk.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>16.4 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>16.4 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gawk.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Gawk</title>
+  <sect2 role="installation">
+    <title>Installation of Gawk</title>
 
-<para>Prepare Gawk for compilation:</para>
+    <para>Prepare Gawk for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Due to a bug in the <command>configure</command> script, Gawk fails
-to detect certain aspects of locale support in Glibc. This
-bug leads to, e.g., Gettext testsuite failures. Work around this issue
-by appending the missing macro definitions to <filename>config.h</filename>:</para>
+    <para>Due to a bug in the <command>configure</command> script, Gawk fails
+    to detect certain aspects of locale support in Glibc. This bug leads to,
+    e.g., Gettext testsuite failures. Work around this issue by appending the
+    missing macro definitions to <filename>config.h</filename>:</para>
+
 <screen><userinput>cat &gt;&gt;config.h &lt;&lt;"EOF"
 <literal>#define HAVE_LANGINFO_CODESET 1
 #define HAVE_LC_MESSAGES 1</literal>
 EOF</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-gawk" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-gawk" role="."/></para>
 
+  </sect2>
+
+</sect1>