[lfs-fr] r6612 - in trunk/clfs: . chroot cross-tools/64 cross-tools/common final-system/64 final-system/common

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 26 Oct 15:49:09 PDT 2014


Author: jmengual
Date: 2014-10-26 23:49:09 +0100 (Sun, 26 Oct 2014)
New Revision: 6612

Modified:
   trunk/clfs/chroot/x86-chapter.xml
   trunk/clfs/cross-tools/64/gcc-static.xml
   trunk/clfs/cross-tools/common/binutils.xml
   trunk/clfs/final-system/64/binutils.xml
   trunk/clfs/final-system/64/gcc.xml
   trunk/clfs/final-system/common/adjusting.xml
   trunk/clfs/final-system/common/autoconf.xml
   trunk/clfs/final-system/common/automake.xml
   trunk/clfs/final-system/common/bash.xml
   trunk/clfs/final-system/common/bc.xml
   trunk/clfs/final-system/common/binutils.xml
   trunk/clfs/final-system/common/bison.xml
   trunk/clfs/final-system/common/bzip2.xml
   trunk/clfs/final-system/common/cloog.xml
   trunk/clfs/final-system/common/coreutils.xml
   trunk/clfs/final-system/common/diffutils.xml
   trunk/clfs/final-system/common/e2fsprogs.xml
   trunk/clfs/final-system/common/findutils.xml
   trunk/clfs/final-system/common/flex.xml
   trunk/clfs/final-system/common/gawk.xml
   trunk/clfs/final-system/common/gcc.xml
   trunk/clfs/final-system/common/gettext.xml
   trunk/clfs/final-system/common/gmp.xml
   trunk/clfs/final-system/common/grep.xml
   trunk/clfs/final-system/common/groff.xml
   trunk/clfs/final-system/common/gzip.xml
   trunk/clfs/final-system/common/iana-etc.xml
   trunk/clfs/final-system/common/iproute2.xml
   trunk/clfs/final-system/common/iputils.xml
   trunk/clfs/final-system/common/isl.xml
   trunk/clfs/final-system/common/kbd.xml
   trunk/clfs/final-system/common/kmod.xml
   trunk/clfs/final-system/common/less.xml
   trunk/clfs/final-system/common/libtool.xml
   trunk/clfs/final-system/common/linux-headers.xml
   trunk/clfs/final-system/common/man-pages.xml
   trunk/clfs/final-system/common/mpc.xml
   trunk/clfs/final-system/common/mpfr.xml
   trunk/clfs/final-system/common/ncurses.xml
   trunk/clfs/maj
Log:
Bientot la fin de maj



Modified: trunk/clfs/chroot/x86-chapter.xml
===================================================================
--- trunk/clfs/chroot/x86-chapter.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/chroot/x86-chapter.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -12,7 +12,6 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/before-chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
@@ -20,6 +19,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
 
 </chapter>

Modified: trunk/clfs/cross-tools/64/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/64/gcc-static.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/cross-tools/64/gcc-static.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -22,7 +22,11 @@
   <sect2 role="installation">
     <title>Installation du compilateur croisé GCC avec libgcc statique et sans Threads</title>
 
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 

Modified: trunk/clfs/cross-tools/common/binutils.xml
===================================================================
--- trunk/clfs/cross-tools/common/binutils.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/cross-tools/common/binutils.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -48,9 +48,9 @@
     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</userinput></screen>
+    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
+    --disable-static --disable-multilib --disable-werror</userinput></screen>
 
     <variablelist os="bd">
       <title>Voici la signification des nouvelles options de configure :</title>
@@ -68,7 +68,8 @@
       <varlistentry os="bd2">
         <term><parameter>--host=${CLFS_HOST}</parameter></term>
         <listitem>
-          <para>Lors d'une utilisation avec --target, ceci crée un exécutable pour une architecture croisée qui crée des fichiers pour
+          <para>Lors d'une utilisation avec <option>--target</option>, ceci crée
+          un exécutable pour une architecture croisée qui crée des fichiers pour
           ${CLFS_TARGET} mais s'exécute sur ${CLFS_HOST}.</para>
         </listitem>
       </varlistentry>
@@ -76,12 +77,20 @@
       <varlistentry os="bd3">
         <term><parameter>--target=${CLFS_TARGET}</parameter></term>
         <listitem>
-          <para>Lors d'une utilisation avec --host, ceci crée un exécutable pour une architecture croisée qui crée des  fichiers pour
+          <para>Lors d'une utilisation avec <option>--host</option>, ceci crée un exécutable pour une architecture croisée qui crée des  fichiers pour
           ${CLFS_TARGET} mais se lance sur ${CLFS_HOST}.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="bd4">
+   <varlistentry os="bd4">
+        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
+        <listitem>
+          <para>Dit à configure de construire un éditeur de lien qui utilise
+          ${CLFS} comme répertoire racine de ses chemins de recherche.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="bd5">
         <term><parameter>--with-lib-path=/tools/lib</parameter></term>
         <listitem>
           <para>Ceci dit au script configure de spécifier le chemin de recherche de la bibliothèque pendant la compilation de Binutils, le 
@@ -90,7 +99,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="bd5">
+      <varlistentry os="bd6">
         <term><parameter>--disable-nls</parameter></term>
         <listitem>
           <para>Ceci désactive l'internationalisation car i18n n'est pas nécessaire pour les outils de compilation
@@ -98,18 +107,18 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="bd6">
+      <varlistentry os="bd7">
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
           <para>Cette option désactive la construction d'un Binutils supportant le Multilib.</para>
         </listitem>
       </varlistentry>
 
- 
-      <varlistentry os="bd7">
-        <term><parameter>--enable-64-bit-bfd</parameter></term>
+      <varlistentry os="bd8">
+        <term><parameter>--disable-werror</parameter></term>
         <listitem>
-          <para>Ceci ajoute le support pour 64 bit à Binutils.</para>
+          <para>Ceci empêche la construction de s'arrêter s'il y a des avertissements
+          du compilateur de l'hôte.</para>
         </listitem>
       </varlistentry>
 
@@ -117,30 +126,12 @@
 
     <para os="be">Compilez le paquet :</para>
 
-<screen os="bf"><userinput>make configure-host
-make</userinput></screen>
+<screen os="bf"><userinput>make</userinput></screen>
 
-    <variablelist os="bg">
-      <title>Voici la signification des options de  make :</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>configure-host</parameter></term>
-        <listitem>
-          <para>Ceci vérifie l'environnement hôte et s'assure que tous les outils nécessaires sont disponibles pour compiler Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
     <para os="bh">Installez le paquet :</para>
 
 <screen os="bi"><userinput>make install</userinput></screen>
 
-    <para os="bj">Copiez <filename class="headerfile">libiberty.h</filename> vers le répertoire
-    <filename class="directory">/tools/include</filename> :</para>
-
-<screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/64/binutils.xml
===================================================================
--- trunk/clfs/final-system/64/binutils.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/64/binutils.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -76,16 +76,14 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='l'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -112,14 +110,6 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/64/gcc.xml
===================================================================
--- trunk/clfs/final-system/64/gcc.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/64/gcc.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -43,14 +43,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -65,6 +57,10 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='i1'])"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
@@ -141,6 +137,14 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/common/adjusting.xml
===================================================================
--- trunk/clfs/final-system/common/adjusting.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/adjusting.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -10,7 +10,7 @@
 
   <title>Adjusting the Toolchain</title>
 
-  <para os="a">Maintenant, on modifie le fichier de specs de GCC pour qu'il pointe vers le nouvel éditeur de liens dynamique. 
+  <para os="a">Maintenant, on ajuste le fichier de specs de GCC pour qu'il pointe vers le nouvel éditeur de liens dynamique. 
   Une commande <command>perl</command> s'en charge :</para>
 
 <screen os="c"><userinput>gcc -dumpspecs | \
@@ -18,12 +18,14 @@
      -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
      $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
 
-  <para os="d">C'est une bonne idée d'examiner visuellement le fichier de specs 
-  pour vérifier que le changement voulu a bien été effectué en fin de compte.</para>
+  <para os="d">La commande <command>perl</command> ci-dessus apporte 2 modifications
+  aux specs de GCC : il supprime <quote>/tools</quote> du nom du chemin
+  menant à l'éditeur de liens dynamiques et il ajoute <quote>/usr/lib/</quote>
+  au startfile_prefix_spec. C'est une bonne idée d'examiner visuellement le
+  fichier <filename>specs</filename> et de le comparer avec la sortie de
+  <command>gcc -dumpspecs</command>, pour vérifier que les changements attendus
+  ont bien été faits.</para>
 
-  <para os="e">Remarquez que <filename class="directory">/lib</filename> est à présent le préfixe de notre nouvel éditeur de 
-  liens dynamique.</para>
-
   <caution>
 
   <para os="f">Il est impératif à ce moment d'arrêter et de vous assurer que les

Modified: trunk/clfs/final-system/common/autoconf.xml
===================================================================
--- trunk/clfs/final-system/common/autoconf.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/autoconf.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -57,7 +57,7 @@
 
       <seglistitem>
         <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
-        et ifnames</seg>
+        ifnames</seg>
         <seg>/usr/share/autoconf</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/clfs/final-system/common/automake.xml
===================================================================
--- trunk/clfs/final-system/common/automake.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/automake.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -27,7 +27,7 @@
 
     <para os="a">Préparez la compilation d'Automake :</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 
@@ -51,10 +51,10 @@
       <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
-        <seg>acinstall, aclocal, aclocal-&automake-version2;, automake,
+        <seg>aclocal, aclocal-&automake-version2;, automake,
         automake-&automake-version2;, compile, config.guess, config.sub,
-        depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
-        py-compile, symlink-tree et ylwrap</seg>
+        depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
+        py-compile, symlink-tree, ylwrap</seg>
         <seg>/usr/share/aclocal-&automake-version2;,
         /usr/share/automake-&automake-version2;, /usr/share/doc/automake</seg>
       </seglistitem>
@@ -65,16 +65,6 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="acinstall">
-        <term><command>acinstall</command></term>
-        <listitem>
-          <para>Un script qui installe des fichiers M4, style aclocal</para>
-          <indexterm zone="ch-system-automake acinstall">
-            <primary sortas="b-acinstall">acinstall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="aclocal">
         <term><command>aclocal</command></term>
         <listitem>
@@ -165,16 +155,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="elisp-comp">
-        <term><command>elisp-comp</command></term>
-        <listitem>
-          <para>Compile le code Lisp d'Emacs</para>
-          <indexterm zone="ch-system-automake elisp-comp">
-            <primary sortas="b-elisp-comp">elisp-comp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="install-sh">
         <term><command>install-sh</command></term>
         <listitem>

Modified: trunk/clfs/final-system/common/bash.xml
===================================================================
--- trunk/clfs/final-system/common/bash.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/bash.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -32,10 +32,11 @@
     <para os="a">Préparez la compilation de Bash :</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline</userinput></screen>
+    --without-bash-malloc --with-installed-readline \
+    --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
 
     <variablelist os="c">
-      <title>Voici la signification de l'options de configure :</title>
+      <title>Voici la signification de la nouvelle option de configure :</title>
 
       <varlistentry>
         <term><parameter>--with-installed-readline</parameter></term>
@@ -57,7 +58,7 @@
 
     <para os="g">Installez le paquet :</para>
 
-<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
     <para os="i">Lancez le programme <command>bash</command> nouvellement
     compilé (en remplaçant celui en cours d'exécution) :</para>
@@ -80,7 +81,7 @@
       <segtitle>Programmes installés</segtitle>
       <segtitle>Répertoire installé</segtitle>
       <seglistitem>
-        <seg>bash, bashbug et sh (link to bash)</seg>
+        <seg>bash, bashbug, sh (link to bash)</seg>
         <seg>/usr/share/doc/bash-&bash-version;</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/clfs/final-system/common/bc.xml
===================================================================
(Binary files differ)

Modified: trunk/clfs/final-system/common/binutils.xml
===================================================================
--- trunk/clfs/final-system/common/binutils.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/binutils.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -61,9 +61,9 @@
 
     <para os="j">Compilez le paquet :</para>
 
-<screen os="k"><userinput>make configure-host</userinput></screen>
+<screen os="k"><userinput>make tooldir=/usr</userinput></screen>
 
-    <important os="l">
+<!--    <important os="l">
       <para>Pendant <command>make configure-host</command> il se peut que vous receviez le message d'erreur suivant. Vous 
       pouvez l'ignorer en toute sécurité.</para>
 
@@ -72,6 +72,7 @@
 package in order for those modifications to take effect. You
 can get `Flex' from any GNU archive site.</computeroutput></screen>
     </important>
+-->
 
 <screen os="m"><userinput>make tooldir=/usr</userinput></screen>
 
@@ -95,8 +96,9 @@
 
 
     <important os="o">
-      <para>La suite de tests de Binutils dans cette section est
-      considérée comme critique. Ne la sautez sous aucun prétexte.</para>
+      <para>Étant donné le rôle critique de Binutils dans le bon fonctionnement
+      d'un système, les développeurs de CLFS recommandent fortement de lancer la
+      suite de tests.</para>
     </important>
 
     <para os="p">Testez les résultats :</para>
@@ -107,11 +109,6 @@
 
 <screen os="s"><userinput>make tooldir=/usr install</userinput></screen>
 
-    <para os="t">Installez le fichier d'en-tête <filename class="headerfile">libiberty</filename> dont ont besoin certains 
-    paquets :</para>
-
-<screen os="u"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /usr/include</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-binutils" role="content">
@@ -122,10 +119,9 @@
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoire installé</segtitle>
       <seglistitem>
-        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm, objcopy,
-        objdump,
-        ranlib, readelf, size, strings et strip</seg>
-        <seg>libiberty.a, libbfd.[a,so] et libopcodes.[a,so]</seg>
+        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
+        objcopy, objdump, ranlib, readelf, size, strings, strip</seg>
+        <seg>libbfd.[a,so], libopcodes.[a,so]</seg>
         <seg>/usr/lib/ldscripts</seg>
       </seglistitem>
     </segmentedlist>
@@ -313,19 +309,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libiberty">
-        <term><filename class="libraryfile">libiberty</filename></term>
-        <listitem>
-          <para>Contient des routines utilisées par différents programmes GNU comme
-          <command>getopt</command>, <command>obstack</command>,
-          <command>strerror</command>, <command>strtol</command> et
-          <command>strtoul</command></para>
-          <indexterm zone="ch-system-binutils libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libbfd">
         <term><filename class="libraryfile">libbfd</filename></term>
         <listitem>

Modified: trunk/clfs/final-system/common/bison.xml
===================================================================
--- trunk/clfs/final-system/common/bison.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/bison.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -24,14 +24,10 @@
   <sect2 role="installation">
     <title>Installation de Bison</title>
 
-    <para os="t3">Le script <command>configure </command> ne détermine pas la
-    bonne valeur pour la suite. Définissez-la donc à la main :</para>
-
-<screen os="t4"><userinput>echo "ac_cv_prog_lex_is_flex=yes" > config.cache</userinput></screen>
-
     <para os="a">Préparez la compilation de Bison :</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
     <para os="c">Compilez le paquet :</para>
 
 <screen os="d"><userinput>make</userinput></screen>
@@ -55,7 +51,7 @@
       <segtitle>Répertoire installé</segtitle>
 
       <seglistitem>
-        <seg>bison and yacc</seg>
+        <seg>bison, yacc</seg>
         <seg>liby.a</seg>
         <seg>/usr/share/bison</seg>
       </seglistitem>

Modified: trunk/clfs/final-system/common/bzip2.xml
===================================================================
--- trunk/clfs/final-system/common/bzip2.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/bzip2.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -33,6 +33,12 @@
 
 <screen os="s2"><userinput>sed -i -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' Makefile</userinput></screen>
 
+    <para os="s3">Faites installer à Bzip2 ses pages de man cans
+    <filename class="directory">/usr/share/man</filename> et non dans
+    <filename class="directory">/usr/man</filename> :</para>
+
+<screen os="s4"><userinput>sed -i 's at X)/man at X)/share/man at g' ./Makefile</userinput></screen>
+
     <para os="a">Le paquet Bzip2 ne contient pas de script <command>configure</command>. Compilez-le avec :</para>
 
 <screen os="b"><userinput>make -f Makefile-libbz2_so
@@ -72,10 +78,9 @@
       <seglistitem>
         <seg>bunzip2 (lien vers bzip2), bzcat (lien vers bzip2), bzcmp (lien vers
         bzdiff), bzdiff, bzegrep (lien vers bzgrep), bzfgrep (lien vers bzgrep),
-        bzgrep, bzip2, bzip2recover, bzless (lien vers bzmore) et bzmore</seg>
-
-        <seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
-        libbz2.so.&bzip2-version;) et libbz2.so.&bzip2-version;</seg>
+        bzgrep, bzip2, bzip2recover, bzless (lien vers bzmore), bzmore</seg>
+        <seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (lien vers
+        libbz2.so.&bzip2-version;), libbz2.so.&bzip2-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/cloog.xml
===================================================================
--- trunk/clfs/final-system/common/cloog.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/cloog.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -32,7 +32,7 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --enable-shared</userinput></screen>
+  ./configure --prefix=/usr --with-isl=system</userinput></screen>
 
     <para os="s1">Appliquez un <command>sed</command> qui empêche une tentative
     d'installation d'un fichier invalide :</para>
@@ -43,19 +43,14 @@
 
 <screen os="d"><userinput>make</userinput></screen>
 
-    <important os="e">
-      <para>La suite de tests de CLooG est considérée comme critique.
-      Ne la sautez sous aucun prétexte.</para>
-    </important>
+    <para os="e">Testez les résultats :</para>
 
-    <para os="f">Testez les résultats :</para>
+<screen os="f"><userinput remap="test">make check</userinput></screen>
 
-<screen os="g"><userinput remap="test">make check</userinput></screen>
+    <para os="g">Installez le paquet :</para>
 
-    <para os="h">Installez le paquet :</para>
+<screen os="h"><userinput>make install</userinput></screen>
 
-<screen os="i"><userinput>make install</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-cloog" role="content">

Modified: trunk/clfs/final-system/common/coreutils.xml
===================================================================
--- trunk/clfs/final-system/common/coreutils.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/coreutils.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -37,8 +37,8 @@
 <screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 \
   ./configure --prefix=/usr \
      --enable-no-install-program=kill,uptime \
-     --enable-install-program=hostname</userinput></screen>
-    
+     --enable-install-program=hostname --libexecdir=/usr/lib</userinput></screen>
+
     <variablelist os="d1">
       <title>Voici la signification des options de configure :</title>
       
@@ -56,43 +56,40 @@
 
 <screen os="f"><userinput>make</userinput></screen>
 
-    <para os="g">La suite de tests de Coreutils fait plusieurs suppositions sur la présence d'utilisateurs et de groupes
-    système qui ne sont pas valides à l'intérieur de l'environnement minimal existant pour le moment. Donc
-    nous allons réutiliser les groupes et l'utilisateur dummy créés avec
-    Util-linux. Passez à <quote>Installez le paquet</quote> si vous n'avez pas 
-    lancé la suite de tests et si vous n'avez pas créé les groupes et les 
-    utilisateurs dummy à Util-linux.</para>
-
-    <para os="h">La suite de tests est maintenant prête à être exécutée. Tout
+    <para os="g">La suite de tests est maintenant prête à être exécutée. Tout
     d'abord, lancez les quelques tests qui ont besoin d'être lancés en tant que
     <systemitem class="username">root</systemitem> :</para>
 
-<screen os="i"><userinput remap="test">make NON_ROOT_USERNAME=dummy</userinput></screen>
+<screen os="h"><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
 
-    <para os="j">Nous allons maintenant lancer la suite de tests en tant
-    qu'utilisateur <systemitem class="username">dummy</systemitem>. Corrigez les
-    droits de quelques fichiers pour autoriser cela :</para>
-    
-<screen os="k"><userinput remap="test">chown -Rv dummy .</userinput></screen>
+    <para os="i">La suite de tests va maintenant se lancer en tant
+    qu'utilisateur <systemitem class="username">dummy</systemitem>. Certains tests
+    exigent que l'utilisateur soit membre de plusieurs groupes Ajoutez un groupe
+    temporaire et intrégrez-y <systemitem class="username">nobody</systemitem>
+    pour que les tests ne soient pas passés :</para>
 
-    <para os="l">Puis, exécutez le reste des tests en tant qu'utilisateur
+<screen os="j"><userinput remap="test">echo "dummy:x:1000:nobody" >> /etc/group</userinput></screen>
+
+    <para os="k">Corrigez les droits de certains fichiers pour que l'utilisateur
+    non-root puisse compiler et lancer les tests :</para>
+
+<screen os="l"><userinput remap="test">chown -Rv nobody .</userinput></screen>
+
+    <para os="m">Puis, exécutez le reste des tests en tant qu'utilisateur
     <systemitem class="username">nobody</systemitem> :</para>
 
-<screen os="m"><userinput remap="test">su dummy -s /bin/bash \
+<screen os="n"><userinput remap="test">su dummy -s /bin/bash \
     -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
 
-    <para os="n">Lorsque les tests sont complétés, supprimez l'utilisateur et les groupes
-    <systemitem class="username">dummy</systemitem> :</para>
+    <para os="o">Supprimez le groupe temporaire :</para>
 
-<screen os="o"><userinput remap="test">sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
+<screen os="p"><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
 
-    <para os="p">Installez le paquet :</para>
+    <para os="q">Installez le paquet :</para>
 
-<screen os="q"><userinput>make install</userinput></screen>
+<screen os="r"><userinput>make install</userinput></screen>
 
-    <para os="r">Installez le paquet :</para>
-
-    <para os="s">Déplacez quelques programmes aux emplacements spécifiés par le
+    <para os="s">Déplacez des programmes aux emplacements spécifiés par le
     FHS :</para>
 
 <screen os="t"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
@@ -100,14 +97,6 @@
 mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
 mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
 
-    <para os="u">D'autres programmes de Coreutils sont utilisés par certains des scripts du paquet CLFS-Bootscripts. Comme il 
-    se peut que <filename class="directory">/usr</filename> ne soit pas disponible pendant les premières étapes du démarrage, 
-    ces binaires doivent être sur la partition racine :</para>
-
-<screen os="v"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
-mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
-ln -svf ../../bin/install /usr/bin</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-coreutils" role="content">
@@ -127,7 +116,7 @@
         rmdir, runcon, seq, sha1sum, sha224sum, sha256sum, sha384sum,
         sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum,
         sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort,
-        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes</seg>
+        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, yes</seg>
         <seg>libstdbuf.so</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/clfs/final-system/common/diffutils.xml
===================================================================
--- trunk/clfs/final-system/common/diffutils.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/diffutils.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -25,13 +25,20 @@
   <sect2 role="installation">
     <title>Installation de Diffutils</title>
 
+    <para os="s1">Corrigez un bogue qui empêche les fichiers de locale de
+    s'installer :</para>
+
+<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
+
     <para os="a">Préparez la compilation de Diffutils :</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="s1">Diffutils veut <command>ed</command> comme éditeur. Le sed suivant va nous permettre d'utiliser vim :</para>
+    <para os="s3">Diffutils veut <command>ed</command> comme éditeur de <command>sdiff</command>. 
+    Le <command>sed</command> suivant passe l'éditeur par défaut à
+    <command>vi</command> :</para>
 
-<screen os="s2"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
+<screen os="s4"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 
@@ -54,7 +61,7 @@
       <segtitle>Programmes installés</segtitle>
 
       <seglistitem>
-        <seg>cmp, diff, diff3 et sdiff</seg>
+         <seg>cmp, diff, diff3, sdiff</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/e2fsprogs.xml
===================================================================
--- trunk/clfs/final-system/common/e2fsprogs.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/e2fsprogs.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -66,6 +66,17 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry os="e3">
+        <term><parameter>--disable-*</parameter></term>
+        <listitem>
+          <para>Ceci empêche E2fsprogs de construire et d'installer les bibliothèques
+          <systemitem class="library">libuuid</systemitem> et
+          <systemitem class="library">libblkid</systemitem>, le démon
+          <systemitem class="daemon">uuidd</systemitem> et l'enveloppe
+          <command>fsck</command>, car Util-Linux les a installés plus tôt.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para os="f">Compilez le paquet :</para>
@@ -99,9 +110,9 @@
         e2fsck, e2image, e2initrd_helper, e2label, e2undo, e4defrag, filefrag,
         fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
         mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
-        mklost+found, resize2fs, et tune2fs</seg>
+        mklost+found, resize2fs, tune2fs</seg>
         <seg>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so],
-        libss.[a,so] et libquota.a</seg>
+        libss.[a,so], libquota.a</seg>
         <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
         /usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
       </seglistitem>
@@ -184,7 +195,7 @@
         <listitem>
           <para>Est utilisé pour vérifier, et quelque fois réparer, les systèmes de
           fichiers <systemitem class="filesystem">ext2</systemitem>,
-          <systemitem class="filesystem">ext3</systemitem> et <systemitem 
+          <systemitem class="filesystem">ext3</systemitem> et <systemitem
           class="filesystem">ext4</systemitem></para>
           <indexterm zone="ch-system-e2fsprogs e2fsck">
             <primary sortas="b-e2fsck">e2fsck</primary>

Modified: trunk/clfs/final-system/common/findutils.xml
===================================================================
--- trunk/clfs/final-system/common/findutils.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/findutils.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -62,17 +62,6 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="i">Le programme <command>find</command> est utilisé par certains des scripts du paquet CLFS-Bootscripts. Comme 
-    il se peut que <filename class="directory">/usr</filename> ne soit pas disponible pendant les premières étapes du 
-    démarrage, le binaire <command>find</command> doit être sur la partition racine :</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/find /bin</userinput></screen>
-
-    <para os="k">Le script <command>updatedb</command> doit être modifié pour pointer vers le nouvel emplacement de 
-    <command>find</command> :</para> 
-
-<screen os="l"><userinput>sed -i 's at find:=${BINDIR}@find:=/bin@' /usr/bin/updatedb</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-findutils" role="content">
@@ -83,7 +72,7 @@
       <segtitle>Répertoire installé</segtitle>
 
       <seglistitem>
-        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
+        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, xargs</seg>
         <seg>/usr/lib/locate</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/clfs/final-system/common/flex.xml
===================================================================
--- trunk/clfs/final-system/common/flex.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/flex.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -27,7 +27,7 @@
 
     <para os="a">Préparez la compilation de Flex :</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 
@@ -37,25 +37,23 @@
 
 <screen os="e2"><userinput remap="test">make check</userinput></screen>
 
+    <para os="e3">La suite de tests signalera 3 échecs, pour des tests qui
+    utilisent <command>bison</command>, lequel n'est pas encore installé. Pour
+    faire tous les tests, vous pouvez relancer la suite de tests de Flex après
+    avoir installé Bison.</para>
+
     <para os="f">Installez le paquet :</para>
 
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="h">Quelques paquets s'attendent à trouver la bibliothèque
-    <filename class="libraryfile">lex</filename> dans <filename
-    class="directory">/usr/lib</filename>. Créez un lien symbolique pour
-    en tenir compte :</para>
-
-<screen os="i"><userinput>ln -sv libfl.a /usr/lib/libl.a</userinput></screen>
-
-    <para os="j">Quelques programmes ne connaissent pas encore
+    <para os="h">Quelques programmes ne connaissent pas encore
     <command>flex</command> et essaient de lancer son prédécesseur,
     <command>lex</command>. Pour ces programmes, créez un script enveloppe
     nommé <filename>lex</filename> appelant <filename>flex</filename> en
     mode d'émulation <command>lex</command> :</para>
 
 
-<screen os="k"><userinput>cat > /usr/bin/lex << "EOF"
+<screen os="i"><userinput>cat > /usr/bin/lex << "EOF"
 <literal>#!/bin/sh
 # Début de /usr/bin/lex
 
@@ -73,10 +71,12 @@
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoire installé</segtitle>
 
       <seglistitem>
-        <seg>flex and lex</seg>
-        <seg>libfl.a et libfl_pic.a</seg>
+        <seg>flex, flex++ (lien vers flex), lex</seg>
+        <seg>libfl.[a,so], libfl_pic.[a,so]</seg>
+        <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -120,21 +120,21 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libfl.a">
-        <term><filename class="libraryfile">libfl.a</filename></term>
+      <varlistentry id="libfl">
+        <term><filename class="libraryfile">libfl</filename></term>
         <listitem>
           <para>La bibliothèque <filename class="libraryfile">flex</filename></para>
-          <indexterm zone="ch-system-flex libfl.a">
-            <primary sortas="c-libfl.a">libfl.a</primary>
+          <indexterm zone="ch-system-flex libfl">
+            <primary sortas="c-libfl">libfl</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-      <varlistentry id="libfl_pic.a">
-        <term><filename class="libraryfile">libfl_pic.a</filename></term>
+      <varlistentry id="libfl_pic">
+        <term><filename class="libraryfile">libfl_pic</filename></term>
         <listitem>
           <para>La bibliothèque <filename class="libraryfile">flex</filename></para>
-          <indexterm zone="ch-system-flex libfl_pic.a">
-            <primary sortas="c-libfl.a">libfl_pic.a</primary>
+          <indexterm zone="ch-system-flex libfl_pic">
+            <primary sortas="c-libfl">libfl_pic</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/clfs/final-system/common/gawk.xml
===================================================================
--- trunk/clfs/final-system/common/gawk.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/gawk.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -41,6 +41,11 @@
 
 <screen os="g"><userinput>make install</userinput></screen>
 
+    <para os="h">Installez la documentation :</para>
+
+<screen os="i"><userinput>mkdir -v /usr/share/doc/gawk-&gawk-version;
+cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-gawk" role="content">
@@ -52,8 +57,9 @@
 
       <seglistitem>
         <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
-        pgawk, pgawk-&gawk-version; et pwcat</seg>
-        <seg>/usr/lib/awk, /usr/share/awk</seg>
+        pgawk, pgawk-&gawk-version;, pwcat</seg>
+        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
+        /usr/share/doc/gawk-&gawk-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/gcc.xml
===================================================================
--- trunk/clfs/final-system/common/gcc.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/gcc.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -30,19 +30,11 @@
 
     <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
 
-    <para os="fix1">Appliquez une subsitution <command>sed</command> qui
+    <para os="fix1">Appliquez une substitution <command>sed</command> qui
     supprimera l'exécution du script <command>fixincludes</command> :</para>
 
-<screen os="fix2"><userinput>cp -v gcc/Makefile.in{,.orig}
-sed 's@\./fixinc\.sh at -c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
+<screen os="fix2"><userinput>sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in</userinput></screen>
 
-    <para os="d">Appliquez une substitution <command>sed</command> qui va supprimer l'installation de
-    <filename class="libraryfile">libiberty.a</filename>. La
-    version of <filename class="libraryfile">libiberty.a</filename> fournie par Binutils sera utilisée à la 
-    place :</para>
-
-<screen os="e"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
-
     <para os="f">La documentation de GCC recommande de construire GCC en dehors
     du répertoire source, c'est-à-dire dans un répertoire dédié :</para>
 
@@ -52,25 +44,37 @@
 
     <para os="h">Préparez la compilation de GCC :</para>
 
-<screen os="i"><userinput>CC="gcc -isystem /usr/include" \
+<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include" \
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
   ../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
-    --enable-clocale=gnu --enable-languages=c,c++ \
+    --libexecdir=/usr/lib --enable-threads=posix \
+    --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ \
     --disable-multilib --disable-libstdcxx-pch \
-    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
-    --enable-checking=release --enable-libstdcxx-time \
-    --disable-install-libiberty</userinput></screen>
+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
+    <variablelist os="i1">
+      <title>Voici la signification de la nouvelle option de configuration :</title>
+
+      <varlistentry>
+        <term><parameter>SED=sed</parameter></term>
+        <listitem>
+          <para>Ceci empêche un chemin codé en dur, vers 
+          <filename>/tools/bin/sed</filename>, de figurer dans le programme
+          <command>fixincl</command>.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
     <para os="j">Compilez le paquet :</para>
 
 <screen os="k"><userinput>make</userinput></screen>
 
     <important os="l">
-      <para>Dans cette section, la suite de tests pour GCC est considérée
-      critique. Ne les sautez sous aucun prétexte.</para>
+      <para>Étant donné le rôle critique de GCC dans le bon fonctionnement
+      d'un système, les développeurs de CLFS recommandent fortement de lancer la
+      suite de tests.</para>
     </important>
 
    <para os="s1">Augmentez la taille de la pile avant de lancer les tests :</para>
@@ -99,22 +103,27 @@
 
 <screen os="t"><userinput>make install</userinput></screen>
 
-    <para os="u">Quelques paquets s'attendent à ce que le préprocesseur C soit
+    <para os="u">Installez le fichier d'en-tête <filename class="headerfile">libiberty</filename>
+    exigée par certains paquets :</para>
+
+<screen os="v"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /usr/include</userinput></screen>
+
+    <para os="w">Quelques paquets s'attendent à ce que le préprocesseur C soit
     installé dans le répertoire 
     <filename class="directory">/lib</filename> Pour supporter ces
     paquets, créez ce lien symbolique :</para>
 
-<screen os="v"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
+<screen os="x"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
 
-    <para os="w">Beaucoup de paquets utilisent le nom <command>cc</command>
+    <para os="y">Beaucoup de paquets utilisent le nom <command>cc</command>
     pour appeler le compilateur C. Pour satisfaire ces paquets, créez un
     lien symbolique :</para>
 
-<screen os="x"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
+<screen os="z"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
 
-    <para os="y">Enfin, déplacez un fichier mal placé :</para>
+    <para os="aa">Enfin, déplacez un fichier mal placé :</para>
 
-<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
+<screen os="ab"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
 
   </sect2>
 
@@ -127,10 +136,11 @@
       <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
-        <seg>c++, cc (link to gcc), cpp, g++, gcc et gcov</seg>
-        <seg>libasan.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
-        libgomp.[a,so], libmudflap.[a,so], libmudflapth.[a,so], libssp.[a,so],
-        libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and libtsan.[a,so]</seg>
+        <seg>c++, cc (lien vers gcc), cpp, g++, gcc, gcov</seg>
+        <seg>libasan.[a,so], libatomic.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
+        libgomp.[a,so], libiberty.a, libitm.[a,so], liblto_plugin.so, libmudflap.[a,so], libmudflapth.[a,so],
+        libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a,
+        libtsan.[a,so]</seg>
         <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -213,6 +223,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libatomic">
+        <term><filename class="libraryfile">libatomic</filename></term>
+        <listitem>
+          <para>Une bibliothèque d'exécution de support GCC pour les opérations
+          atomic non supportées par le matériel</para>
+          <indexterm zone="ch-system-gcc libatomic">
+            <primary sortas="c-libatomic*">libatomic*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="libgcc">
         <term><filename class="libraryfile">libgcc</filename></term>
@@ -246,6 +266,41 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libiberty">
+        <term><filename class="libraryfile">libiberty</filename></term>
+        <listitem>
+          <para>Contient des routines utilisés par divers programmes GNU, dont
+          <command>getopt</command>, <command>obstack</command>,
+          <command>strerror</command>, <command>strtol</command> et
+          <command>strtoul</command></para>
+          <indexterm zone="ch-system-gcc libiberty">
+            <primary sortas="c-libiberty">libiberty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libitm">
+        <term><filename class="libraryfile">libitm</filename></term>
+        <listitem>
+          <para>La bibliothèque GNU Transactional Memory, qui fournit un support
+          de transaction pour les accès à la mémoire d'un processus</para>
+          <indexterm zone="ch-system-gcc libitm">
+            <primary sortas="c-libitm*">libitm*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="liblto_plugin">
+        <term><filename class="libraryfile">liblto_plugin</filename></term>
+        <listitem>
+          <para>Bibliothèque d'exécution du greffon d'optimisation du temps des
+          liens de GCC</para>
+          <indexterm zone="ch-system-gcc liblto_plugin">
++            <primary sortas="c-liblto_plugin">liblto_plugin</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
+
       <varlistentry id="libmudflap">
         <term><filename class="libraryfile">libmudflap</filename></term>
         <listitem>

Modified: trunk/clfs/final-system/common/gettext.xml
===================================================================
--- trunk/clfs/final-system/common/gettext.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/gettext.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -31,7 +31,7 @@
 
     <para os="a">Préparez la compilation de Gettext :</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 
@@ -59,10 +59,11 @@
         <seg>autopoint, config.charset, config.rpath, envsubst, gettext,
         gettext.sh, gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm,
         msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge,
-        msgunfmt, msguniq, ngettext, recode-sr-latin et xgettext</seg>
+        msgunfmt, msguniq, ngettext, recode-sr-latin, xgettext</seg>
         <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
-        libgettextsrc.so, and preloadable_libintl.so</seg>   
-        <seg>/usr/lib/gettext, /usr/share/doc/gettext, /usr/share/gettext</seg>
+        libgettextsrc.so, preloadable_libintl.so</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+        /usr/share/gettext</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -81,7 +82,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="config.charset">
         <term><command>config.charset</command></term>
         <listitem>

Modified: trunk/clfs/final-system/common/gmp.xml
===================================================================
--- trunk/clfs/final-system/common/gmp.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/gmp.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -44,25 +44,29 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --enable-cxx</userinput></screen>
+  ./configure --prefix=/usr --enable-cxx \
+  --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 
 <screen os="d"><userinput>make</userinput></screen>
 
-    <important os="e">
-      <para>La suite de tests pour GMP est considérée comme critique. Ne la 
-      sautez sous aucun prétexte.</para>
-    </important>
+    <para os="e">Construisez la documentation HTML :</para>
 
-    <para os="f">Testez les résultats :</para>
+<screen os="f"><userinput>make html</userinput></screen>
 
-<screen os="g"><userinput remap="test">make check</userinput></screen>
+    <para os="g">Testez les résultats :</para>
 
-    <para os="h">Installez le paquet :</para>
+<screen os="h"><userinput remap="test">make check</userinput></screen>
 
-<screen os="i"><userinput>make install</userinput></screen>
+    <para os="i">Installez le paquet :</para>
 
+<screen os="j"><userinput>make install</userinput></screen>
+
+    <para os="k">Installez la documentation :</para>
+
+<screen os="l"><userinput>make install-html</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-gmp" role="content">
@@ -70,9 +74,11 @@
 
     <segmentedlist>
       <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoire installé</segtitle>
 
       <seglistitem>
-      <seg>libgmp.[a,so], libgmpxx.[a,so], libmp.[a,so]</seg>
+      <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
+      <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -101,16 +107,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libmp">
-        <term><filename class="libraryfile">libmp</filename></term>
-        <listitem>
-          <para>Contient la bibliothèque de compatibilité Berkeley MP.</para>
-          <indexterm zone="ch-system-gmp libmp">
-            <primary sortas="c-libmp">libmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>

Modified: trunk/clfs/final-system/common/grep.xml
===================================================================
--- trunk/clfs/final-system/common/grep.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/grep.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -50,7 +50,7 @@
       <segtitle>Programmes installés</segtitle>
 
       <seglistitem>
-        <seg>egrep, fgrep et grep</seg>
+        <seg>egrep, fgrep, grep</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/groff.xml
===================================================================
--- trunk/clfs/final-system/common/groff.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/groff.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -43,14 +43,6 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="i">Quelques programmes de documentation, comme <command>xman</command>,
-    ne fonctionnent pas correctement sans les liens symboliques
-    suivants :</para>
-
-<screen os="j"><userinput>ln -sv soelim /usr/bin/zsoelim
-ln -sv eqn /usr/bin/geqn
-ln -sv tbl /usr/bin/gtbl</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-groff" role="content">
@@ -61,13 +53,12 @@
       <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
-        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk,
-        geqn (lien vers eqn), grap2graph, grn, grodvi, groff, groffer, grog,
-        grolbp, grolj4, grops, grotty, gtbl (lien vers tbl), hpftodit, indxbib,
-        lkbib, lookbib, mmroff, neqn, nroff, pdfroff, pfbtops, pic, pic2graph,
-        post-grohtml, pre-grohtml, preconv, refer, roff2dvi, roff2html,
-        roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit, troff
-        et zsoelim (lien vers soelim)</seg>
+        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk, grap2graph,
+        grn, grodvi, groff, groffer, grog, grolbp, grolj4, grops, grotty,
+        hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pdfroff,
+        pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, preconv, refer,
+        roff2dvi, roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim,
+        tbl, tfmtodit, troff</seg>
         <seg>/usr/lib/groff, /usr/share/doc/groff-&groff-version;, /usr/share/groff</seg>
       </seglistitem>
     </segmentedlist>
@@ -143,16 +134,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="geqn">
-        <term><command>geqn</command></term>
-        <listitem>
-          <para>Un lien vers <command>eqn</command></para>
-          <indexterm zone="ch-system-groff geqn">
-            <primary sortas="b-geqn">geqn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="grap2graph">
         <term><command>grap2graph</command></term>
         <listitem>
@@ -267,16 +248,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="gtbl">
-        <term><command>gtbl</command></term>
-        <listitem>
-          <para>Un lien vers <command>tbl</command></para>
-          <indexterm zone="ch-system-groff gtbl">
-            <primary sortas="b-gtbl">gtbl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="hpftodit">
         <term><command>hpftodit</command></term>
         <listitem>
@@ -561,15 +532,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-      <varlistentry id="zsoelim">
-        <term><command>zsoelim</command></term>
-        <listitem>
-          <para>Un lien vers <command>soelim</command></para>
-          <indexterm zone="ch-system-groff zsoelim">
-            <primary sortas="b-zsoelim">zsoelim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
     </variablelist>
 

Modified: trunk/clfs/final-system/common/gzip.xml
===================================================================
--- trunk/clfs/final-system/common/gzip.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/gzip.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -57,7 +57,7 @@
 
       <seglistitem>
         <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff,
-        zegrep, zfgrep, zforce, zgrep, zless, zmore et znew</seg>
+        zegrep, zfgrep, zforce, zgrep, zless, zmore, znew</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/iana-etc.xml
===================================================================
--- trunk/clfs/final-system/common/iana-etc.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/iana-etc.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -25,8 +25,8 @@
   <sect2 role="installation">
     <title>Installation de Iana-Etc</title>
 
-    <para os="p2">Le correctif suivant met à jour les fichiers xml services et
-    de protocole :</para>
+    <para os="p2">Le correctif suivant contient les fichiers xml des mises à
+    jour des fichiers services et protocol :</para>
 
 <screen os="p3"><userinput>xzcat ../&iana-etc-numbers_update-patch; | patch -Np1 -i -</userinput></screen>
 
@@ -53,7 +53,7 @@
       <segtitle>Fichier installés</segtitle>
 
       <seglistitem>
-        <seg>/etc/protocols and /etc/services</seg>
+        <seg>/etc/protocols, /etc/services</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/iproute2.xml
===================================================================
--- trunk/clfs/final-system/common/iproute2.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/iproute2.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -34,48 +34,17 @@
 
 <screen os="s2"><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile
 sed -i '/ARPD/d' Makefile
-rm -v man/man8/arpd.8</userinput></screen>
+sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
-    <para os="f1">Supprimez les en-têtes libnl inutilisés :</para>
-    
-    <screen os="f2"><userinput>sed -i '/netlink\//d' ip/ipl2tp.c</userinput></screen>
-
     <para os="a">Compilez le paquet :</para>
 
-<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
-     MANDIR=/usr/share/man</userinput></screen>
 
-    <variablelist os="c">
-      <title>Voici la signification de l'option de make :</title>
+    <para os="c">Ce paquet ne fournit pas de suite de tests.</para>
 
-      <varlistentry>
-        <term><parameter>DESTDIR=</parameter></term>
-        <listitem>
-          <para>Cette option remplace le DESTDIR de /usr par défaut afin que les
-          binaires IPRoute2 soient installés dans
-          <filename class="directory">/sbin</filename>. C'est le bon emplacement
-          suivant la FHS parce que certains des binaires IPRoute2 sont utilisés
-          dans le paquet LFS-Bootscripts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
-        <listitem>
-           <para>Il peut résulter du paramètre DESTDIR=/ que la documentation
-           soit installée dans <filename class="directory">/share/doc</filename>
-           et dans <filename class="directory">/share/man</filename>. Ces options assurent
-           que les docs sont installées aux bons endroits.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <para os="d">Installez le paquet :</para>
 
-    <para os="d">Ce paquet ne fournit pas de suite de tests.</para>
+<screen os="e"><userinput>make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
-    <para os="e">Installez le paquet :</para>
-
-<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
-     MANDIR=/usr/share/man install</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-iproute2" role="content">
@@ -88,8 +57,9 @@
       <seglistitem>
         <seg>bridge, ctstat (lien vers lnstat), genl, ifcfg, ifstat, ip, lnstat,
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (lien vers lnstat), ss,
-        et tc</seg>
-        <seg>/etc/iproute2, /lib/tc, /usr/lib/tc, /usr/share/doc/iproute2</seg>
+        tc</seg>
+        <seg>/etc/iproute2, /usr/lib/tc,
+        /usr/share/doc/iproute2-&iproute2-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/iputils.xml
===================================================================
--- trunk/clfs/final-system/common/iputils.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/iputils.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -30,7 +30,7 @@
 
     <para os="a">Compilez le paquet :</para>
 
-<screen os="b"><userinput>make USE_CAP=no \
+<screen os="b"><userinput>make \
     IPV4_TARGETS="tracepath ping clockdiff rdisc" \
     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
 
@@ -54,7 +54,7 @@
       <segtitle>Programmes installés</segtitle>
 
       <seglistitem>
-        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, and traceroute6</seg>
+        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, traceroute6</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/isl.xml
===================================================================
(Binary files differ)

Modified: trunk/clfs/final-system/common/kbd.xml
===================================================================
--- trunk/clfs/final-system/common/kbd.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/kbd.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -30,22 +30,57 @@
 <screen os="b"><userinput>PKG_CONFIG_PATH="/tools/lib/pkgconfig" \
     ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
 
-    <para os="c">Compilez le paquet :</para>
-    
-<screen os="d"><userinput>make</userinput></screen>
+    <variablelist os="c">
+      <title>Voici la signification des nouvelles options de configuration :</title>
 
-    <para os="e">Ce paquet n'est pas fourni avec une suite de tests.</para>
+      <varlistentry>
+        <term><envar>PKG_CONFIG_PATH</envar></term>
+        <listitem>
+          <para>Utilise pkg-config pour savoir là où se trouve les métadonnées
+          de la bibliothèque de test construite au <xref linkend="ch-temp-system-check"/>.</para>
+        </listitem>
+      </varlistentry>
 
-    <para os="f">Installez le paquet :</para>
+      <varlistentry>
+        <term><envar>--disable-vlock</envar></term>
+        <listitem>
+          <para>Empêche Kbd d'essayer de construire le programme
+          <command>vlock</command> qui exige Linux-PAM.</para>
+        </listitem>
+      </varlistentry>
 
-<screen os="g"><userinput>make install</userinput></screen>
+      <varlistentry>
+        <term><envar>--enable-optional-progs</envar></term>
+        <listitem>
+          <para>Installe plusieurs programmes supplémentaires.</para>
+        </listitem>
+      </varlistentry>
 
-   <para os="h">Certains programmes de Kbd sont utilisés par des scripts du paquet CLFS-Bootscripts. Comme il se peut que
+    </variablelist>
+
+    <para os="d">Compilez le paquet :</para>
+
+<screen os="e"><userinput>make</userinput></screen>
+
+    <para os="f">Pour tester les résultats, lancez :</para>
+
+<screen os="g"><userinput remap="test">make check</userinput></screen>
+
+    <para os="h">Installez le paquet :</para>
+
+<screen os="i"><userinput>make install</userinput></screen>
+
+   <para os="j">Certains programmes de Kbd sont utilisés par des scripts du paquet CLFS-Bootscripts. Comme il se peut que
     <filename class="directory">/usr</filename> ne soit pas disponibles lors des premières étapes du démarrage, ces binaires 
     doivent être sur la partition racine :</para>
 
-<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont,setvtrgb} /bin</userinput></screen>
+<screen os="k"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont,setvtrgb} /bin</userinput></screen>
 
+    <para os="l">Installez la documentation :</para>
+
+<screen os="m"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-kbd" role="content">
@@ -61,8 +96,9 @@
         (lien vers psfxtable), psfgettable (lien vers psfxtable), psfstriptable
         (lien vers psfxtable), psfxtable, resizecons, setfont, setkeycodes,
         setleds, setmetamode, setvtrgb, showconsolefont, showkey,
-        unicode_start, et unicode_stop</seg>
+        unicode_start, unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
+        /usr/share/doc/kbd-&kbd-version;,
         /usr/share/keymaps, /usr/share/unimaps</seg>
 
       </seglistitem>
@@ -199,7 +235,7 @@
       <varlistentry id="psfaddtable">
         <term><command>psfaddtable</command></term>
         <listitem>
-          <para>Un lien vers <command>psfxtable</command></para>
+          <para>Ajoute une table de caractères Unicode à une police de console</para>
           <indexterm zone="ch-system-kbd psfaddtable">
             <primary sortas="b-psfaddtable">psfaddtable</primary>
           </indexterm>
@@ -209,7 +245,7 @@
       <varlistentry id="psfgettable">
         <term><command>psfgettable</command></term>
         <listitem>
-          <para>Un lien vers <command>psfxtable</command></para>
+          <para>Extrait la table de caractères Unicode d'une police de console</para>
           <indexterm zone="ch-system-kbd psfgettable">
             <primary sortas="b-psfgettable">psfgettable</primary>
           </indexterm>
@@ -219,7 +255,8 @@
       <varlistentry id="psfstriptable">
         <term><command>psfstriptable</command></term>
         <listitem>
-          <para>Un lien vers <command>psfxtable</command></para>
+          <para>Supprime la table de caractères Unicode embarquée de la police
+          de console</para>
           <indexterm zone="ch-system-kbd psfstriptable">
             <primary sortas="b-psfstriptable">psfstriptable</primary>
           </indexterm>

Modified: trunk/clfs/final-system/common/kmod.xml
===================================================================
--- trunk/clfs/final-system/common/kmod.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/kmod.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -30,7 +30,7 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr \
     --bindir=/bin --sysconfdir=/etc \
-    --with-rootlibdir=/lib --disable-manpages \
+    --with-rootlibdir=/lib \
     --with-zlib --with-xz</userinput></screen>
 
     <variablelist os="c">
@@ -64,18 +64,15 @@
 
     <para os="g">Installez le paquet :</para>
 
-<screen os="h"><userinput>make install
-make -C man install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
     <para os="i">Créez des liens symboliques pour les programmes qui cherchent
-    Module-Init-Tools.</para>
+    Module-Init-Tools :</para>
 
 <screen os="j"><userinput>ln -sfv kmod /bin/lsmod
-ln -sfv ../bin/kmod /sbin/depmod
-ln -sfv ../bin/kmod /sbin/insmod
-ln -sfv ../bin/kmod /sbin/modprobe
-ln -sfv ../bin/kmod /sbin/modinfo
-ln -sfv ../bin/kmod /sbin/rmmod</userinput></screen>
+for tool in depmod insmod modinfo modprobe rmmod; do
+    ln -sfv ../bin/kmod /sbin/${tool}
+done</userinput></screen>
 
   </sect2>
 
@@ -86,8 +83,9 @@
       <segtitle>Programmes installés</segtitle>
 
       <seglistitem>
-        <seg>depmod, insmod, kmod, lsmod, modinfo, modprobe et
-        rmmod</seg>
+        <seg>depmod (lien vers kmod), insmod (lien vers kmod), kmod,
+        lsmod (lien vers kmod), modinfo (link to kmod), modprobe (lien vers kmod),
+        rmmod (lien vers kmod) </seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/less.xml
===================================================================
--- trunk/clfs/final-system/common/less.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/less.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -30,33 +30,20 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
 
-    <variablelist os="c">
-      <title>Voici la signification de l'option de configure :</title>
+    <para os="c">Compilez le paquet :</para>
 
-      <varlistentry>
-        <term><parameter>--sysconfdir=/etc</parameter></term>
-        <listitem>
-          <para>Cette option indique aux programmes créés par le paquet de
-          chercher leurs fichiers de configuration dans <filename
-          class="directory">/etc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">Compilez le paquet :</para>
+    <para os="e">Ce paquet ne fournit pas de suite de tests.</para>
 
-<screen os="e"><userinput>make</userinput></screen>
+    <para os="f">Installez le paquet :</para>
 
-    <para os="f">Ce paquet ne fournit pas de suite de tests.</para>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="g">Installez le paquet :</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Déplacez <command>less</command> vers 
+    <para os="h">Déplacez <command>less</command> vers 
     <filename class="directory">/bin</filename> :</para>
 
-<screen os="j"><userinput>mv -v /usr/bin/less /bin</userinput></screen>
+<screen os="i"><userinput>mv -v /usr/bin/less /bin</userinput></screen>
 
   </sect2>
 
@@ -67,7 +54,7 @@
       <segtitle>Programmes installés</segtitle>
 
       <seglistitem>
-        <seg>less, lessecho et lesskey</seg>
+        <seg>less, lessecho, lesskey</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/libtool.xml
===================================================================
--- trunk/clfs/final-system/common/libtool.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/libtool.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -54,7 +54,7 @@
       <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
-        <seg>libtool and libtoolize</seg>
+        <seg>libtool, libtoolize</seg>
         <seg>libltdl.[a,so]</seg>
         <seg>/usr/include/libltdl, /usr/share/libtool</seg>
       </seglistitem>

Modified: trunk/clfs/final-system/common/linux-headers.xml
===================================================================
--- trunk/clfs/final-system/common/linux-headers.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/linux-headers.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -8,25 +8,38 @@
 <sect1 id="ch-system-linux-headers" role="wrap">
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;</title>
+  <title>En-têtes Linux-&linux-version2;</title>
 
   <indexterm zone="ch-system-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <primary sortas="a-En-têtes Linux">Linux-Headers</primary>
   </indexterm>
 
   <sect2 role="package">
     <title/>
 
-    <para>Le noyau Linux contient une cible make qui installe des en-têtes du noyau
+    <para>Le noyau Linux contient une cible <command>make</command> qui installe des en-têtes du noyau
     <quote>propres</quote>.</para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation de Linux-Headers</title>
+    <title>Installation des en-têtes Linux</title>
 
-    <para os="a">Pour cette étape, vous aurez besoin de l'archive tar du noyau.</para>
+    <note os="a">
+      Pour cette étape, vous aurez besoin de déballer l'archive tar du noyau
+      (<filename>linux-&linux-version;.tar.xz</filename>) et
+      d'aller dans le répertoire des sources avant d'entrer les commandes de
+      cette page.</para>
+    </note>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
     <para os="b">Installez les fichiers d'en-tête du noyau :</para>
 
 <screen os="c"><userinput>make mrproper
@@ -72,7 +85,7 @@
   </sect2>
 
   <sect2 id="contents-linux-headers" role="content">
-    <title>Contenu de Linux-Headers</title>
+    <title>Contenu des en-têtes Linux</title>
 
     <segmentedlist>
       <segtitle>En-têtes installées</segtitle>

Modified: trunk/clfs/final-system/common/man-pages.xml
===================================================================
--- trunk/clfs/final-system/common/man-pages.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/man-pages.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -17,7 +17,7 @@
   <sect2 role="package">
     <title/>
 
-    <para>Le paquet Man-pages contient environ 1 200 pages de manuel.</para>
+    <para>Le paquet Man-pages contient environ 2 200 pages de manuel.</para>
 
   </sect2>
 

Modified: trunk/clfs/final-system/common/mpc.xml
===================================================================
--- trunk/clfs/final-system/common/mpc.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/mpc.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -30,25 +30,28 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr</userinput></screen>
+  ./configure --prefix=/usr --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 
 <screen os="d"><userinput>make</userinput></screen>
 
-    <important os="e">
-      <para>La suite de tests de MPC est considérée comme critique. Ne la
-      sautez en aucune circonstance.</para>
-    </important>
+    <para os="e">Construisez la documentation HTML :</para>
 
-    <para os="f">Testz les résultats :</para>
+<screen os="f"><userinput>make html</userinput></screen>
 
-<screen os="g"><userinput remap="test">make check</userinput></screen>
+    <para os="g">Testz les résultats :</para>
 
-    <para os="h">Installez le paquet :</para>
+<screen os="h"><userinput remap="test">make check</userinput></screen>
 
-<screen os="i"><userinput>make install</userinput></screen>
+    <para os="i">Installez le paquet :</para>
 
+<screen os="j"><userinput>make install</userinput></screen>
+
+    <para os="k">Installez la documentation HTML :</para>
+
+<screen os="l"><userinput>make install-html</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-mpc" role="content">
@@ -56,9 +59,11 @@
 
     <segmentedlist>
       <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoire installé</segtitle>
 
       <seglistitem>
         <seg>libmpc.[a,so]</seg>
+        <seg>/usr/share/doc/mpc-&mpc-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/mpfr.xml
===================================================================
--- trunk/clfs/final-system/common/mpfr.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/mpfr.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -33,26 +33,22 @@
     <para os="a">Préparez la compilation de MPFR :</para>
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --enable-shared \
-    --with-gmp=/usr</userinput></screen>
+    LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+    ./configure --prefix=/usr --with-gmp=/usr \
+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 
 <screen os="d"><userinput>make</userinput></screen>
 
-    <important os="e">
-      <para>La suite de tests de MPFR est considéré comme critique. Ne la sautez sous aucun prétexte.</para>
-    </important>
+    <para os="e">Testez les résultats :</para>
 
-    <para os="f">Testez les résultats :</para>
+<screen os="f"><userinput remap="test">make check</userinput></screen>
 
-<screen os="g"><userinput remap="test">make check</userinput></screen>
+    <para os="g">Installez le paquet :</para>
 
-    <para os="h">Installez les résultats :</para>
+<screen os="h"><userinput>make install</userinput></screen>
 
-<screen os="i"><userinput>make install</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-mpfr" role="content">
@@ -64,7 +60,7 @@
 
       <seglistitem>
         <seg>libmpfr.[a,so]</seg>
-        <seg>/usr/share/doc/mpfr</seg>
+        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/ncurses.xml
===================================================================
--- trunk/clfs/final-system/common/ncurses.xml	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/final-system/common/ncurses.xml	2014-10-26 22:49:09 UTC (rev 6612)
@@ -34,14 +34,34 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
     --with-shared --without-debug --enable-widec \
-    --with-manpage-format=normal \
+    --with-manpage-format=normal --enable-pc-files \
     --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
+    <variablelist os="b1">
+      <title>Voici la signification de la nouvelle option de configuration :</title>
+
+      <varlistentry>
+        <term><parameter>--with-manpage-format=normal</parameter></term>
+        <listitem>
+          <para>Ceci dit à Ncurses de ne pas compresser ses pages de man comme
+          installées.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-pc-files</parameter></term>
+        <listitem>
+          <para>Ceci dit à Ncurses de générer et d'installer des fichiers .pc 
+          pour <command>pkg-config</command>.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <para os="c">Compilez le paquet :</para>
 
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">Ce paquet a une suite de tests qu'on peut lancer après avoir
+    <para os="e">Ce paquet a une suite de tests, mais on ne peut le lancer qu'après avoir
     installé le paquet. Les tests se trouvent dans le répertoire
     <filename class="directory">test/</filename>. Voir le fichier
     <filename>README</filename> de ce répertoire pour les détails.</para>
@@ -56,16 +76,19 @@
 
     <para os="j">Créez des liens symboliques dans <filename class="directory">/usr/lib:</filename></para>
 
-<screen os="k"><userinput>rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
-ln -svf ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so
-ln -svf ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so
-ln -svf ../../lib/libformw.so.5 /usr/lib/libformw.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib/$(readlink /lib/libncursesw.so) /usr/lib/libncursesw.so
+ln -svf ../../lib/$(readlink /lib/libmenuw.so) /usr/lib/libmenuw.so
+ln -svf ../../lib/$(readlink /lib/libpanelw.so) /usr/lib/libpanelw.so
+ln -svf ../../lib/$(readlink /lib/libformw.so) /usr/lib/libformw.so
+rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
 
-    <para os="l">Maintenant, nous allons rendre notre Ncurses compatible pour que les vieux programmes non compatibles avec widec se construisent correctement :</para>
+    <para os="l">De nombreux paquets utilisant Ncurses se compileront très bien
+    avec les bibliothèques widechar (étendues), mais ils ne sauront pas les chercher.
+    Créez des scripts de l'éditeur de liens et des liens symboliques pour permettre
+    à d'anciens programmes non compatibles widec de se construire correctement :</para>
 
 <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
         ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
 done
 ln -sfv libncursesw.so /usr/lib/libcursesw.so
@@ -73,11 +96,6 @@
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
 ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
 
-    <para os="n">Maintenant, nous allons créer un lien symbolique pour /usr/share/terminfo dans
-     <filename class="directory">/usr/lib</filename> pour des questions de compatibilité :</para>
- 
-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib/terminfo</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-ncurses" role="content">
@@ -90,8 +108,8 @@
 
       <seglistitem>
         <seg>captoinfo (lien vers tic), clear, infocmp, infotocap (lien vers tic),
-        ncursesw5-config, reset (lien vers tset), tabs, tic, toe, tput et tset</seg>
-        <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so] et
+        ncursesw5-config, reset (lien vers tset), tabs, tic, toe, tput, tset</seg>
+        <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
         libpanelw.[a,so]</seg>
         <seg>/usr/share/tabset, /usr/share/terminfo</seg>
       </seglistitem>
@@ -242,7 +260,7 @@
         <listitem>
           <para>Contient des fonctions pour implémenter des formulaires</para>
           <indexterm zone="ch-system-ncurses libformw">
-            <primary sortas="c-libform">libformw</primary>
+            <primary sortas="c-libformw">libformw</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/clfs/maj
===================================================================
--- trunk/clfs/maj	2014-10-26 19:39:51 UTC (rev 6611)
+++ trunk/clfs/maj	2014-10-26 22:49:09 UTC (rev 6612)
@@ -1,2004 +1,3 @@
-diff -ru /home/jp/a/BOOK/final-system/64/binutils.xml BOOK/final-system/64/binutils.xml
---- /home/jp/a/BOOK/final-system/64/binutils.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/64/binutils.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -76,13 +76,9 @@
-     href="../common/binutils.xml"
-     xpointer="xpointer(//*[@os='k'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/binutils.xml"
--    xpointer="xpointer(//*[@os='l'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/binutils.xml"
--    xpointer="xpointer(//*[@os='m'])"/>
-+    xpointer="xpointer(//*[@os='l'])"/> -->
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/binutils.xml"
-@@ -115,14 +111,6 @@
-     href="../common/binutils.xml"
-     xpointer="xpointer(//*[@os='s'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/binutils.xml"
--    xpointer="xpointer(//*[@os='t'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/binutils.xml"
--    xpointer="xpointer(//*[@os='u'])"/>
--
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/64/gcc.xml BOOK/final-system/64/gcc.xml
---- /home/jp/a/BOOK/final-system/64/gcc.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/64/gcc.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -45,14 +45,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc.xml"
--    xpointer="xpointer(//*[@os='d'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gcc.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -67,6 +59,10 @@
-     href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
-+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='i1'])"/>
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='j'])"/>
-@@ -143,6 +139,14 @@
-     href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='z'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='aa'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='ab'])"/>
-+
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/common/adjusting.xml BOOK/final-system/common/adjusting.xml
---- /home/jp/a/BOOK/final-system/common/adjusting.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/adjusting.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -10,7 +10,7 @@
- 
-   <title>Adjusting the Toolchain</title>
- 
--  <para os="a">Now we amend the GCC specs file so that it points to the new
-+  <para os="a">Now we adjust GCC's specs so that they point to the new
-   dynamic linker. A <command>perl</command> command accomplishes this:</para>
- 
- <screen os="c"><userinput>gcc -dumpspecs | \
-@@ -18,11 +18,13 @@
-      -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-      $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
- 
--  <para os="d">It is a good idea to visually inspect the specs file to verify the
--  intended change was actually made.</para>
--
--  <para os="e">Note that <filename class="directory">/lib</filename> is now
--  the prefix of our dynamic linker.</para>
-+  <para os="d">The <command>perl</command> command above makes 2
-+  modifications to GCC's specs: it removes <quote>/tools</quote> from the
-+  pathname to the dynamic linker, and adds <quote>/usr/lib/</quote> to the
-+  startfile_prefix_spec. It is a good idea to visually inspect the
-+  <filename>specs</filename> file, and compare with the output of
-+  <command>gcc -dumpspecs</command>, to verify that
-+  the intended changes were actually made.</para>
- 
-   <caution>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/autoconf.xml BOOK/final-system/common/autoconf.xml
---- /home/jp/a/BOOK/final-system/common/autoconf.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/autoconf.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -36,7 +36,7 @@
-     <para os="e">To test the results, issue:</para>
- 
- <screen os="e2"><userinput remap="test">make check VERBOSE=yes</userinput></screen>
--    
-+
-     <para os="e3">17 tests are skipped that use Automake and different GCC languages.
-     For full test coverage, Autoconf can be re-tested after Automake has been
-     installed.</para>
-@@ -56,7 +56,7 @@
- 
-       <seglistitem>
-         <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
--        and ifnames</seg>
-+        ifnames</seg>
-         <seg>/usr/share/autoconf</seg>
-       </seglistitem>
-     </segmentedlist>
-diff -ru /home/jp/a/BOOK/final-system/common/automake.xml BOOK/final-system/common/automake.xml
---- /home/jp/a/BOOK/final-system/common/automake.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/automake.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -27,7 +27,7 @@
- 
-     <para os="a">Prepare Automake for compilation:</para>
- 
--<screen os="b"><userinput>./configure --prefix=/usr</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>
- 
-@@ -51,10 +51,10 @@
-       <segtitle>Installed directories</segtitle>
- 
-       <seglistitem>
--        <seg>acinstall, aclocal, aclocal-&automake-version2;, automake,
-+        <seg>aclocal, aclocal-&automake-version2;, automake,
-         automake-&automake-version2;, compile, config.guess, config.sub,
--        depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
--        py-compile, symlink-tree, and ylwrap</seg>
-+        depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
-+        py-compile, symlink-tree, ylwrap</seg>
-         <seg>/usr/share/aclocal-&automake-version2;,
-         /usr/share/automake-&automake-version2;, /usr/share/doc/automake</seg>
-       </seglistitem>
-@@ -65,16 +65,6 @@
-       <?dbfo list-presentation="list"?>
-       <?dbhtml list-presentation="table"?>
- 
--      <varlistentry id="acinstall">
--        <term><command>acinstall</command></term>
--        <listitem>
--          <para>A script that installs aclocal-style M4 files</para>
--          <indexterm zone="ch-system-automake acinstall">
--            <primary sortas="b-acinstall">acinstall</primary>
--          </indexterm>
--        </listitem>
--      </varlistentry>
--
-       <varlistentry id="aclocal">
-         <term><command>aclocal</command></term>
-         <listitem>
-@@ -166,16 +156,6 @@
-           </indexterm>
-         </listitem>
-       </varlistentry>
--
--      <varlistentry id="elisp-comp">
--        <term><command>elisp-comp</command></term>
--        <listitem>
--          <para>Byte-compiles Emacs Lisp code</para>
--          <indexterm zone="ch-system-automake elisp-comp">
--            <primary sortas="b-elisp-comp">elisp-comp</primary>
--          </indexterm>
--        </listitem>
--      </varlistentry>
- 
-       <varlistentry id="install-sh">
-         <term><command>install-sh</command></term>
-diff -ru /home/jp/a/BOOK/final-system/common/bash.xml BOOK/final-system/common/bash.xml
---- /home/jp/a/BOOK/final-system/common/bash.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/bash.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -32,10 +32,11 @@
-     <para os="a">Prepare Bash for compilation:</para>
- 
- <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
--    --without-bash-malloc --with-installed-readline</userinput></screen>
-+    --without-bash-malloc --with-installed-readline \
-+    --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
- 
-     <variablelist os="c">
--      <title>The meaning of the configure option:</title>
-+      <title>The meaning of the new configure option:</title>
- 
-       <varlistentry>
-         <term><parameter>--with-installed-readline</parameter></term>
-@@ -58,7 +59,7 @@
- 
-     <para os="g">Install the package:</para>
- 
--<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
-+<screen os="h"><userinput>make install</userinput></screen>
- 
-     <para os="i">Run the newly compiled <command>bash</command> program (replacing
-     the one that is currently being executed):</para>
-@@ -81,7 +82,7 @@
-       <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
--        <seg>bash, bashbug, and sh (link to bash)</seg>
-+        <seg>bash, bashbug, sh (link to bash)</seg>
-         <seg>/usr/share/doc/bash-&bash-version;</seg>
-       </seglistitem>
-     </segmentedlist>
-diff -ru /home/jp/a/BOOK/final-system/common/bc.xml BOOK/final-system/common/bc.xml
---- /home/jp/a/BOOK/final-system/common/bc.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/bc.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -26,7 +26,8 @@
- 
-     <para os="a">Prepare Bc for compilation:</para>
- 
--<screen os="b"><userinput>./configure --prefix=/usr --with-readline</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>
- 
-@@ -49,7 +50,7 @@
-       <segtitle>Installed programs</segtitle>
- 
-       <seglistitem>
--        <seg>bc and dc</seg>
-+        <seg>bc, dc</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/binutils.xml BOOK/final-system/common/binutils.xml
---- /home/jp/a/BOOK/final-system/common/binutils.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/binutils.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -61,19 +61,17 @@
- 
-     <para os="j">Compile the package:</para>
- 
--<screen os="k"><userinput>make configure-host</userinput></screen>
-+<screen os="k"><userinput>make tooldir=/usr</userinput></screen>
- 
--    <important os="l">
--      <para>During <command>make configure-host</command> you may receive the
-+<!--    <important os="l">
-+      <para>During <command>make tooldir=/usr</command> you may receive the
-       following error message. It is safe to ignore.</para>
- 
- <screen><computeroutput>WARNING: `flex' is missing on your system. You should only
- need it if you modified a `.l' file. You may need the `Flex'
- package in order for those modifications to take effect. You
- can get `Flex' from any GNU archive site.</computeroutput></screen>
--    </important>
--
--<screen os="m"><userinput>make tooldir=/usr</userinput></screen>
-+    </important> -->
- 
-     <variablelist os="n">
-       <title>The meaning of the make parameter:</title>
-@@ -91,8 +89,8 @@
-     </variablelist>
- 
-     <important os="o">
--      <para>The test suite for Binutils is considered critical.
--      Do not skip it under any circumstance.</para>
-+      <para>Due to Binutils' critical role in a properly functioning system,
-+      the CLFS developers strongly recommend running the testsuite.</para>
-     </important>
- 
-     <para os="p">Test the results:</para>
-@@ -103,11 +101,6 @@
- 
- <screen os="s"><userinput>make tooldir=/usr install</userinput></screen>
- 
--    <para os="t">Install the <filename class="headerfile">libiberty</filename> header
--    file that is needed by some packages:</para>
--
--<screen os="u"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /usr/include</userinput></screen>
--
-   </sect2>
- 
-   <sect2 id="contents-binutils" role="content">
-@@ -119,10 +112,9 @@
-       <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
--        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm, objcopy,
--        objdump,
--        ranlib, readelf, size, strings, and strip</seg>
--        <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
-+        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
-+        objcopy, objdump, ranlib, readelf, size, strings, strip</seg>
-+        <seg>libbfd.[a,so], libopcodes.[a,so]</seg>
-         <seg>/usr/lib/ldscripts</seg>
-       </seglistitem>
-     </segmentedlist>
-@@ -308,19 +300,6 @@
-           </indexterm>
-         </listitem>
-       </varlistentry>
--
--      <varlistentry id="libiberty">
--        <term><filename class="libraryfile">libiberty</filename></term>
--        <listitem>
--          <para>Contains routines used by various GNU programs, including
--          <command>getopt</command>, <command>obstack</command>,
--          <command>strerror</command>, <command>strtol</command>, and
--          <command>strtoul</command></para>
--          <indexterm zone="ch-system-binutils libiberty">
--            <primary sortas="c-libiberty">libiberty</primary>
--          </indexterm>
--        </listitem>
--      </varlistentry>
- 
-       <varlistentry id="libbfd">
-         <term><filename class="libraryfile">libbfd</filename></term>
-diff -ru /home/jp/a/BOOK/chroot/x86-chapter.xml BOOK/chroot/x86-chapter.xml
---- /home/jp/a/BOOK/chroot/x86-chapter.xml	2014-05-11 16:24:52.622516679 +0200
-+++ BOOK/chroot/x86-chapter.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,6 @@
-   <title>If You Are Going to Chroot</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/before-chroot.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-@@ -20,6 +19,5 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/final-system/common/bison.xml BOOK/final-system/common/bison.xml
---- /home/jp/a/BOOK/final-system/common/bison.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/bison.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -24,14 +24,9 @@
-   <sect2 role="installation">
-     <title>Installation of Bison</title>
- 
--    <para os="t3">The <command>configure </command>script does not determine
--    the correct value for the following. Set the value manually:</para>
--
--<screen os="t4"><userinput>echo "ac_cv_prog_lex_is_flex=yes" > config.cache</userinput></screen>
--
-     <para os="a">Prepare Bison for compilation:</para>
- 
--<screen os="b"><userinput>./configure --prefix=/usr --cache-file=config.cache</userinput></screen>
-+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
- 
-     <para os="c">Compile the package:</para>
- 
-@@ -56,7 +51,7 @@
-       <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
--        <seg>bison and yacc</seg>
-+        <seg>bison, yacc</seg>
-         <seg>liby.a</seg>
-         <seg>/usr/share/bison</seg>
-       </seglistitem>
-diff -ru /home/jp/a/BOOK/final-system/common/bzip2.xml BOOK/final-system/common/bzip2.xml
---- /home/jp/a/BOOK/final-system/common/bzip2.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/bzip2.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -33,6 +33,12 @@
- 
- <screen os="s2"><userinput>sed -i -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' Makefile</userinput></screen>
- 
-+    <para os="s3">Make Bzip2 install its manpages in
-+    <filename class="directory">/usr/share/man</filename> instead of
-+    <filename class="directory">/usr/man</filename>:</para>
-+
-+<screen os="s4"><userinput>sed -i 's at X)/man at X)/share/man at g' ./Makefile</userinput></screen>
-+
-     <para os="a">The Bzip2 package does not contain a <command>configure</command>
-     script. Compile it with:</para>
- 
-@@ -76,9 +82,9 @@
-       <seglistitem>
-         <seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp (link to
-         bzdiff), bzdiff, bzegrep (link to bzgrep), bzfgrep (link to bzgrep),
--        bzgrep, bzip2, bzip2recover, bzless (link to bzmore), and bzmore</seg>
-+        bzgrep, bzip2, bzip2recover, bzless (link to bzmore), bzmore</seg>
-         <seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
--        libbz2.so.&bzip2-version;), and libbz2.so.&bzip2-version;</seg>
-+        libbz2.so.&bzip2-version;), libbz2.so.&bzip2-version;</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/cloog.xml BOOK/final-system/common/cloog.xml
---- /home/jp/a/BOOK/final-system/common/cloog.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/cloog.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -31,7 +31,7 @@
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
--  ./configure --prefix=/usr --enable-shared --with-isl=system</userinput></screen>
-+  ./configure --prefix=/usr --with-isl=system</userinput></screen>
- 
-     <para os="s1">Apply a <command>sed</command> which prevents the attempted installation of an invalid file:</para>
- 
-@@ -41,18 +41,13 @@
- 
- <screen os="d"><userinput>make</userinput></screen>
- 
--    <important os="e">
--      <para>The test suite for CLooG is considered
--      critical. Do not skip it under any circumstance.</para>
--    </important>
-+    <para os="e">Test the results:</para>
- 
--    <para os="f">Test the results:</para>
-+<screen os="f"><userinput remap="test">make check</userinput></screen>
- 
--<screen os="g"><userinput remap="test">make check</userinput></screen>
-+    <para os="g">Install the package:</para>
- 
--    <para os="h">Install the package:</para>
--
--<screen os="i"><userinput>make install</userinput></screen>
-+<screen os="h"><userinput>make install</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/coreutils.xml BOOK/final-system/common/coreutils.xml
---- /home/jp/a/BOOK/final-system/common/coreutils.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/coreutils.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -37,11 +37,11 @@
- <screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 \
-   ./configure --prefix=/usr \
-     --enable-no-install-program=kill,uptime \
--    --enable-install-program=hostname</userinput></screen>
--    
-+    --enable-install-program=hostname --libexecdir=/usr/lib</userinput></screen>
-+
-     <variablelist os="d1">
-       <title>The meaning of the configure options:</title>
--      
-+
-         <varlistentry os="d2">
-           <term><parameter>FORCE_UNSAFE_CONFIGURE=1</parameter></term>
-           <listitem>
-@@ -55,56 +55,46 @@
- 
- <screen os="f"><userinput>make</userinput></screen>
- 
--    <para os="g">The test suite of Coreutils makes several assumptions about the
--    presence of system users and groups that are not valid within the minimal
--    environment that exists at the moment. Therefore, we will reuse the dummy
--    groups and user created during Util-linux. Skip down to <quote>Install the
--    package</quote> if not running the test suite and you did not create the
--    dummy groups and users during Util-linux.</para>
--
--   <para os="h">Now the test suite is ready to be run. First, run
-+   <para os="g">Now the test suite is ready to be run. First, run
-     the tests that are meant to be run as user
-     <systemitem class="username">root</systemitem>:</para>
- 
--<screen os="i"><userinput remap="test">make NON_ROOT_USERNAME=dummy check-root</userinput></screen>
-+<screen os="h"><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
- 
--    <para os="j">The testsuite will now be run as the
--    <systemitem class="username">dummy</systemitem> user. Fix the permissions
--    for a few files to allow this:</para>
-+    <para os="i">The test suite will now be run as the
-+    <systemitem class="username">nobody</systemitem> user. Some tests require
-+    that the user be a member of more than one group. Add a temporary group
-+    and make the user <systemitem class="username">nobody</systemitem> a part
-+    of it so that the tests are not skipped:</para>
- 
--<screen os="k"><userinput remap="test">chown -Rv dummy .</userinput></screen>
-+<screen os="j"><userinput remap="test">echo "dummy:x:1000:nobody" >> /etc/group</userinput></screen>
- 
--    <para os="l">Then run the remainder of the tests as the
--    <systemitem class="username">dummy</systemitem> user:</para>
-+    <para os="k">Fix permissions of some files so the non-root user can compile
-+    and run the tests:</para>
- 
--<screen os="m"><userinput remap="test">su dummy -s /bin/bash \
-+<screen os="l"><userinput remap="test">chown -Rv nobody .</userinput></screen>
-+
-+    <para os="m">Then run the remainder of the tests as the
-+    <systemitem class="username">nobody</systemitem> user:</para>
-+
-+<screen os="n"><userinput remap="test">su nobody -s /bin/bash \
-     -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
- 
--    <para os="n">When testing is complete, remove the
--    <systemitem class="username">dummy</systemitem> user and groups:</para>
-+    <para os="o">Remove the temporary group:</para>
- 
--<screen os="o"><userinput remap="test">sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
-+<screen os="p"><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
- 
--    <para os="p">Install the package:</para>
-+    <para os="q">Install the package:</para>
- 
--<screen os="q"><userinput>make install</userinput></screen>
-+<screen os="r"><userinput>make install</userinput></screen>
- 
--    <para os="r">Move programs to the locations specified by the FHS:</para>
-+    <para os="s">Move programs to the locations specified by the FHS:</para>
- 
--<screen os="s"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
-+<screen os="t"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
- mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
- mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
- mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
- 
--    <para os="t">Other Coreutils programs are used by some of the scripts
--    in the CLFS-Bootscripts package. As <filename
--    class="directory">/usr</filename> may not be available during the early
--    stages of booting, those binaries need to be on the root partition:</para>
--
--<screen os="u"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
--mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
--ln -svf ../../bin/install /usr/bin</userinput></screen>
--
-   </sect2>
- 
-   <sect2 id="contents-coreutils" role="content">
-@@ -125,7 +115,7 @@
-         rmdir, runcon, seq, sha1sum, sha224sum, sha256sum, sha384sum,
-         sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum,
-         sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort,
--        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes</seg>
-+        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, yes</seg>
-         <seg>libstdbuf.so</seg>
-         <seg>/usr/lib/coreutils</seg>
-       </seglistitem>
-diff -ru /home/jp/a/BOOK/final-system/common/diffutils.xml BOOK/final-system/common/diffutils.xml
---- /home/jp/a/BOOK/final-system/common/diffutils.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/diffutils.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -25,14 +25,19 @@
-   <sect2 role="installation">
-     <title>Installation of Diffutils</title>
- 
-+    <para os="s1">Fix a bug that prevents locale files from being installed:</para>
-+
-+<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
-+
-     <para os="a">Prepare Diffutils for compilation:</para>
- 
- <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
- 
--    <para os="s1">Diffutils wants <command>ed</command> as the default editor.
--    The following sed will change the default to <command>vim</command>:</para>
-+    <para os="s3">Diffutils wants <command>ed</command> as the default editor
-+    for <command>sdiff</command>. The following <command>sed</command> will
-+    change the default to <command>vi</command>:</para>
- 
--<screen os="s2"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
-+<screen os="s4"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
- 
-     <para os="c">Compile the package:</para>
- 
-@@ -55,7 +60,7 @@
-       <segtitle>Installed programs</segtitle>
- 
-       <seglistitem>
--        <seg>cmp, diff, diff3, and sdiff</seg>
-+        <seg>cmp, diff, diff3, sdiff</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/e2fsprogs.xml BOOK/final-system/common/e2fsprogs.xml
---- /home/jp/a/BOOK/final-system/common/e2fsprogs.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/e2fsprogs.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -66,6 +66,18 @@
-         </listitem>
-       </varlistentry>
- 
-+      <varlistentry os="e3">
-+        <term><parameter>--disable-*</parameter></term>
-+        <listitem>
-+          <para>This prevents E2fsprogs from building and installing the
-+          <systemitem class="library">libuuid</systemitem> and
-+          <systemitem class="library">libblkid</systemitem> libraries, the
-+          <systemitem class="daemon">uuidd</systemitem> daemon, and the
-+          <command>fsck</command> wrapper, as Util-Linux installed all of
-+          them earlier.</para>
-+        </listitem>
-+      </varlistentry>
-+
-     </variablelist>
- 
-     <para os="f">Compile the package:</para>
-@@ -99,9 +111,9 @@
-         e2fsck, e2image, e2initrd_helper, e2label, e2undo, e4defrag, filefrag,
-         fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
-         mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
--        mklost+found, resize2fs, and tune2fs</seg>
-+        mklost+found, resize2fs, tune2fs</seg>
-         <seg>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so],
--        libss.[a,so], and libquota.a</seg>
-+        libss.[a,so], libquota.a</seg>
-         <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
-         /usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
-       </seglistitem>
-@@ -183,7 +195,7 @@
-         <listitem>
-           <para>Is used to check, and optionally repair <systemitem
-           class="filesystem">ext2</systemitem>, <systemitem
--          class="filesystem">ext3</systemitem> and <systemitem 
-+          class="filesystem">ext3</systemitem> and <systemitem
-           class="filesystem">ext4</systemitem>file systems</para>
-           <indexterm zone="ch-system-e2fsprogs e2fsck">
-             <primary sortas="b-e2fsck">e2fsck</primary>
-@@ -336,7 +348,7 @@
-         <term><command>mke2fs</command></term>
-         <listitem>
-           <para>Creates an <systemitem class="filesystem">ext2</systemitem>,
--          <systemitem class="filesystem">ext3</systemitem> or <systemitem 
-+          <systemitem class="filesystem">ext3</systemitem> or <systemitem
-           class="filesystem">ext4</systemitem> file system on the given device</para>
-           <indexterm zone="ch-system-e2fsprogs mke2fs">
-             <primary sortas="b-mke2fs">mke2fs</primary>
-diff -ru /home/jp/a/BOOK/final-system/common/findutils.xml BOOK/final-system/common/findutils.xml
---- /home/jp/a/BOOK/final-system/common/findutils.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/findutils.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -58,19 +58,6 @@
- 
- <screen os="h"><userinput>make install</userinput></screen>
- 
--    <para os="i">The <command>find</command> program is used by some of the scripts
--    in the CLFS-Bootscripts package. As <filename
--    class="directory">/usr</filename> may not be available during the early
--    stages of booting, the <command>find</command> binary needs to be on
--    the root partition:</para>
--
--<screen os="j"><userinput>mv -v /usr/bin/find /bin</userinput></screen>
--
--    <para os="k">The <command>updatedb</command> script needs to be modified
--    to point to the new location for <command>find</command>:</para> 
--
--<screen os="l"><userinput>sed -i 's at find:=${BINDIR}@find:=/bin@' /usr/bin/updatedb</userinput></screen>
--
-   </sect2>
- 
-   <sect2 id="contents-findutils" role="content">
-@@ -81,7 +68,7 @@
-       <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
--        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
-+        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, xargs</seg>
-         <seg>/usr/lib/locate</seg>
-       </seglistitem>
-     </segmentedlist>
-diff -ru /home/jp/a/BOOK/final-system/common/flex.xml BOOK/final-system/common/flex.xml
---- /home/jp/a/BOOK/final-system/common/flex.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/flex.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -27,7 +27,7 @@
- 
-     <para os="a">Prepare Flex for compilation:</para>
- 
--<screen os="b"><userinput>./configure --prefix=/usr</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>
- 
-@@ -37,24 +37,22 @@
- 
- <screen os="e2"><userinput remap="test">make check</userinput></screen>
- 
-+    <para os="e3">The test suite will report 3 failures for tests that
-+    use <command>bison</command>, which is not installed yet. For full
-+    test coverage, you can run Flex's test suite again after Bison
-+    is installed.</para>
-+
-     <para os="f">Install the package:</para>
- 
- <screen os="g"><userinput>make install</userinput></screen>
- 
--    <para os="h">There are some packages that expect to find the
--    <filename class="libraryfile">lex</filename> library in <filename
--    class="directory">/usr/lib</filename>. Create a symlink to account for
--    this:</para>
--
--<screen os="i"><userinput>ln -sv libfl.a /usr/lib/libl.a</userinput></screen>
--
--    <para os="j">A few programs do not know about <command>flex</command> yet and
-+    <para os="h">A few programs do not know about <command>flex</command> yet and
-     try to run its predecessor, <command>lex</command>. To support those
-     programs, create a wrapper script named <filename>lex</filename> that
-     calls <filename>flex</filename> in <command>lex</command> emulation
-     mode:</para>
- 
--<screen os="k"><userinput>cat > /usr/bin/lex << "EOF"
-+<screen os="i"><userinput>cat > /usr/bin/lex << "EOF"
- <literal>#!/bin/sh
- # Begin /usr/bin/lex
- 
-@@ -72,10 +70,12 @@
-     <segmentedlist>
-       <segtitle>Installed programs</segtitle>
-       <segtitle>Installed libraries</segtitle>
-+      <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
--        <seg>flex and lex</seg>
--        <seg>libfl.a and libfl_pic.a</seg>
-+        <seg>flex, flex++ (link to flex), lex</seg>
-+        <seg>libfl.[a,so], libfl_pic.[a,so]</seg>
-+        <seg>/usr/share/doc/flex-&flex-version;</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-@@ -118,22 +118,22 @@
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry id="libfl.a">
--        <term><filename class="libraryfile">libfl.a</filename></term>
-+      <varlistentry id="libfl">
-+        <term><filename class="libraryfile">libfl</filename></term>
-         <listitem>
-           <para>The <filename class="libraryfile">flex</filename> library</para>
--          <indexterm zone="ch-system-flex libfl.a">
--            <primary sortas="c-libfl.a">libfl.a</primary>
-+          <indexterm zone="ch-system-flex libfl">
-+            <primary sortas="c-libfl">libfl</primary>
-           </indexterm>
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry id="libfl_pic.a">
--        <term><filename class="libraryfile">libfl_pic.a</filename></term>
-+      <varlistentry id="libfl_pic">
-+        <term><filename class="libraryfile">libfl_pic</filename></term>
-         <listitem>
-           <para>The <filename class="libraryfile">flex</filename> library</para>
--          <indexterm zone="ch-system-flex libfl_pic.a">
--            <primary sortas="c-libfl.a">libfl_pic.a</primary>
-+          <indexterm zone="ch-system-flex libfl_pic">
-+            <primary sortas="c-libfl">libfl_pic</primary>
-           </indexterm>
-         </listitem>
-       </varlistentry>
-diff -ru /home/jp/a/BOOK/final-system/common/gawk.xml BOOK/final-system/common/gawk.xml
---- /home/jp/a/BOOK/final-system/common/gawk.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/gawk.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -41,6 +41,11 @@
- 
- <screen os="g"><userinput>make install</userinput></screen>
- 
-+    <para os="h">Install the documentation:</para>
-+
-+<screen os="i"><userinput>mkdir -v /usr/share/doc/gawk-&gawk-version;
-+cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
-+
-   </sect2>
- 
-   <sect2 id="contents-gawk" role="content">
-@@ -52,8 +57,9 @@
- 
-       <seglistitem>
-         <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
--        pgawk, pgawk-&gawk-version;, and pwcat</seg>
--        <seg>/usr/lib/awk, /usr/share/awk</seg>
-+        pgawk, pgawk-&gawk-version;, pwcat</seg>
-+        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
-+        /usr/share/doc/gawk-&gawk-version;</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/gcc.xml BOOK/final-system/common/gcc.xml
---- /home/jp/a/BOOK/final-system/common/gcc.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/gcc.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -25,23 +25,15 @@
-   <sect2 role="installation">
-     <title>Installation of GCC</title>
- 
--    <para os="p1">The following patch contains a number of updates to the 
-+    <para os="p1">The following patch contains a number of updates to the
-     &gcc-version; branch by the GCC developers:</para>
- 
-     <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
- 
--    <para os="fix1">Apply a <command>sed</command> subsitution that will
-+    <para os="fix1">Apply a <command>sed</command> substitution that will
-     suppress the execution of the <command>fixincludes</command> script:</para>
- 
--<screen os="fix2"><userinput>cp -v gcc/Makefile.in{,.orig}
--sed 's@\./fixinc\.sh at -c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
--
--    <para os="d">Apply a <command>sed</command> substitution that will suppress the
--    installation of <filename class="libraryfile">libiberty.a</filename>. The
--    version of <filename class="libraryfile">libiberty.a</filename> provided by
--    Binutils will be used instead:</para>
--
--<screen os="e"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
-+<screen os="fix2"><userinput>sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in</userinput></screen>
- 
-     <para os="f">The GCC documentation recommends building GCC outside of the source
-     directory in a dedicated build directory:</para>
-@@ -51,25 +43,36 @@
- 
-     <para os="h">Prepare GCC for compilation:</para>
- 
--<screen os="i"><userinput>CC="gcc -isystem /usr/include" \
-+<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include" \
- CXX="g++ -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-   ../gcc-&gcc-version;/configure --prefix=/usr \
--    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
--    --enable-__cxa_atexit --enable-c99 --enable-long-long \
--    --enable-clocale=gnu --enable-languages=c,c++ \
-+    --libexecdir=/usr/lib --enable-threads=posix \
-+    --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ \
-     --disable-multilib --disable-libstdcxx-pch \
--    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
--    --enable-checking=release --enable-libstdcxx-time \
--    --disable-install-libiberty</userinput></screen>
-+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
-+
-+    <variablelist os="i1">
-+      <title>The meaning of the new configure option:</title>
-+
-+      <varlistentry>
-+        <term><parameter>SED=sed</parameter></term>
-+        <listitem>
-+          <para>This prevents a hard-coded path to
-+          <filename>/tools/bin/sed</filename> in the <command>fixincl</command>
-+          program.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+    </variablelist>
- 
-     <para os="j">Compile the package:</para>
- 
- <screen os="k"><userinput>make</userinput></screen>
- 
-     <important os="l">
--      <para>The test suite for GCC is considered
--      critical. Do not skip it under any circumstance.</para>
-+      <para>Due to GCC's critical role in a properly functioning system,
-+      the CLFS developers strongly recommend running the testsuite.</para>
-     </important>
- 
-    <para os="s1">Increase the stack size prior to running the tests:</para>
-@@ -98,20 +101,25 @@
- 
- <screen os="t"><userinput>make install</userinput></screen>
- 
--    <para os="u">Some packages expect the C preprocessor to be installed in the
-+    <para os="u">Install the <filename class="headerfile">libiberty</filename> header
-+    file that is needed by some packages:</para>
-+
-+<screen os="v"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /usr/include</userinput></screen>
-+
-+    <para os="w">Some packages expect the C preprocessor to be installed in the
-     <filename class="directory">/lib</filename> directory.
-     To support those packages, create this symlink:</para>
- 
--<screen os="v"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
-+<screen os="x"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
- 
--    <para os="w">Many packages use the name <command>cc</command> to call the C
-+    <para os="y">Many packages use the name <command>cc</command> to call the C
-     compiler. To satisfy those packages, create a symlink:</para>
- 
--<screen os="x"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
-+<screen os="z"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
- 
--    <para os="y">Finally, move a misplaced file:</para>
-+    <para os="aa">Finally, move a misplaced file:</para>
- 
--<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
-+<screen os="ab"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
- 
-   </sect2>
- 
-@@ -124,10 +132,11 @@
-       <segtitle>Installed directories</segtitle>
- 
-       <seglistitem>
--        <seg>c++, cc (link to gcc), cpp, g++, gcc, and gcov</seg>
--        <seg>libasan.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
--        libgomp.[a,so], libmudflap.[a,so], libmudflapth.[a,so], libssp.[a,so],
--        libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and libtsan.[a,so]</seg>
-+        <seg>c++, cc (link to gcc), cpp, g++, gcc, gcov</seg>
-+        <seg>libasan.[a,so], libatomic.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
-+        libgomp.[a,so], libiberty.a, libitm.[a,so], liblto_plugin.so, libmudflap.[a,so], libmudflapth.[a,so],
-+        libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a,
-+        libtsan.[a,so]</seg>
-         <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
-       </seglistitem>
-     </segmentedlist>
-@@ -209,6 +218,17 @@
-         </listitem>
-       </varlistentry>
- 
-+      <varlistentry id="libatomic">
-+        <term><filename class="libraryfile">libatomic</filename></term>
-+        <listitem>
-+          <para>A GCC support runtime library for atomic operations not
-+          supported by hardware</para>
-+          <indexterm zone="ch-system-gcc libatomic">
-+            <primary sortas="c-libatomic*">libatomic*</primary>
-+          </indexterm>
-+        </listitem>
-+      </varlistentry>
-+
-       <varlistentry id="libgcc">
-         <term><filename class="libraryfile">libgcc</filename></term>
-         <listitem>
-@@ -241,6 +261,40 @@
-         </listitem>
-       </varlistentry>
- 
-+      <varlistentry id="libiberty">
-+        <term><filename class="libraryfile">libiberty</filename></term>
-+        <listitem>
-+          <para>Contains routines used by various GNU programs, including
-+          <command>getopt</command>, <command>obstack</command>,
-+          <command>strerror</command>, <command>strtol</command>, and
-+          <command>strtoul</command></para>
-+          <indexterm zone="ch-system-gcc libiberty">
-+            <primary sortas="c-libiberty">libiberty</primary>
-+          </indexterm>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry id="libitm">
-+        <term><filename class="libraryfile">libitm</filename></term>
-+        <listitem>
-+          <para>The GNU Transactional Memory Library, which provides
-+          transaction support for accesses to a process's memory</para>
-+          <indexterm zone="ch-system-gcc libitm">
-+            <primary sortas="c-libitm*">libitm*</primary>
-+          </indexterm>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry id="liblto_plugin">
-+        <term><filename class="libraryfile">liblto_plugin</filename></term>
-+        <listitem>
-+          <para>Runtime library for GCC's link-time optimization plugin</para>
-+          <indexterm zone="ch-system-gcc liblto_plugin">
-+            <primary sortas="c-liblto_plugin">liblto_plugin</primary>
-+          </indexterm>
-+        </listitem>
-+      </varlistentry>
-+
-       <varlistentry id="libmudflap">
-         <term><filename class="libraryfile">libmudflap</filename></term>
-         <listitem>
-@@ -251,6 +305,16 @@
-           </indexterm>
-         </listitem>
-       </varlistentry>
-+
-+      <varlistentry id="libquadmath">
-+        <term><filename class="libraryfile">libquadmath</filename></term>
-+        <listitem>
-+          <para>The GCC Quad-Precision Math Libarary API</para>
-+          <indexterm zone="ch-system-gcc libquadmath">
-+            <primary sortas="c-libquadmath*">libquadmath*</primary>
-+          </indexterm>
-+        </listitem>
-+      </varlistentry>
- 
-       <varlistentry id="libssp">
-         <term><filename class="libraryfile">libssp</filename></term>
-diff -ru /home/jp/a/BOOK/cross-tools/64/gcc-static.xml BOOK/cross-tools/64/gcc-static.xml
---- /home/jp/a/BOOK/cross-tools/64/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/64/gcc-static.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -24,6 +24,10 @@
-     and no Threads</title>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc-static.xml"
-+    xpointer="xpointer(//*[@os='e'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/gcc.xml"
-     xpointer="xpointer(//*[@os='p1'])"/>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/gettext.xml BOOK/final-system/common/gettext.xml
---- /home/jp/a/BOOK/final-system/common/gettext.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/gettext.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -29,7 +29,7 @@
- 
-     <para os="a">Prepare Gettext for compilation:</para>
- 
--<screen os="b"><userinput>./configure --prefix=/usr</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>
- 
-@@ -57,10 +57,11 @@
-         <seg>autopoint, config.charset, config.rpath, envsubst, gettext,
-         gettext.sh, gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm,
-         msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge,
--        msgunfmt, msguniq, ngettext, recode-sr-latin, and xgettext</seg>
-+        msgunfmt, msguniq, ngettext, recode-sr-latin, xgettext</seg>
-         <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
--        libgettextsrc.so, and preloadable_libintl.so</seg>
--        <seg>/usr/lib/gettext, /usr/share/doc/gettext, /usr/share/gettext</seg>
-+        libgettextsrc.so, preloadable_libintl.so</seg>
-+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
-+        /usr/share/gettext</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/gmp.xml BOOK/final-system/common/gmp.xml
---- /home/jp/a/BOOK/final-system/common/gmp.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/gmp.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -50,24 +50,28 @@
- <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
- CXX="g++ -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
--  ./configure --prefix=/usr --enable-cxx</userinput></screen>
-+  ./configure --prefix=/usr --enable-cxx \
-+  --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
- 
-     <para os="c">Compile the package:</para>
- 
- <screen os="d"><userinput>make</userinput></screen>
- 
--    <important os="e">
--      <para>The test suite for GMP is considered
--      critical. Do not skip it under any circumstance.</para>
--    </important>
-+    <para os="e">Build the HTML documentation:</para>
- 
--    <para os="f">Test the results:</para>
-+<screen os="f"><userinput>make html</userinput></screen>
- 
--<screen os="g"><userinput remap="test">make check</userinput></screen>
-+    <para os="g">Test the results:</para>
- 
--    <para os="h">Install the package:</para>
-+<screen os="h"><userinput remap="test">make check</userinput></screen>
- 
--<screen os="i"><userinput>make install</userinput></screen>
-+    <para os="i">Install the package:</para>
-+
-+<screen os="j"><userinput>make install</userinput></screen>
-+
-+    <para os="k">Install the documentation:</para>
-+
-+<screen os="l"><userinput>make install-html</userinput></screen>
- 
-   </sect2>
- 
-@@ -76,9 +80,11 @@
- 
-     <segmentedlist>
-       <segtitle>Installed libraries</segtitle>
-+      <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
--        <seg>libgmp.[a,so], libgmpxx.[a,so], libmp.[a,so]</seg>
-+        <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
-+        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-@@ -106,16 +112,6 @@
-           </indexterm>
-         </listitem>
-       </varlistentry>
--
--      <varlistentry id="libmp">
--        <term><filename class="libraryfile">libmp</filename></term>
--        <listitem>
--          <para>Contains the Berkeley MP compatibility library.</para>
--          <indexterm zone="ch-system-gmp libmp">
--            <primary sortas="c-libmp">libmp</primary>
--          </indexterm>
--        </listitem>
--      </varlistentry>
- 
-     </variablelist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/grep.xml BOOK/final-system/common/grep.xml
---- /home/jp/a/BOOK/final-system/common/grep.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/grep.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -50,7 +50,7 @@
-       <segtitle>Installed programs</segtitle>
- 
-       <seglistitem>
--        <seg>egrep, fgrep, and grep</seg>
-+        <seg>egrep, fgrep, grep</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/groff.xml BOOK/final-system/common/groff.xml
---- /home/jp/a/BOOK/final-system/common/groff.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/groff.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -44,13 +44,6 @@
- 
- <screen os="h"><userinput>make install</userinput></screen>
- 
--    <para os="i">Some documentation programs, such as <command>xman</command>,
--    will not work properly without the following symlinks:</para>
--
--<screen os="j"><userinput>ln -sv soelim /usr/bin/zsoelim
--ln -sv eqn /usr/bin/geqn
--ln -sv tbl /usr/bin/gtbl</userinput></screen>
--
-   </sect2>
- 
-   <sect2 id="contents-groff" role="content">
-@@ -61,13 +54,12 @@
-       <segtitle>Installed directories</segtitle>
- 
-       <seglistitem>
--        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk,
--        geqn (link to eqn), grap2graph, grn, grodvi, groff, groffer, grog,
--        grolbp, grolj4, grops, grotty, gtbl (link to tbl), hpftodit, indxbib,
--        lkbib, lookbib, mmroff, neqn, nroff, pdfroff, pfbtops, pic, pic2graph,
--        post-grohtml, pre-grohtml, preconv, refer, roff2dvi, roff2html,
--        roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit, troff,
--        and zsoelim (link to soelim)</seg>
-+        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk, grap2graph,
-+        grn, grodvi, groff, groffer, grog, grolbp, grolj4, grops, grotty,
-+        hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pdfroff,
-+        pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, preconv, refer,
-+        roff2dvi, roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim,
-+        tbl, tfmtodit, troff</seg>
-         <seg>/usr/lib/groff, /usr/share/doc/groff-&groff-version;, /usr/share/groff</seg>
-       </seglistitem>
-     </segmentedlist>
-@@ -141,16 +133,6 @@
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry id="geqn">
--        <term><command>geqn</command></term>
--        <listitem>
--          <para>A link to <command>eqn</command></para>
--          <indexterm zone="ch-system-groff geqn">
--            <primary sortas="b-geqn">geqn</primary>
--          </indexterm>
--        </listitem>
--      </varlistentry>
--
-       <varlistentry id="grap2graph">
-         <term><command>grap2graph</command></term>
-         <listitem>
-@@ -263,16 +245,6 @@
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry id="gtbl">
--        <term><command>gtbl</command></term>
--        <listitem>
--          <para>A link to <command>tbl</command></para>
--          <indexterm zone="ch-system-groff gtbl">
--            <primary sortas="b-gtbl">gtbl</primary>
--          </indexterm>
--        </listitem>
--      </varlistentry>
--
-       <varlistentry id="hpftodit">
-         <term><command>hpftodit</command></term>
-         <listitem>
-@@ -551,16 +523,6 @@
-           </indexterm>
-         </listitem>
-       </varlistentry>
--
--      <varlistentry id="zsoelim">
--        <term><command>zsoelim</command></term>
--        <listitem>
--          <para>A link to <command>soelim</command></para>
--          <indexterm zone="ch-system-groff zsoelim">
--            <primary sortas="b-zsoelim">zsoelim</primary>
--          </indexterm>
--        </listitem>
--      </varlistentry>
- 
-     </variablelist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/gzip.xml BOOK/final-system/common/gzip.xml
---- /home/jp/a/BOOK/final-system/common/gzip.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/gzip.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -56,7 +56,7 @@
- 
-       <seglistitem>
-         <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff,
--        zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
-+        zegrep, zfgrep, zforce, zgrep, zless, zmore, znew</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/iana-etc.xml BOOK/final-system/common/iana-etc.xml
---- /home/jp/a/BOOK/final-system/common/iana-etc.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/iana-etc.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -25,7 +25,8 @@
-   <sect2 role="installation">
-     <title>Installation of Iana-Etc</title>
- 
--    <para os="p2">The following patch updates the services and protocol xml files:</para>
-+    <para os="p2">The following patch contains xml files which provide updates
-+    to the services and protocol files:</para>
- 
- <screen os="p3"><userinput>xzcat ../&iana-etc-numbers_update-patch; | patch -Np1 -i -</userinput></screen>
- 
-@@ -50,7 +51,7 @@
-       <segtitle>Installed files</segtitle>
- 
-       <seglistitem>
--        <seg>/etc/protocols and /etc/services</seg>
-+        <seg>/etc/protocols, /etc/services</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/iproute2.xml BOOK/final-system/common/iproute2.xml
---- /home/jp/a/BOOK/final-system/common/iproute2.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/iproute2.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -35,48 +35,17 @@
- 
- <screen os="s2"><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile
- sed -i '/ARPD/d' Makefile
--rm -v man/man8/arpd.8</userinput></screen>
--
--    <para os="f1">Remove unused libnl headers:</para>
--    
--    <screen os="f2"><userinput>sed -i '/netlink\//d' ip/ipl2tp.c</userinput></screen>
-+sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
- 
-     <para os="a">Compile the package:</para>
- 
--<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
--    MANDIR=/usr/share/man</userinput></screen>
--
--    <variablelist os="c">
--      <title>The meaning of the make option:</title>
--
--      <varlistentry>
--        <term><parameter>DESTDIR=</parameter></term>
--        <listitem>
--          <para>This option overrides the default DESTDIR of /usr, so that
--          that the IPRoute2 binaries will be installed into
--          <filename class="directory">/sbin</filename>. This is the correct
--          location according to the FHS, because some of the IPRoute2 binaries
--          are used by the CLFS-Bootscripts package.</para>
--        </listitem>
--      </varlistentry>
--
--      <varlistentry>
--        <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
--        <listitem>
--          <para>The DESTDIR=/ parameter would cause documentation to be
--          installed into <filename class="directory">/share/doc</filename> and
--          <filename class="directory">/share/man</filename>. These options
--          ensure the docs are installed to the correct locations.</para>
--        </listitem>
--      </varlistentry>
--    </variablelist>
-+<screen os="b"><userinput>make</userinput></screen>
- 
--    <para os="d">This package does not come with a test suite.</para>
-+    <para os="c">This package does not come with a test suite.</para>
- 
--    <para os="e">Install the package:</para>
-+    <para os="d">Install the package:</para>
- 
--<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
--    MANDIR=/usr/share/man install</userinput></screen>
-+<screen os="e"><userinput>make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
- 
-   </sect2>
- 
-@@ -90,8 +59,9 @@
-       <seglistitem>
-         <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
-         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
--        and tc</seg>
--        <seg>/etc/iproute2, /lib/tc, /usr/lib/tc, /usr/share/doc/iproute2</seg>
-+        tc</seg>
-+        <seg>/etc/iproute2, /usr/lib/tc,
-+        /usr/share/doc/iproute2-&iproute2-version;</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/iputils.xml BOOK/final-system/common/iputils.xml
---- /home/jp/a/BOOK/final-system/common/iputils.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/iputils.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -31,7 +31,7 @@
- 
-     <para os="a">Compile the package:</para>
- 
--<screen os="b"><userinput>make USE_CAP=no \
-+<screen os="b"><userinput>make \
-     IPV4_TARGETS="tracepath ping clockdiff rdisc" \
-     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
- 
-@@ -55,7 +55,7 @@
-       <segtitle>Installed programs</segtitle>
- 
-       <seglistitem>
--        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, and traceroute6</seg>
-+        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, traceroute6</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/isl.xml BOOK/final-system/common/isl.xml
---- /home/jp/a/BOOK/final-system/common/isl.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/isl.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -35,23 +35,18 @@
- 
- <screen os="d"><userinput>make</userinput></screen>
- 
--    <important os="e">
--      <para>The test suite for ISL is considered
--      critical. Do not skip it under any circumstance.</para>
--    </important>
-+    <para os="e">Test the results:</para>
- 
--    <para os="f">Test the results:</para>
-+<screen os="f"><userinput remap="test">make check</userinput></screen>
- 
--<screen os="g"><userinput remap="test">make check</userinput></screen>
-+    <para os="g">Install the package:</para>
- 
--    <para os="h">Install the package:</para>
-+<screen os="h"><userinput>make install</userinput></screen>
- 
--<screen os="i"><userinput>make install</userinput></screen>
-+    <para os="i">Finally, move a misplaced file:</para>
- 
--    <para os="j">Finally, move a misplaced file:</para>
--
--<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib
--mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
-+<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib
-+mv -v /usr/lib/libisl*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
-   </sect2>
- 
-   <sect2 id="contents-isl" role="content">
-@@ -59,9 +54,11 @@
- 
-     <segmentedlist>
-       <segtitle>Installed libraries</segtitle>
-+      <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
-         <seg>libisl.[a,so]</seg>
-+        <seg>/usr/include/isl</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/kbd.xml BOOK/final-system/common/kbd.xml
---- /home/jp/a/BOOK/final-system/common/kbd.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/kbd.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -30,22 +30,56 @@
- <screen os="b"><userinput>PKG_CONFIG_PATH="/tools/lib/pkgconfig" \
-     ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
- 
--    <para os="c">Compile the package:</para>
-+    <variablelist os="c">
-+      <title>The meaning of the new configure options:</title>
- 
--<screen os="d"><userinput>make</userinput></screen>
-+      <varlistentry>
-+        <term><envar>PKG_CONFIG_PATH</envar></term>
-+        <listitem>
-+          <para>Use pkg-config to obtain the location of the test library
-+          metadata built in <xref linkend="ch-temp-system-check"/>.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term><envar>--disable-vlock</envar></term>
-+        <listitem>
-+          <para>Prevents Kbd from trying to build the
-+          <command>vlock</command> program, which requires Linux-PAM.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term><envar>--enable-optional-progs</envar></term>
-+        <listitem>
-+          <para>Installs several additional programs.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+    </variablelist>
-+
-+    <para os="d">Compile the package:</para>
-+
-+<screen os="e"><userinput>make</userinput></screen>
-+
-+    <para os="f">To test the results, issue:</para>
-+
-+<screen os="g"><userinput remap="test">make check</userinput></screen>
-+
-+    <para os="h">Install the package:</para>
- 
--    <para os="e">This package does not come with a test suite.</para>
-+<screen os="i"><userinput>make install</userinput></screen>
- 
--    <para os="f">Install the package:</para>
-+    <para os="j">Some of the programs from Kbd are used by systemd to
-+    initialize the system, so those binaries need to be on the root
-+    partition:</para>
- 
--<screen os="g"><userinput>make install</userinput></screen>
-+<screen os="k"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
- 
--    <para os="h">Some of the programs from Kbd are used by scripts
--    in the CLFS-Bootscripts package. As <filename
--    class="directory">/usr</filename> may not be available during the early
--    stages of booting, those binaries need to be on the root partition:</para>
-+    <para os="l">Install the documentation:</para>
- 
--<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont,setvtrgb} /bin</userinput></screen>
-+<screen os="m"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
-+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
- 
-   </sect2>
- 
-@@ -62,8 +96,9 @@
-         (link to psfxtable), psfgettable (link to psfxtable), psfstriptable
-         (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
-         setleds, setmetamode, setvtrgb, showconsolefont, showkey,
--        unicode_start, and unicode_stop</seg>
-+        unicode_start, unicode_stop</seg>
-         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
-+        /usr/share/doc/kbd-&kbd-version;,
-         /usr/share/keymaps, /usr/share/unimaps</seg>
-       </seglistitem>
-     </segmentedlist>
-@@ -198,7 +233,7 @@
-       <varlistentry id="psfaddtable">
-         <term><command>psfaddtable</command></term>
-         <listitem>
--          <para>A link to <command>psfxtable</command></para>
-+          <para>Adds a Unicode character table to a console font</para>
-           <indexterm zone="ch-system-kbd psfaddtable">
-             <primary sortas="b-psfaddtable">psfaddtable</primary>
-           </indexterm>
-@@ -208,7 +243,8 @@
-       <varlistentry id="psfgettable">
-         <term><command>psfgettable</command></term>
-         <listitem>
--          <para>A link to <command>psfxtable</command></para>
-+          <para>Extracts the embedded Unicode character table from a console
-+          font</para>
-           <indexterm zone="ch-system-kbd psfgettable">
-             <primary sortas="b-psfgettable">psfgettable</primary>
-           </indexterm>
-@@ -218,7 +254,8 @@
-       <varlistentry id="psfstriptable">
-         <term><command>psfstriptable</command></term>
-         <listitem>
--          <para>A link to <command>psfxtable</command></para>
-+          <para>Removes the embedded Unicode character table from a console
-+          font</para>
-           <indexterm zone="ch-system-kbd psfstriptable">
-             <primary sortas="b-psfstriptable">psfstriptable</primary>
-           </indexterm>
-diff -ru /home/jp/a/BOOK/cross-tools/common/binutils.xml BOOK/cross-tools/common/binutils.xml
---- /home/jp/a/BOOK/cross-tools/common/binutils.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/binutils.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -49,9 +49,9 @@
-     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</userinput></screen>
-+    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-+    --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
-+    --disable-static --disable-multilib --disable-werror</userinput></screen>
- 
-     <variablelist os="bd">
-       <title>The meaning of the new configure options:</title>
-@@ -68,20 +68,30 @@
-       <varlistentry os="bd2">
-         <term><parameter>--host=${CLFS_HOST}</parameter></term>
-         <listitem>
--          <para>When used with --target, this creates a cross-architecture
--          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-+          <para>When used with <option>--target</option>, this creates a
-+          cross-architecture executable which creates files for
-+          ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-         </listitem>
-       </varlistentry>
- 
-       <varlistentry os="bd3">
-         <term><parameter>--target=${CLFS_TARGET}</parameter></term>
-         <listitem>
--          <para>When used with --host, this creates a cross-architecture
--          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-+          <para>When used with <option>--host</option>, this creates a
-+          cross-architecture executable that creates files for
-+          ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-         </listitem>
-       </varlistentry>
- 
-       <varlistentry os="bd4">
-+        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
-+        <listitem>
-+          <para>Tells configure to build a linker that uses ${CLFS} as its
-+          root directory for its search paths.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry os="bd5">
-         <term><parameter>--with-lib-path=/tools/lib</parameter></term>
-         <listitem>
-           <para>This tells the configure script to specify the library
-@@ -92,7 +102,7 @@
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry os="bd5">
-+      <varlistentry os="bd6">
-         <term><parameter>--disable-nls</parameter></term>
-         <listitem>
-           <para>This disables internationalization as i18n is not needed for the
-@@ -100,7 +110,7 @@
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry os="bd6">
-+      <varlistentry os="bd7">
-         <term><parameter>--disable-multilib</parameter></term>
-         <listitem>
-           <para>This option disables the building of a multilib
-@@ -108,10 +118,11 @@
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry os="bd7">
--        <term><parameter>--enable-64-bit-bfd</parameter></term>
-+      <varlistentry os="bd8">
-+        <term><parameter>--disable-werror</parameter></term>
-         <listitem>
--          <para>This adds 64 bit support to Binutils.</para>
-+          <para>This prevents the build from stopping in the event that there
-+          are warnings from the host's compiler.</para>
-         </listitem>
-       </varlistentry>
- 
-@@ -119,31 +130,12 @@
- 
-     <para os="be">Compile the package:</para>
- 
--<screen os="bf"><userinput>make configure-host
--make</userinput></screen>
--
--    <variablelist os="bg">
--      <title>The meaning of the make options:</title>
--
--      <varlistentry os="bg1">
--        <term><parameter>configure-host</parameter></term>
--        <listitem>
--          <para>This checks the host environment and makes sure all the
--          necessary tools are available to compile Binutils.</para>
--        </listitem>
--      </varlistentry>
--
--    </variablelist>
-+<screen os="bf"><userinput>make</userinput></screen>
- 
-     <para os="bh">Install the package:</para>
- 
- <screen os="bi"><userinput>make install</userinput></screen>
- 
--    <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
--    <filename class="directory">/tools/include</filename> directory:</para>
--
--<screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/common/kmod.xml BOOK/final-system/common/kmod.xml
---- /home/jp/a/BOOK/final-system/common/kmod.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/kmod.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -18,7 +18,7 @@
-     <title/>
- 
-     <para>The Kmod package contains programs for loading, inserting
--      and removing kernel modules for Linux. Kmod replaces the 
-+      and removing kernel modules for Linux. Kmod replaces the
-       Module-Init-tools package.</para>
- 
-   </sect2>
-@@ -30,7 +30,7 @@
- 
- <screen os="b"><userinput>./configure --prefix=/usr \
-     --bindir=/bin --sysconfdir=/etc \
--    --with-rootlibdir=/lib --disable-manpages \
-+    --with-rootlibdir=/lib \
-     --with-zlib --with-xz</userinput></screen>
- 
-     <variablelist os="c">
-@@ -63,18 +63,15 @@
- 
-     <para os="g">Install the package:</para>
- 
--<screen os="h"><userinput>make install
--make -C man install</userinput></screen>
-+<screen os="h"><userinput>make install</userinput></screen>
- 
--    <para os="i">Create symbolic links for programs that expect Module-Init-Tools.</para>
-+    <para os="i">Create symbolic links for programs that expect Module-Init-Tools:</para>
- 
- <screen os="j"><userinput>ln -sfv kmod /bin/lsmod
--ln -sfv ../bin/kmod /sbin/depmod
--ln -sfv ../bin/kmod /sbin/insmod
--ln -sfv ../bin/kmod /sbin/modprobe
--ln -sfv ../bin/kmod /sbin/modinfo
--ln -sfv ../bin/kmod /sbin/rmmod</userinput></screen>
--  
-+for tool in depmod insmod modinfo modprobe rmmod; do
-+    ln -sfv ../bin/kmod /sbin/${tool}
-+done</userinput></screen>
-+
-   </sect2>
- 
-   <sect2 id="contents-kmod" role="content">
-@@ -84,8 +81,9 @@
-       <segtitle>Installed programs</segtitle>
- 
-       <seglistitem>
--        <seg>depmod, insmod, kmod, lsmod, modinfo, modprobe, and
--        rmmod</seg>
-+        <seg>depmod (link to kmod), insmod (link to kmod), kmod,
-+        lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
-+        rmmod (link to kmod) </seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/less.xml BOOK/final-system/common/less.xml
---- /home/jp/a/BOOK/final-system/common/less.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/less.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -28,33 +28,20 @@
- 
- <screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
- 
--    <variablelist os="c">
--      <title>The meaning of the configure option:</title>
-+    <para os="c">Compile the package:</para>
- 
--      <varlistentry>
--        <term><parameter>--sysconfdir=/etc</parameter></term>
--        <listitem>
--          <para>This option tells the programs created by the package to look
--          in <filename class="directory">/etc</filename> for the configuration
--          files.</para>
--        </listitem>
--      </varlistentry>
--    </variablelist>
-+<screen os="d"><userinput>make</userinput></screen>
- 
--    <para os="d">Compile the package:</para>
-+    <para os="e">This package does not come with a test suite.</para>
- 
--<screen os="e"><userinput>make</userinput></screen>
-+    <para os="f">Install the package:</para>
- 
--    <para os="f">This package does not come with a test suite.</para>
-+<screen os="g"><userinput>make install</userinput></screen>
- 
--    <para os="g">Install the package:</para>
--
--<screen os="h"><userinput>make install</userinput></screen>
--
--    <para os="i">Move <command>less</command> to
-+    <para os="h">Move <command>less</command> to
-     <filename class="directory">/bin</filename>:</para>
- 
--<screen os="j"><userinput>mv -v /usr/bin/less /bin</userinput></screen>
-+<screen os="i"><userinput>mv -v /usr/bin/less /bin</userinput></screen>
- 
-   </sect2>
- 
-@@ -65,7 +52,7 @@
-       <segtitle>Installed programs</segtitle>
- 
-       <seglistitem>
--        <seg>less, lessecho, and lesskey</seg>
-+        <seg>less, lessecho, lesskey</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/libtool.xml BOOK/final-system/common/libtool.xml
---- /home/jp/a/BOOK/final-system/common/libtool.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/libtool.xml	2014-10-03 20:44:43.912339261 +0200
-@@ -53,7 +53,7 @@
-       <segtitle>Installed directories</segtitle>
- 
-       <seglistitem>
--        <seg>libtool and libtoolize</seg>
-+        <seg>libtool, libtoolize</seg>
-         <seg>libltdl.[a,so]</seg>
-         <seg>/usr/include/libltdl, /usr/share/libtool</seg>
-       </seglistitem>
-diff -ru /home/jp/a/BOOK/final-system/common/linux-headers.xml BOOK/final-system/common/linux-headers.xml
---- /home/jp/a/BOOK/final-system/common/linux-headers.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/linux-headers.xml	2014-10-03 20:44:43.916339261 +0200
-@@ -8,24 +8,37 @@
- <sect1 id="ch-system-linux-headers" role="wrap">
-   <?dbhtml filename="linux-headers.html"?>
- 
--  <title>Linux-Headers-&linux-version;</title>
-+  <title>Linux-&linux-version2; Headers</title>
- 
-   <indexterm zone="ch-system-linux-headers">
--    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-+    <primary sortas="a-Linux Headers">Linux Headers</primary>
-   </indexterm>
- 
-   <sect2 role="package">
-     <title/>
- 
--    <para>The Linux Kernel contains a make target that installs
--    <quote>sanitized</quote> kernel headers.</para>
-+    <para>The Linux Kernel contains a <command>make</command> target that
-+    installs <quote>sanitized</quote> kernel headers.</para>
- 
-   </sect2>
- 
-   <sect2 role="installation">
--    <title>Installation of Linux-Headers</title>
-+    <title>Installation of Linux Headers</title>
- 
--    <para os="a">For this step you will need the kernel tarball.</para>
-+    <note os="a">
-+      <para>For this step you will need to unpack the kernel tarball
-+      (<filename>linux-&linux-version;.tar.xz</filename>) and
-+      <command>cd</command> into its source
-+      directory before entering the commands on this page.</para>
-+    </note>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../../bootable/x86/kernel.xml"
-+    xpointer="xpointer(//*[@os='p1'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../../bootable/x86/kernel.xml"
-+    xpointer="xpointer(//*[@os='p2'])"/>
- 
-     <para os="b">Install the kernel header files:</para>
- 
-@@ -72,7 +85,7 @@
-   </sect2>
- 
-   <sect2 id="contents-linux-headers" role="content">
--    <title>Contents of Linux-Headers</title>
-+    <title>Contents of Linux Headers</title>
- 
-     <segmentedlist>
-       <segtitle>Installed headers</segtitle>
-diff -ru /home/jp/a/BOOK/final-system/common/man-pages.xml BOOK/final-system/common/man-pages.xml
---- /home/jp/a/BOOK/final-system/common/man-pages.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/man-pages.xml	2014-10-03 20:44:43.916339261 +0200
-@@ -17,7 +17,7 @@
-   <sect2 role="package">
-     <title/>
- 
--    <para>The Man-pages package contains over 1,200 man pages.</para>
-+    <para>The Man-pages package contains over 2,200 man pages.</para>
- 
-   </sect2>
- 
-@@ -50,11 +50,11 @@
-         <term><filename>man pages</filename></term>
-         <listitem>
-           <para>This package contains man pages that describe the following:
--          POSIX headers (section 0p), 
-+          POSIX headers (section 0p),
-           POSIX utilities (section 1p), POSIX functions (section 3p),
--          user commands (section 1), system calls (section 2), 
--          libc calls (section 3), device information (section 4), 
--          file formats (section 5), games (section 6), 
-+          user commands (section 1), system calls (section 2),
-+          libc calls (section 3), device information (section 4),
-+          file formats (section 5), games (section 6),
-           conventions and macro packages (section 7),
-           system administration (section 8), and
-           kernel (section 9).</para>
-diff -ru /home/jp/a/BOOK/final-system/common/mpc.xml BOOK/final-system/common/mpc.xml
---- /home/jp/a/BOOK/final-system/common/mpc.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/mpc.xml	2014-10-03 20:44:43.916339261 +0200
-@@ -29,24 +29,27 @@
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
--  ./configure --prefix=/usr</userinput></screen>
-+  ./configure --prefix=/usr --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
- 
-     <para os="c">Compile the package:</para>
- 
- <screen os="d"><userinput>make</userinput></screen>
- 
--    <important os="e">
--      <para>The test suite for MPC is considered
--      critical. Do not skip it under any circumstance.</para>
--    </important>
-+    <para os="e">Build the HTML documentation:</para>
- 
--    <para os="f">Test the results:</para>
-+<screen os="f"><userinput>make html</userinput></screen>
- 
--<screen os="g"><userinput remap="test">make check</userinput></screen>
-+    <para os="g">Test the results:</para>
- 
--    <para os="h">Install the package:</para>
-+<screen os="h"><userinput remap="test">make check</userinput></screen>
- 
--<screen os="i"><userinput>make install</userinput></screen>
-+    <para os="i">Install the package:</para>
-+
-+<screen os="j"><userinput>make install</userinput></screen>
-+
-+    <para os="k">Install the HTML documentation:</para>
-+
-+<screen os="l"><userinput>make install-html</userinput></screen>
- 
-   </sect2>
- 
-@@ -55,9 +58,11 @@
- 
-     <segmentedlist>
-       <segtitle>Installed libraries</segtitle>
-+      <segtitle>Installed directory</segtitle>
- 
-       <seglistitem>
-         <seg>libmpc.[a,so]</seg>
-+        <seg>/usr/share/doc/mpc-&mpc-version;</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/mpfr.xml BOOK/final-system/common/mpfr.xml
---- /home/jp/a/BOOK/final-system/common/mpfr.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/mpfr.xml	2014-10-03 20:44:43.916339261 +0200
-@@ -32,26 +32,21 @@
-     <para os="a">Prepare MPFR for compilation:</para>
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
--LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
--  ./configure --prefix=/usr --enable-shared \
--    --with-gmp=/usr</userinput></screen>
-+    LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-+    ./configure --prefix=/usr --with-gmp=/usr \
-+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
- 
-     <para os="c">Compile the package:</para>
- 
- <screen os="d"><userinput>make</userinput></screen>
- 
--    <important os="e">
--      <para>The test suite for MPFR is considered
--      critical. Do not skip it under any circumstance.</para>
--    </important>
-+    <para os="e">Test the results:</para>
- 
--    <para os="f">Test the results:</para>
-+<screen os="f"><userinput remap="test">make check</userinput></screen>
- 
--<screen os="g"><userinput remap="test">make check</userinput></screen>
-+    <para os="g">Install the package:</para>
- 
--    <para os="h">Install the package:</para>
--
--<screen os="i"><userinput>make install</userinput></screen>
-+<screen os="h"><userinput>make install</userinput></screen>
- 
-   </sect2>
- 
-@@ -64,7 +59,7 @@
- 
-       <seglistitem>
-         <seg>libmpfr.[a,so]</seg>
--        <seg>/usr/share/doc/mpfr</seg>
-+        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
-       </seglistitem>
-     </segmentedlist>
- 
-diff -ru /home/jp/a/BOOK/final-system/common/ncurses.xml BOOK/final-system/common/ncurses.xml
---- /home/jp/a/BOOK/final-system/common/ncurses.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/common/ncurses.xml	2014-10-03 20:44:43.916339261 +0200
-@@ -34,16 +34,35 @@
- 
- <screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
-     --with-shared --without-debug --enable-widec \
--    --with-manpage-format=normal \
-+    --with-manpage-format=normal --enable-pc-files \
-     --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
- 
-+    <variablelist os="b1">
-+      <title>The meaning of the new configure option:</title>
-+
-+      <varlistentry>
-+        <term><parameter>--with-manpage-format=normal</parameter></term>
-+        <listitem>
-+          <para>This tells Ncurses not to compress its installed manpages.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term><parameter>--enable-pc-files</parameter></term>
-+        <listitem>
-+          <para>This tells Ncurses to generate and install .pc files for
-+          <command>pkg-config</command>.</para>
-+        </listitem>
-+      </varlistentry>
-+    </variablelist>
-+
-     <para os="c">Compile the package:</para>
- 
- <screen os="d"><userinput>make</userinput></screen>
- 
--    <para os="e">This package has a test suite, and can be ran after the
--    package is installed. The tests are in the 
--    <filename class="directory">test/</filename> directory. See the 
-+    <para os="e">This package has a test suite, but it can only be run after
-+    the package is installed. The tests are in the
-+    <filename class="directory">test/</filename> directory. See the
-     <filename>README</filename> file in that directory for details.</para>
- 
-     <para os="f">Install the package:</para>
-@@ -56,17 +75,19 @@
- 
-     <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
- 
--<screen os="k"><userinput>rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
--ln -svf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
--ln -svf ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so
--ln -svf ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so
--ln -svf ../../lib/libformw.so.5 /usr/lib/libformw.so</userinput></screen>
--
--    <para os="l">Now we will make our Ncurses compatible for older and non-widec compatible programs
--    can build properly:</para>
-+<screen os="k"><userinput>ln -svf ../../lib/$(readlink /lib/libncursesw.so) /usr/lib/libncursesw.so
-+ln -svf ../../lib/$(readlink /lib/libmenuw.so) /usr/lib/libmenuw.so
-+ln -svf ../../lib/$(readlink /lib/libpanelw.so) /usr/lib/libpanelw.so
-+ln -svf ../../lib/$(readlink /lib/libformw.so) /usr/lib/libformw.so
-+rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
-+
-+    <para os="l">Many packages that use Ncurses will compile just fine against
-+    the widechar libraries, but won't know to look for them. Create linker
-+    scripts and symbolic links to allow older and non-widec compatible
-+    programs to build properly:</para>
- 
- <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
--        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
-+        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
-         ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
- done
- ln -sfv libncursesw.so /usr/lib/libcursesw.so
-@@ -74,11 +95,6 @@
- ln -sfv libncurses++w.a /usr/lib/libncurses++.a
- ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
- 
--    <para os="n">Now we will create a symlink for /usr/share/terminfo in
--    <filename class="directory">/usr/lib</filename> for compatibility:</para>
--
--<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib/terminfo</userinput></screen>
--
-   </sect2>
- 
-   <sect2 id="contents-ncurses" role="content">
-@@ -91,9 +107,9 @@
- 
-       <seglistitem>
-         <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
--        ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, and tset</seg>
-+        ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
-         <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
--        libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so], and
-+        libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
-         libpanelw.[a,so]</seg>
-         <seg>/usr/share/tabset, /usr/share/terminfo</seg>
-       </seglistitem>
-@@ -248,7 +264,7 @@
-         <listitem>
-           <para>Contains functions to implement forms</para>
-           <indexterm zone="ch-system-ncurses libformw">
--            <primary sortas="c-libform">libformw</primary>
-+            <primary sortas="c-libformw">libformw</primary>
-           </indexterm>
-         </listitem>
-       </varlistentry>
 diff -ru /home/jp/a/BOOK/final-system/common/perl.xml BOOK/final-system/common/perl.xml
 --- /home/jp/a/BOOK/final-system/common/perl.xml	2014-05-11 16:24:52.646516678 +0200
 +++ BOOK/final-system/common/perl.xml	2014-10-03 20:44:43.916339261 +0200



More information about the lfs-traducfr mailing list