[lfs-fr] r6574 - in trunk/clfs: . appendices appendices/dependencies appendices/rationale boot boot/64 boot/common final-system/common

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Sam 4 Oct 08:07:12 PDT 2014


Author: jmengual
Date: 2014-10-04 17:07:11 +0200 (Sat, 04 Oct 2014)
New Revision: 6574

Added:
   trunk/clfs/boot/64/flags.xml
   trunk/clfs/boot/common/bc.xml
   trunk/clfs/boot/common/boot-scripts.xml
   trunk/clfs/maj
Removed:
   trunk/clfs/alpha-index.xml
   trunk/clfs/appendices/dependencies/alpha.xml
   trunk/clfs/boot/64/e2fsprogs.xml
   trunk/clfs/boot/64/eudev.xml
   trunk/clfs/boot/64/grub-build.xml
   trunk/clfs/boot/64/shadow.xml
   trunk/clfs/boot/64/util-linux.xml
   trunk/clfs/boot/alpha/
   trunk/clfs/boot/common/bootscripts.xml
Modified:
   trunk/clfs/appendices/acronymlist.xml
   trunk/clfs/appendices/dependencies/common.xml
   trunk/clfs/appendices/dependencies/mips.xml
   trunk/clfs/appendices/dependencies/ppc.xml
   trunk/clfs/appendices/dependencies/sparc.xml
   trunk/clfs/appendices/dependencies/x86.xml
   trunk/clfs/appendices/rationale/common.xml
   trunk/clfs/boot/64/createfiles.xml
   trunk/clfs/boot/common/changingowner.xml
   trunk/clfs/final-system/common/introduction.xml
   trunk/clfs/general.ent
   trunk/clfs/patches.ent
Log:
Debut mise a jour et diff a traiter



Deleted: trunk/clfs/alpha-index.xml
===================================================================
--- trunk/clfs/alpha-index.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/alpha-index.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/alpha/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/alpha-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/alpha-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/alpha-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/alpha.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>

Modified: trunk/clfs/appendices/acronymlist.xml
===================================================================
--- trunk/clfs/appendices/acronymlist.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/acronymlist.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -23,13 +23,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term><emphasis role="bold">ALSA</emphasis></term>
-      <listitem>
-        <para>Advanced Linux Sound Architecture</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis role="bold">API</emphasis></term>
       <listitem>
         <para>Application Programming Interface</para>

Deleted: trunk/clfs/appendices/dependencies/alpha.xml
===================================================================
--- trunk/clfs/appendices/dependencies/alpha.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/dependencies/alpha.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-alpha" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="alpha-dependencies.html"?>
-
-  <title>Alpha Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to Alpha.</para>
-
-<!-- Begin aboot dependency info -->
-  <bridgehead renderas="sect2" id="aboot-dep">Aboot</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC,
-         Grep, Make, Ncurses, Sed and Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>

Modified: trunk/clfs/appendices/dependencies/common.xml
===================================================================
--- trunk/clfs/appendices/dependencies/common.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/dependencies/common.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -5,8 +5,8 @@
   %general-entities;
 ]>
 
-<appendix id="appendixc" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
+<appendix id="appendixc" xreflabel="Annexe B">
+  <?dbhtml dir="appendixb"?>
   <?dbhtml filename="dependencies.html"?>
 
   <title>Dépendances</title>
@@ -33,6 +33,62 @@
   /tools/bin/[binary] soient placés à l'intérieur de scripts installés
   dans le système final. Cela n'est évidemment pas souhaitable.</para>
 
+<!-- Begin ACL dependency info -->
+  <bridgehead renderas="sect2" id="acl-dep">ACL</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
+         Libtool, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Pas de suite de tests disponible</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Coreutils, Gettext, Libcap, Sed, Systemd, Tar, Vim</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Attr dependency info -->
+  <bridgehead renderas="sect2" id="attr-dep">Attr</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
+         Libtool, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Pas de suite de tests disponible</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>ACL, Coretutils, Gettext, Libcap, Sed, Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Autoconf dependency info -->
   <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
 
@@ -40,7 +96,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Coreutils, Gawk, Grep, M4, Make, Perl, Sed et Texinfo</seg>
+          <seg>Bash, Coreutils, Gawk, Grep, M4, Make, Perl, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -48,7 +104,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Automake, Binutils, Diffutils, Findutils, GCC et Libtool</seg>
+          <seg>Automake, Binutils, Diffutils, Findutils, GCC, Libtool</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -68,7 +124,7 @@
 
         <seglistitem>
           <seg>Autoconf, Bash, Binutils, Coreutils, Gawk, Grep, M4, Make, Perl,
-          Sed et Texinfo</seg>
+          Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -77,7 +133,7 @@
 
         <seglistitem>
           <seg>Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
-          Flex, GCC, Gettext, Gzip, Libtool, XZ-Utils et Tar. Peut aussi 
+          Flex, GCC, Gettext, Gzip, Libtool, Tar, XZ Utils. Peut aussi 
           utiliser plusieurs autres paquets non installés dans CLFS.</seg>
         </seglistitem>
       </segmentedlist>
@@ -97,8 +153,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, Make,
-          Ncurses, Patch, Readline, Sed et Texinfo</seg>
+          <seg>Bash, Bison, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, Make,
+          Ncurses, Patch, Readline, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -125,8 +181,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, GCC, Grep, Make,
-          et Readline</seg>
+          <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC, Grep, Make,
+         Readline</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -153,8 +209,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, File, Gawk, GCC,
-         Grep, Make, Perl, Sed, Texinfo et Zlib</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, File, Gawk, GCC,
+         Grep, Make, Perl, Sed, Texinfo, Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -162,7 +218,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>DejaGNU et Expect</seg>
+          <seg>DejaGNU, Expect</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -181,8 +237,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC,
-         Grep, M4, Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC,
+         Grep, M4, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -190,7 +246,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, Findutils et Gawk</seg>
+          <seg>Diffutils, Findutils, Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -198,7 +254,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Flex, Kbd et Tar</seg>
+          <seg>Flex, Kbd, Tar</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -209,7 +265,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -229,14 +285,14 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin CLFS-Bootscripts dependency info -->
-  <bridgehead renderas="sect2" id="bootscripts-dep">CLFS-Bootscripts</bridgehead>
+<!-- Begin CLFS-Boot-scripts dependency info -->
+  <bridgehead renderas="sect2" id="clfs-bootscripts-dep">CLFS-Boot-scripts</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils, Make et Sed</seg>
+         <seg>Bash, Coreutils, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -264,7 +320,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>GCC, Grep, Make, Sed et Texinfo</seg>
+         <seg>GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -285,15 +341,15 @@
       </segmentedlist>
 
 
-<!-- Begin CLooG-ISL dependency info -->
-  <bridgehead renderas="sect2" id="cloog-isl-dep">CLooG-ISL</bridgehead>
+<!-- Begin CLooG dependency info -->
+  <bridgehead renderas="sect2" id="cloog-dep">CLooG</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
-         Make, MPC, MPFR, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
+         Make, MPC, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -321,8 +377,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, GMP, Grep, Make,
-         Patch, Perl, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP, Grep, Make,
+         Patch, Perl, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -338,10 +394,38 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Diffutils, Findutils, Man et Eudev</seg>
+          <seg>Bash, Diffutils, Findutils, Man, Eudev</seg>
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin D-Bus dependency info -->
+  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
+         Gettext, Grep, Make, Man, Pkg-config, Sed, Systemd, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Aucun</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+         </seglistitem>
+   </segmentedlist>
+
 <!-- Begin DejaGNU dependency info -->
   <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
 
@@ -349,7 +433,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make et Sed</seg>
+         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -384,7 +468,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -403,8 +487,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Patch, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
+         Make, Patch, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -412,7 +496,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -424,15 +508,15 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin EGLIBC dependency info -->
-  <bridgehead renderas="sect2" id="eglibc-dep">EGLIBC</bridgehead>
+<!-- Begin Glibc dependency info -->
+  <bridgehead renderas="sect2" id="Glibc-dep">Glibc</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
-         Grep, Gzip, Make, Perl, Sed et Texinfo</seg>
+         Grep, Gzip, Linux Headers, Make, Perl, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -452,15 +536,16 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Expect dependency info -->
-  <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
 
+<!-- Begin E2fsprogs dependency info -->
+  <bridgehead renderas="sect2" id="e2fsprogs-dep">E2fsprogs</bridgehead>
+
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep, Make,
-         Patch, Sed et Tcl</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gettext, Grep, Gzip,
+         Make, Pkg-config-lite, Sed, Texinfo, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -468,7 +553,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Aucun</seg>
+          <seg>Bzip2 and Diffutils</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -476,19 +561,19 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Aucun</seg>
+          <seg>Aucune</seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin E2fsprogs dependency info -->
-  <bridgehead renderas="sect2" id="e2fsprogs-dep">E2fsprogs</bridgehead>
+<!-- Begin Eudev dependency info -->
+  <bridgehead renderas="sect2" id="eudev-dep">Eudev</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
-         Make, Pkg-config-lite, Sed, Texinfo et Util-linux</seg>
+         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -496,7 +581,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Bzip2 and Diffutils</seg>
+          <seg>Pas de suite de tests disponibles</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -504,10 +589,38 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Aucune</seg>
+          <seg>Systemd</seg>
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin D-Bus dependency info -->
+  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
+         Gettext, Grep, Make, Man, Pkg-config, Sed, Systemd, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Aucun</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Aucun</seg>
+         </seglistitem>
+       </segmentedlist>
+
 <!-- Begin File dependency info -->
   <bridgehead renderas="sect2" id="file-dep">File</bridgehead>
 
@@ -515,8 +628,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
-         Make, Sed et Zlib</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
+         Make, Sed, Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -524,7 +637,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -543,8 +656,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -552,7 +665,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>DejaGNU, Diffutils et Expect</seg>
+          <seg>DejaGNU, Diffutils, Expect</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -571,8 +684,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, M4, Make,
-         Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, M4, Make,
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -580,7 +693,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Bison, Diffutils et Gawk</seg>
+          <seg>Bison, Diffutils, Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -588,7 +701,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>IPRoute2, Kbd et Man</seg>
+          <seg>IPRoute2, Kbd, Man</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -599,7 +712,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -626,9 +739,9 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, CLooG-ISL, Coreutils, Diffutils, EGLIBC,
+         <seg>Bash, Binutils, CLooG-ISL, Coreutils, Diffutils, Glibc,
          Findutils, Gawk, GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed,
-         Tar et Texinfo</seg>
+         Tar, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -636,7 +749,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Check, DejaGNU et Expect</seg>
+          <seg>Check, DejaGNU, Expect</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -644,10 +757,35 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin GDBM dependency info -->
+  <bridgehead renderas="sect2" id="gdbm">GDBM</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+    <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
+    </seglistitem>
+       <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
           <seg>Aucun</seg>
         </seglistitem>
       </segmentedlist>
 
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Aucun</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Gettext dependency info -->
   <bridgehead renderas="sect2" id="gettext-dep">Gettext</bridgehead>
 
@@ -655,8 +793,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Make, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
+         GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -664,7 +802,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Tar et Tcl</seg>
+          <seg>Tar, Tcl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -677,7 +815,7 @@
       </segmentedlist>
 
 <!-- Begin Glib dependency info -->
-  <bridgehead renderas="sect2" id="glib-dep">Glib</bridgehead>
+<!--  <bridgehead renderas="sect2" id="glib-dep">Glib</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
@@ -701,7 +839,7 @@
         <seglistitem>
           <seg>Pkg-config-lite</seg>
         </seglistitem>
-      </segmentedlist>
+      </segmentedlist> -->
 
 <!-- Begin GMP dependency info -->
   <bridgehead renderas="sect2" id="gmp-dep">GMP</bridgehead>
@@ -710,8 +848,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, M4, Make,
-         Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, M4, Make,
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -731,6 +869,34 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Gperf dependency info -->
+  <bridgehead renderas="sect2" id="gperf-dep">Gperf</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
+         Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Intltool</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Grep dependency info -->
   <bridgehead renderas="sect2" id="grep-dep">Grep</bridgehead>
 
@@ -738,8 +904,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Patch, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
+         Make, Patch, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -747,7 +913,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils et Gawk</seg>
+          <seg>Diffutils, Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -766,8 +932,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make, Perl
-         Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Perl
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -775,7 +941,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -783,7 +949,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Man et Perl</seg>
+          <seg>Man, Perl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -794,8 +960,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -822,7 +988,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Coreutils, Gawk et Make</seg>
+         <seg>Coreutils, Gawk, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -830,7 +996,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -842,6 +1008,33 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Intltool dependency info -->
+  <bridgehead renderas="sect2" id="intltool-dep">Intltool</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Binutils, Coreutils, Glibc, GCC, Make, Perl Sed, XML::Parser</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Aucun</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin IProute2 dependency info -->
   <bridgehead renderas="sect2" id="iproute2-dep">IProute2</bridgehead>
 
@@ -849,8 +1042,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, Findutils, Flex, GCC,
-         Make, Linux-Headers et Sed</seg>
+         <seg>Bash, Binutils, Bison, Coreutils, Glibc, Findutils, Flex, GCC,
+         Make, Linux-Headers, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -858,7 +1051,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -877,7 +1070,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC et Make</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -885,7 +1078,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -904,7 +1097,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gzip, Make et Check</seg>
+          <seg>Bash, Binutils, Check, Coreutils, Glibc, Gawk, GCC, Gzip, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -912,7 +1105,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -931,8 +1124,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, Flex, Gawk, GCC,
-         Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ-Utils, et Zlib.
+         <seg>Bash, Binutils, Bison, Coreutils, Glibc, Flex, Gawk, GCC,
+         Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ Utils,, Zlib.
          </seg>
         </seglistitem>
       </segmentedlist>
@@ -949,7 +1142,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Eudev</seg>
+          <seg>Systemd</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -961,8 +1154,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Ncurses et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
+         Ncurses, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -970,7 +1163,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -983,14 +1176,13 @@
       </segmentedlist>
 
 <!-- Begin libestr dependency info -->
-  <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
+  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Libestr, Make, Pkg-config-lite, Sed et Texinfo</seg>
+          <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -998,7 +1190,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Aucune</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1006,19 +1198,19 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Rsyslog</seg>
+          <seg>Coreutils, IPutils, Systemd</seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin libestr dependency info -->
-  <bridgehead renderas="sect2" id="libestr-dep">Libestr</bridgehead>
+<!-- Begin Libpipeline dependency info -->
+  <bridgehead renderas="sect2" id="libpipeline-dep">Libpipeline</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Make, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1026,7 +1218,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Aucune</seg>
+          <seg>Check</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1034,7 +1226,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Libee and Rsyslog</seg>
+          <seg>Man-DB</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1046,8 +1238,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Make, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
+         GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1067,14 +1259,14 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Linux-Headers dependency info -->
-  <bridgehead renderas="sect2" id="linux-headers-dep">Linux-Headers</bridgehead>
+<!-- Begin Linux Headers dependency info -->
+  <bridgehead renderas="sect2" id="linux-headers-dep">Linux Headers</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl et Sed</seg>
+         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1082,7 +1274,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1101,8 +1293,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, GCC, Grep,
-         Gzip, KMOD, Make, Ncurses, Perl et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, GCC, Grep,
+         Gzip, KMOD, Make, Ncurses, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1110,7 +1302,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1129,8 +1321,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make, Sed
-         et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Sed,
+         Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1146,7 +1338,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Autoconf et Bison</seg>
+          <seg>Autoconf, Bison</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1157,8 +1349,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1166,7 +1358,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Perl et Procps</seg>
+          <seg>Perl, Procps</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1178,15 +1370,15 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Man dependency info -->
-  <bridgehead renderas="sect2" id="man-dep">Man</bridgehead>
+<!-- Begin Man-DB dependency info -->
+  <bridgehead renderas="sect2" id="man-db-dep">Man-DB</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, EGLIBC, Gawk, GCC,
-         Grep, Groff, Gzip, Less, XZ-Utils, Make et Sed</seg>
+         <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC,
+         Grep, Groff, Gzip, Less, XZ Utils, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1194,7 +1386,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1202,7 +1394,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Aucun</seg>
+          <seg>D-Bus</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1213,7 +1405,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils et Make</seg>
+         <seg>Bash, Coreutils, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1221,7 +1413,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1240,8 +1432,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
-         Make, MPFR, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
+         Make, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1268,8 +1460,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
-         Make, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1296,8 +1488,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
-         Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
+         Make, Pkg-config-lite, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1305,7 +1497,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1314,7 +1506,7 @@
 
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
-          Util-linux et Vim</seg>
+          Util-linux, Vim</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1325,7 +1517,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1333,7 +1525,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1352,8 +1544,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep,
-         Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep,
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1361,7 +1553,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Gzip, Iana-Etc et Procps, Tar</seg>
+          <seg>Gzip, Iana-Etc, Procps, Tar</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1380,8 +1572,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
-         Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1397,18 +1589,18 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Util-linux, E2fsprogs</seg>
+          <seg>E2fsprogs, Systemd, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Procps dependency info -->
-  <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
+<!-- Begin Procps-ng dependency info -->
+  <bridgehead renderas="sect2" id="procps-ng-dep">Procps-ng</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make et Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Ncurses</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1416,7 +1608,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1435,8 +1627,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, libee,
-         Libestr, Make, Sed et Zlib</seg>
+         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, libee,
+         Libestr, Make, Sed, Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1444,7 +1636,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1463,8 +1655,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses,
-         Patch, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses,
+         Patch, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1472,7 +1664,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1484,34 +1676,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Rsyslog dependency info -->
-  <bridgehead renderas="sect2" id="rsyslog-dep">Rsyslog</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, Make
-         et Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Aucun</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Sed dependency info -->
   <bridgehead renderas="sect2" id="sed-dep">Sed</bridgehead>
 
@@ -1519,8 +1683,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Sed et Texinfo</seg>
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1528,7 +1692,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils et Gawk</seg>
+          <seg>Diffutils, Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1536,7 +1700,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>E2fsprogs, File, Libtool et Shadow</seg>
+          <seg>E2fsprogs, File, Libtool, Shadow</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1547,8 +1711,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
-         Gettext, Grep, Make et Sed</seg>
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
+         Gettext, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1556,7 +1720,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1568,14 +1732,16 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Sysvinit dependency info -->
-  <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
+<!-- Begin systemd dependency info -->
+  <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, EGLIBC, GCC, Make et Sed</seg>
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, E2fsprogs, Glibc,
+         Findutils, Gawk, GCC, GPerf, Grep, Intltool, Libcap, Make, Perl,
+         Pkg-config, Sed, Util-linux, XML::Parser</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1583,7 +1749,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1591,7 +1757,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Aucun</seg>
+          <seg>D-Bus</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1602,8 +1768,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, GCC,
-         Grep, Make, Sed et Texinfo</seg>
+         <seg>ACL, Attr, Bash, Binutils, Bison, Coreutils, Glibc, GCC,
+         Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1611,7 +1777,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, Findutils, Gawk et Gzip</seg>
+          <seg>Diffutils, Findutils, Gawk, Gzip</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1630,8 +1796,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
-         Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1658,8 +1824,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make,
-         Ncurses et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make,
+         Ncurses, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1667,7 +1833,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils et Gzip</seg>
+          <seg>Diffutils, Gzip</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1679,15 +1845,16 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Eudev dependency info -->
-  <bridgehead renderas="sect2" id="udev-dep">Eudev</bridgehead>
 
+<!-- Begin Util-linux dependency info -->
+  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
+
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
-         Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
+         Make, Ncurses, Pkg-config-lite, Sed, Texinfo, Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1695,7 +1862,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Pas de suite de tests disponible</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1703,19 +1870,19 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Aucun</seg>
+          <seg>E2fsprogs</seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Util-linux dependency info -->
-  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
+<!-- Begin Vim dependency info -->
+  <bridgehead renderas="sect2" id="vim-dep">Vim</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Ncurses, Pkg-config-lite, Sed, Texinfo et Zlib</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
+         Gettext, Grep, Make, Ncurses, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1723,7 +1890,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Gzip</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1731,19 +1898,18 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>E2fsprogs</seg>
+          <seg>Aucun</seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Vim dependency info -->
-  <bridgehead renderas="sect2" id="vim-dep">Vim</bridgehead>
+<!-- Begin XML::Parser dependency info -->
+  <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
-         Gettext, Grep, Make, Ncurses, Perl et Sed</seg>
+         <seg>Coreutils, Expat, Make, Perl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1751,7 +1917,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Gzip</seg>
+          <seg>Aucune</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1759,19 +1925,19 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Aucun</seg>
+          <seg>Intltool</seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin XZ-Utils dependency info -->
-  <bridgehead renderas="sect2" id="xz-utils-dep">XZ-Utils</bridgehead>
+<!-- Begin XZ Utils dependency info -->
+  <bridgehead renderas="sect2" id="XZ-Utils-dep">XZ Utils</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
-         Grep, Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
+         Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1798,7 +1964,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make et Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1814,7 +1980,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>File, KMOD et Util-linux</seg>
+          <seg>File, KMOD, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 

Modified: trunk/clfs/appendices/dependencies/mips.xml
===================================================================
--- trunk/clfs/appendices/dependencies/mips.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/dependencies/mips.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
@@ -11,7 +11,7 @@
 
   <title>Mips Dependencies</title>
 
-  <para>This page contains dependency information for packages specific to Mips.</para>
+  <para>Cette page contient les informations de dépendances pour les paquets spécifjques à Mips.</para>
 
 <!-- Begin arcload dependency info -->
   <bridgehead renderas="sect2" id="arcload-dep">Arcload</bridgehead>
@@ -20,7 +20,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Dvhtool, GCC, Make and Sed</seg>
+         <seg>Binutils, Coreutils, Dvhtool, GCC, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -47,7 +47,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Gzip and Make</seg>
+         <seg>Binutils, Coreutils, GCC, Gzip, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -74,7 +74,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC and Make</seg>
+         <seg>Binutils, Coreutils, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
 

Modified: trunk/clfs/appendices/dependencies/ppc.xml
===================================================================
--- trunk/clfs/appendices/dependencies/ppc.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/dependencies/ppc.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
@@ -11,7 +11,7 @@
 
   <title>PowerPC Dependencies</title>
 
-  <para>This page contains dependency information for packages specific to ppc.</para>
+  <para>Cette page contient les informations de dépendances pour les paquets spécifjques à ppc.</para>
 
 <!-- Begin hfsutils dependency info -->
   <bridgehead renderas="sect2" id="hfsutils-dep">hfsutils</bridgehead>
@@ -20,7 +20,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC and Make</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -47,7 +47,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fsprogs, GCC, Make, Ncurses and
+         <seg>Bash, Binutils, Coreutils, E2fsprogs, GCC, Make, Ncurses,
          Readline</seg>
         </seglistitem>
       </segmentedlist>
@@ -75,7 +75,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, GCC, Make and Patch</seg>
+         <seg>Binutils, GCC, Make, Patch</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -102,7 +102,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Make, Mktemp, Patch and Sed</seg>
+         <seg>Binutils, Coreutils, GCC, Make, Mktemp, Patch, Sed</seg>
         </seglistitem>
       </segmentedlist>
 

Modified: trunk/clfs/appendices/dependencies/sparc.xml
===================================================================
--- trunk/clfs/appendices/dependencies/sparc.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/dependencies/sparc.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
@@ -11,7 +11,7 @@
 
   <title>Sparc Dependencies</title>
 
-  <para>This page contains dependency information for packages specific to Sparc.</para>
+  <para>Cette page contient les informations de dépendances pour les paquets spécifjques à Sparc.</para>
 
 <!-- Begin elftoaout dependency info -->
   <bridgehead renderas="sect2" id="elftoaout-dep">Elftoaout</bridgehead>
@@ -20,7 +20,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, GCC, Make and Patch</seg>
+         <seg>Binutils, GCC, Make, Patch</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -47,8 +47,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, EGLIBC, Elftoaout, Gawk, GCC, Grep, Gzip,
-         Make, Patch and Sed</seg>
+         <seg>Binutils, Coreutils, Glibc, Elftoaout, Gawk, GCC, Grep, Gzip,
+         Make, Patch, Sed</seg>
         </seglistitem>
       </segmentedlist>
 

Modified: trunk/clfs/appendices/dependencies/x86.xml
===================================================================
--- trunk/clfs/appendices/dependencies/x86.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/dependencies/x86.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
@@ -9,9 +9,9 @@
   <?dbhtml dir="appendixc"?>
   <?dbhtml filename="x86-dependencies.html"?>
 
-  <title>x86 Dependencies</title>
+  <title>Dépendances pour x86</title>
 
-  <para>This page contains dependency information for packages specific to x86.</para>
+  <para>Cette page contient les informations de dépendances pour les paquets spécifjques à x86.</para>
 
 <!-- Begin GRUB2 dependency info -->
   <bridgehead renderas="sect2" id="grub2-dep">GRUB2</bridgehead>
@@ -20,8 +20,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison Coreutils, Diffutils, EGLIBC, Gawk, GCC, Gettext,
-         Grep, Make, Ncurses, Sed et Texinfo</seg>
+         <seg>Bash, Binutils, Bison Coreutils, Diffutils, Glibc, Gawk, GCC, Gettext,
+         Grep, Make, Ncurses, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -29,7 +29,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Aucun</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -37,7 +37,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Aucun</seg>
         </seglistitem>
       </segmentedlist>
 

Modified: trunk/clfs/appendices/rationale/common.xml
===================================================================
--- trunk/clfs/appendices/rationale/common.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/appendices/rationale/common.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -18,7 +18,19 @@
 
   <itemizedlist>
 
+ <listitem>
+      <para>ACL</para>
+      <para>Le paquet ACL permet d'utiliser et de tester les listes de contrôle
+      d'accès POSIX. Plusieurs paquets peuvent l'utiliser dans CLFS, tels que
+      Coreutils et Systemd.</para>
+    </listitem>
+
     <listitem>
+      <para>Attr</para>
+      <para>Attr permet de définir et de voir les attributs étendus des objets d'un
+      système de fichiers. Il est exigé par Systemd.</para>
+    </listitem>
+    <listitem>
       <para>Autoconf</para>
         <para>Le paquet Autoconf contient des programmes produisant des
         scripts shell qui configurent automatiquement le code source. Ceci sert
@@ -67,7 +79,7 @@
     </listitem>
 
     <listitem>
-      <para>CLFS-Bootscripts</para>
+      <para>CLFS-Boot-scripts</para>
       <para>Ce paquet contient un certain nombre de scripts qui démarrent au
       moment de l'amorçage et qui effectuent des tâches essentielles comme le
       montage/vérification des systèmes de fichiers et le lancement de
@@ -77,11 +89,13 @@
  
     <listitem>
       <para>Check</para>
-      <para>Ce paquet contient un test de solidité utile à d'autres programmes.</para>
+      <para>Ce paquet contient un test de solidité utile à d'autres programmes.
+      Il est utilisé dans la suite de tests de certains paquets.</para>
     </listitem>
     <listitem>
       <para>CLooG-ISL</para>
-      <para>Ce paquet est utilisé par GCC</para>
+      <para>Ce paquet est utilisé par GCC pour activer son code de génération de
+      boucle Graphite</para>
     </listitem>
 
     <listitem>
@@ -91,6 +105,12 @@
       paquet de CLFS.</para>
     </listitem>
 
+ <listitem>
+      <para>D-Bus</para>
+      <para>D-Bus est un système de bus de message qui permet aux applications 
+      de communiquer entre elles. Il est utilisé par Systemd.</para>
+    </listitem>
+
     <listitem>
       <para>DejaGNU</para>
       <para>Ce paquet est nécessaire pour la suite de tests de plusieurs paquets,
@@ -113,9 +133,11 @@
     </listitem>
 
     <listitem>
-      <para>EGLIBC</para>
-      <para>Tout programme C lié de façon dynamique (ce qui est le cas de presque
-      tout dans CLFS) a besoin d'une bibliothèque C pour se compiler et se lancer.</para>
+      <para>Eudev</para>
+      <para>Le paquet Eudev contient des programmes de création dynamiques de
+      nœuds de périphériques. Il est utilisé par Udev, qui fait maintenant
+      partie de Systemd. On l'utilise encore pour la méthode Démarrage dans le
+      système temporaire, car Systemd n'y est pas utile.</para>
     </listitem>
 
     <listitem>
@@ -138,8 +160,8 @@
     <listitem>
       <para>Findutils</para>
       <para>Ce paquet contient des programmes pour chercher des fichiers à partir
-      de certains critères et, éventuellement, y appliquer des commandes. Il
-      est utilisé par les procédures d'installation de nombreux paquets CLFS.</para>
+      de certains critères et, éventuellement, y appliquer des commandes. Ces
+      programmes sont utilisés par les procédures d'installation de nombreux paquets CLFS.</para>
     </listitem>
 
     <listitem>
@@ -161,6 +183,12 @@
       la plupart des paquets de CLFS.</para>
     </listitem>
 
+ <listitem>
+      <para>GDBM</para>
+      <para>Ce paquet contient la bibliothèque GNU Database Manager. Man-DB
+      exige soit GDBM soit Berkeley DB, mais il préfère GDBM.</para>
+    </listitem>
+
     <listitem>
       <para>Gettext</para>
      <para>Outil permettant aux programmeurs d'implémenter facilement
@@ -173,11 +201,22 @@
       <para>Requis pour pkg-config-lite</para>
     </listitem>
 
+ <listitem>
+      <para>Glibc</para>
+      <para>Tout programme lié de façon dynamique (presque tous les paquets de
+      CLFS) ont besoin de cette bibliothèque pour se compiler et se lancer.</para>
+    </listitem>
+
     <listitem>
       <para>GMP</para>
       <para>Ce paquet est requis par GCC</para>
     </listitem>
 
+ <listitem>
+      <para>Gperf</para>
+      <para>Ce paquet est exigé par Systemd.</para>
+    </listitem>
+
     <listitem>
       <para>Grep</para>
       <para>Ce paquet contient des programmes pour chercher du texte dans des fichiers. Exigé par
@@ -186,7 +225,7 @@
 
     <listitem>
       <para>Groff</para>
-      <para>Ce paquet est requis par Man</para>
+      <para>Ce paquet est requis par Man-DB.</para>
     </listitem>
 
     <listitem>
@@ -204,6 +243,11 @@
       programmes basés sur le réseau fonctionnent correctement.</para>
     </listitem>
 
+ <listitem>
+      <para>Intltool</para>
+      <para>Ce paquet est exigé par Systemd.</para>
+    </listitem>
+
     <listitem>
       <para>IProute2</para>
       <para>Ce paquet contient des programmes d'administration des interfaces 
@@ -218,7 +262,8 @@
     <listitem>
       <para>Kbd</para>
       <para>Contient les fichiers de tables de touches et des outils claviers 
-      compatibles avec le noyau Linux.</para>
+      compatibles avec le noyau Linux. Ils peuvent être utilisés pour changer
+      de police d'affichage et de disposition de clavier.</para>
     </listitem>
 
     <listitem>
@@ -230,21 +275,20 @@
     <listitem>
       <para>Less</para>
       <para>Un programme vous permettant de visualiser des fichiers textes page
-      par page. Utilisé par Man pour afficher des pages de man.</para>
+      par page. Il est utilisé aussi par Man-DB pour afficher des pages de man.</para>
     </listitem>
 
     <listitem>
-      <para>Libee</para>
-      <para>Ce paquet contient une bibliothèque d'expression d'événements.
-      Il est nécessaire pour Rsyslog.</para>
-    </listitem>
+      <para>Libcap</para>
+      <para>Ce paquet est exigé par Systemd.</para>
+     </listitem>
 
-    <listitem>
-      <para>Libestr</para>
-      <para>Ce paquet contient une bibliothèque de chaînes essentielles.
-      Il est nécessaire pour Rsyslog.</para>
+     <listitem>
+      <para>Libpipeline</para>
+      <para>Le paquet Libpipeline contient une bibliothèque pour manipuler les
+      pipelines des sous-processus de manière flexible et pratique. Il est
+      exigé par le paquet Man-DB.</para>
     </listitem>
-
     <listitem>
       <para>Libtool</para>
       <para>Le paquet Libtool contient le script de support de la bibliothèque 
@@ -252,7 +296,7 @@
     </listitem>
 
     <listitem>
-      <para>Linux-Headers</para>
+      <para>Linux Headers</para>
       <para>Ce paquet contient des en-têtes récupérées du noyau Linux..Ces
       en-têtes sont exigées pour que Glibc compile.</para>
     </listitem>
@@ -270,12 +314,14 @@
 
     <listitem>
       <para>Make</para>
-      <para>Nécessaire pour l'installation de la plupart des paquets de CLFS</para>
+      <para>Il est nécessaire pour l'installation de la plupart des paquets de CLFS</para>
     </listitem>
 
     <listitem>
-      <para>Man</para>
-      <para>Utilisé pour visualiser des pages de man</para>
+      <para>Man-DB</para>
+      <para>Ce paquet contient des outils de recherche et de lecture des pages de
+      man et il dispose de capacités d'internationalisation supérieures au
+      paquet <application>Man</application>.</para>
     </listitem>
 
     <listitem>
@@ -313,11 +359,12 @@
 
     <listitem>
       <para>Pkg-config-lite</para>
-      <para>Exigé par E2fsprogs</para>
+      <para>Plusieurs paquets de CLFS et de nombreux autres en-dehors utilisent
+      <command>pkg-config</command> pour localiser les dépendances.</para>
     </listitem>
 
     <listitem>
-      <para>Procps</para>
+      <para>Procps-ng</para>
       <para>Fournit un certain nombre de petits outils simples qui donnent des 
       informations sur le système de fichiers <filename class="directory">/proc</filename>.</para>
     </listitem>
@@ -337,12 +384,6 @@
     </listitem>
 
     <listitem>
-      <para>Rsyslog</para>
-      <para>Rsyslog est un syslogd multi-threadé amélioré qui supporte
-      plusieurs fondations avec très peu de dépendances. Il fournit un programme
-      qui enregistre divers événements systèmes dans les fichiers de
-      <filename class="directory">/var/log</filename>.</para>
-    </listitem>
 
     <listitem>
       <para>Sed</para>
@@ -357,9 +398,9 @@
     </listitem>
 
     <listitem>
-      <para>Sysvinit</para>
-      <para>Sysvinit est le démon d'initialisation avec lequel fonctionnent les
-      scripts de démarrage écrits pour clfs.</para>
+      <para>Systemd</para>
+      <para>Systemd offre un démon d'initialisation du système, tandis qu'Udev
+      crée dynamiquement des nœuds de périphériques.</para>
     </listitem>
 
     <listitem>
@@ -380,11 +421,6 @@
       de nombreux paquets CLFS.</para>
     </listitem>
 
-    <listitem>
-      <para>Eudev</para>
-      <para>Le paquet Eudev contient des programmes de création dynamiques de
-      nœuds de périphériques.</para>
-    </listitem>
 
     <listitem>
       <para>Util-linux</para>
@@ -401,7 +437,11 @@
     </listitem>
 
     <listitem>
-      <para>XZ-Utils</para>
+      <para>XML::Parser</para>
+      <para>Ce module Perl est exigé par Intltool.</para>
+    </listitem>
+    <listitem>
+      <para>XZ Utils</para>
  
       <para>Sert à compresser des fichiers pour diminuer leur taille. Nécessaire
       aussi pour décompresser des archives tar de nombreux paquets CLFS</para>

Modified: trunk/clfs/boot/64/createfiles.xml
===================================================================
--- trunk/clfs/boot/64/createfiles.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/64/createfiles.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -11,23 +11,31 @@
   <?dbhtml filename="createfiles.html"?>
 
   <title>Créer les liens symboliques</title>
-  
-  <para os="a">Certains programmes utilisent des chemins liés en dur à des programmes qui n'existent pas encore. Afin de satisfaire ces 
-  programmes, créez un certain nombre de liens symboliques qui seront remplacés par des fichiers réels tout au long du chapitre suivant 
-  après que les logiciels ont été installés.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv bash ${CLFS}/bin/sh
-ln -sv ../run ${CLFS}/var/run</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <para os="b">Pour activer certains tests C++ à relier dans les suites  de test  de Glibc et de binutils, créez un répertoire et un
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <para os="f">Pour activer certains tests C++ à relier dans les suites  de test  de Glibc et de binutils, créez un répertoire et un
   certain nombre de liens symboliques :</para>
 
-<screen><userinput>mkdir -pv ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib64</userinput></screen>
+<screen os="g"><userinput>mkdir -pv ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib64</userinput></screen>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
 </sect1>

Deleted: trunk/clfs/boot/64/e2fsprogs.xml
===================================================================
--- trunk/clfs/boot/64/e2fsprogs.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/64/e2fsprogs.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation d'E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
-  ../configure --prefix=/tools --enable-elf-shlibs \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-libblkid --disable-libuuid --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/clfs/boot/64/eudev.xml
===================================================================
--- trunk/clfs/boot/64/eudev.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/64/eudev.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-eudev" role="wrap">
-  <?dbhtml filename="eudev.html"?>
-
-  <title>Eudev-&eudev-version;</title>
-
-  <indexterm zone="ch-boot-eudev">
-    <primary sortas="a-Eudev">eudev</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/eudev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation d'Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
-    --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin --libdir=/lib64 \
-    --disable-introspection --disable-gtk-doc-html --disable-gudev \
-    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
-
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-eudev" role="."/></para>
-
-  </sect2>
-
-</sect1>

Added: trunk/clfs/boot/64/flags.xml
===================================================================
--- trunk/clfs/boot/64/flags.xml	                        (rev 0)
+++ trunk/clfs/boot/64/flags.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-flags">
+  <?dbhtml filename="flags.html"?>
+
+  <title>Drapeaux de construction</title>
+
+  <para>Il va nous falloir copier nos variables de construction dans notre
+  nouveau système :</para>
+
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile</userinput></screen>
+
+</sect1>

Deleted: trunk/clfs/boot/64/grub-build.xml
===================================================================
--- trunk/clfs/boot/64/grub-build.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/64/grub-build.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub-build" role="wrap">
-  <?dbhtml filename="grub-build.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-boot-grub-build">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-grub" role="."/></para>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/clfs/boot/64/shadow.xml
===================================================================
--- trunk/clfs/boot/64/shadow.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/64/shadow.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-shadow" role="wrap">
-  <?dbhtml filename="shadow.html"?>
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="ch-boot-shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/shadow.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de Shadow</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc</userinput></screen>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
- 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-shadow" role="."/></para>
-  </sect2>
-
-</sect1>

Deleted: trunk/clfs/boot/64/util-linux.xml
===================================================================
--- trunk/clfs/boot/64/util-linux.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/64/util-linux.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="ch-boot-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation d'Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= \
-  ./configure --prefix=/tools --exec-prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>

Added: trunk/clfs/boot/common/bc.xml
===================================================================
--- trunk/clfs/boot/common/bc.xml	                        (rev 0)
+++ trunk/clfs/boot/common/bc.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-bc">
+  <?dbhtml filename="bc.html"?>
+
+  <title>Bc-&bc-version;</title>
+
+  <indexterm zone="ch-boot-bc">
+    <primary sortas="a-Bc">Bc</primary>
+    <secondary>boot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/common/bc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation de Bc</title>
+
+    <para>Nous allons installer un programme <command>bc</command> qui peut
+    s'exécuter sur le szstème hôte car il est nécessaire pour compiler le noyau.</para>
+
+    <para>Préparez la compilation de Bc :</para>
+
+<screen><userinput>CC=gcc ./configure --prefix=/cross-tools</userinput></screen>
+
+    <variablelist>
+      <title>Voici la signification de l'option de configuration :</title>
+
+      <varlistentry>
+        <term><parameter>CC=gcc</parameter></term>
+        <listitem>
+          <para>Cela garantit qu'on utilise le compilateur de l'hôte pour
+          construire Bc, vu que nous avons besoin qu'il se lance sur le système hôte.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>Compilez le paquet :</para>
+
+<screen><userinput>make</userinput></screen>
+
+    <para>Installez le paquet :</para>
+
+<screen><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont situés dans <xref
+    linkend="contents-bc" role="."/></para>
+
+  </sect2>
+
+</sect1>

Added: trunk/clfs/boot/common/boot-scripts.xml
===================================================================
--- trunk/clfs/boot/common/boot-scripts.xml	                        (rev 0)
+++ trunk/clfs/boot/common/boot-scripts.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-boot-scripts" role="wrap">
+  <?dbhtml filename="boot-scripts.html"?>
+
+  <title>Boot-scripts for CLFS &boot-scripts-clfs-version;</title>
+
+  <indexterm zone="ch-boot-boot-scripts">
+    <primary sortas="a-Boot-scripts">Boot-scripts</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Le paquet Boot-scripts contient un ensemble de scripts pour d©marrer/arrêter
+    le système CLFS lors de l'amorçage/extinction.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation de Boot-scripts</title>
+
+    <para os="a">Installez le paquet :</para>
+
+<screen os="b"><userinput>make DESTDIR=/tools install-boot-scripts</userinput></screen>
+
+  <para os="c">Le script <command>setclock</command> lit l'heure à partir de
+  l'horloge matérielle, appelée aussi du BIOS ou horloge Complementary Metal Oxide
+  Semiconductor (CMOS). Si l'horloge matérielle est en UTC, ce
+  script convertira l'heure de l'horloge matérielle en heure locale en utilisant
+  le fichier <filename>/tools/etc/sysconfig/clock</filename> ;qui dit au programme
+  <command>hwclock</command> le fuseau horaire de l'utilisateur). Il n'existe
+  aucun moyen de savoir si l'horloge matérielle est en UTC, vous devez le configurer
+  à la main.</para>
+
+
+
+  <para os="d">Si vous ne savez pas si votre horloge matérielle est en UTC,
+  vous pouvez le savoir après le démarrage de la nouvelle machine en lançant 
+  la commande <userinput>hwclock --localtime  --show</userinput> et si nécessaire,
+  en éditant le fichier <filename>/tools/etc/sysconfig/clock</filename>. Dans le
+  pire des cas si vous devinez mal les choses, l'heure affichée sera fausse.</para>
+
+  <para os="e">Passez la valeur de la variable <envar>UTC</envar> ci-dessous
+  à <option>0</option> (zéro) si l'horloge matérielle <emphasis>n'est pas</emphasis> 
+  en UTC.</para>
+
+<screen os="f"><userinput>cat > /tools/etc/sysconfig/clock << "EOF"
+<literal># Début de /tools/etc/sysconfig/clock
+
+UTC=1
+
+# Fin de /tools/etc/sysconfig/clock</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-boot-scripts" role="content">
+    <title>Contenu de Boot-scripts</title>
+
+    <segmentedlist>
+      <segtitle>Scripts installés</segtitle>
+
+      <seglistitem>
+        <seg>checkfs, cleanfs, functions, halt, localnet, mountfs, mountkernfs,
+        rc, reboot, sendsignals, setclock, swap, et udev.</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="checkfs-boot-scripts">
+        <term><command>checkfs</command></term>
+        <listitem>
+          <para>Vérifie l'intégrité des systèmes de fichiers avant qu'ils soient
+          montés (sauf les systèmes de fichiers journalisés ou en réseau)</para>
+          <indexterm zone="ch-boot-boot-scripts checkfs-boot-scripts">
+            <primary sortas="d-checkfs">checkfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cleanfs-boot-scripts">
+        <term><command>cleanfs</command></term>
+        <listitem>
+          <para>Supprime les fichiers à ne pas ga!der entre deux démarrages comme
+          ceux dans <filename class="directory">/run/</filename>
+          et <filename class="directory">/var/lock/</filename> ; il recrée
+          <filename>/run/utmp</filename> et supprime les fichiers
+          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>,
+          et <filename>/forcefsck</filename> qui peuvent être présents</para>
+          <indexterm zone="ch-boot-boot-scripts cleanfs-boot-scripts">
+            <primary sortas="d-cleanfs">cleanfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="functions-boot-scripts">
+        <term><command>functions</command></term>
+        <listitem>
+          <para>Contient les fonctions communes comme celle de vérification des
+          erreur et de l'état, utilisés par plusieurs scripts de démarrage</para>
+          <indexterm zone="ch-boot-boot-scripts functions-boot-scripts">
+            <primary sortas="d-functions">functions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="halt-boot-scripts">
+        <term><command>halt</command></term>
+        <listitem>
+          <para>Arrête le système</para>
+          <indexterm zone="ch-boot-boot-scripts halt-boot-scripts">
+            <primary sortas="d-halt">halt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="localnet-boot-scripts">
+        <term><command>localnet</command></term>
+        <listitem>
+          <para>Définit le nom d'hôte et le périphérique de boucle locale du
+          du système</para>
+          <indexterm zone="ch-boot-boot-scripts localnet-boot-scripts">
+            <primary sortas="d-localnet">localnet</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountfs-boot-scripts">
+        <term><command>mountfs</command></term>
+        <listitem>
+          <para>Monte tous les systèmes de fichiers, sauf ceux indiqués
+          <emphasis>noauto</emphasis> ou basés sur le réseau</para>
+          <indexterm zone="ch-boot-boot-scripts mountfs-boot-scripts">
+            <primary sortas="d-mountfs">mountfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountkernfs-boot-scripts">
+        <term><command>mountkernfs</command></term>
+        <listitem>
+          <para>Monte les systèmes de fichiers virtuels du noyau tels que
+          <systemitem class="filesystem">proc</systemitem></para>
+          <indexterm zone="ch-boot-boot-scripts mountkernfs-boot-scripts">
+            <primary sortas="d-mountkernfs">mountkernfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rc-boot-scripts">
+        <term><command>rc</command></term>
+        <listitem>
+          <para>Script principal de contrôle du niveau d'exécution ; 
+          responsable du lancement de chaque script de démarrage, un par un,
+          au sein d'une séquence déterminée par le nom des liens symboliques</para>
+          <indexterm zone="ch-boot-boot-scripts rc-boot-scripts">
+            <primary sortas="d-rc">rc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="reboot-boot-scripts">
+        <term><command>reboot</command></term>
+        <listitem>
+          <para>Relance le système</para>
+          <indexterm zone="ch-boot-boot-scripts reboot-boot-scripts">
+            <primary sortas="d-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sendsignals-boot-scripts">
+        <term><command>sendsignals</command></term>
+        <listitem>
+          <para>S'assure que tous les processus sont terminés avant de relancer
+          ou d'arrêter le système</para>
+          <indexterm zone="ch-boot-boot-scripts sendsignals-boot-scripts">
+            <primary sortas="d-sendsignals">sendsignals</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setclock-boot-scripts">
+        <term><command>setclock</command></term>
+        <listitem>
+          <para>Réinitialise l'horloge du noyau sur vheu!e locale si l'horloge
+          matérielle n'est pas en UTC</para>
+          <indexterm zone="ch-boot-boot-scripts setclock-boot-scripts">
+            <primary sortas="d-setclock">setclock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swap-boot-scripts">
+        <term><command>swap</command></term>
+        <listitem>
+          <para>Active et désactive les fichiers et les partitions d'échange</para>
+          <indexterm zone="ch-boot-boot-scripts swap-boot-scripts">
+            <primary sortas="d-swap">swap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="eudev-boot-scripts">
+        <term><command>udev</command></term>
+        <listitem>
+          <para>Démarre et arrête le démon Eudev</para>
+          <indexterm zone="ch-boot-boot-scripts eudev-boot-scripts">
+            <primary sortas="d-eudev">udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Deleted: trunk/clfs/boot/common/bootscripts.xml
===================================================================
--- trunk/clfs/boot/common/bootscripts.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/common/bootscripts.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-boot" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>Scripts de démarrage pour CLFS &bootscripts-clfs-version;</title>
-
-  <indexterm zone="ch-scripts-boot">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootscripts/common/bootscripts.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation des scripts de démarrage</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootscripts/common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootscripts/common/setclock.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="c">Si vous ne savez pas si l'heure du système est configurée ou non sur UTC, vous pouvez le trouver avoir après 
-    démarré la nouvelle machine en lançant la commande 
-    <userinput>hwclock --localtime  --show</userinput> et, si nécessaire, en éditant le script
-    <filename>/etc/sysconfig/clock</filename>. Le pire qui pourrait se produire si vous vous trompez de diagnostique ici 
-    serait que l'heure affichée soit fausse.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootscripts/common/setclock.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat > ${CLFS}/etc/sysconfig/clock << "EOF"
-<literal># Début de /etc/sysconfig/clock
-
-UTC=1
-
-# Fin de /etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Les détails sur ce paquet sont situés dans <xref
-  linkend="contents-bootscripts" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/clfs/boot/common/changingowner.xml
===================================================================
--- trunk/clfs/boot/common/changingowner.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/boot/common/changingowner.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -10,18 +10,30 @@
 
   <title>Changer de propriétaire</title>
 
-  <para os="a">Actuellement, le répertoire <filename class="directory">${CLFS}</filename> et tous ses sous-répertoires 
-  appartiennent à l'utilisateur <systemitem class="username">clfs</systemitem>, un utilisateur qui n'existe que sur le système 
-  hôte. Pour des raisons de sécurité, le répertoire racine ${CLFS} et tous ses sous-répertoires devraient appartenir à
-  <systemitem class="username">root</systemitem>. Changez le propriétaire de ${CLFS} et de ses sous-répertoires en lançant cette 
-  commande :</para>
+  <para os="a">Actuellement, les répertoires <filename class="directory">/tools</filename>
+  et <filename class="directory">/cross-tools</filename> appartiennent à l'utilisateur
+  <emphasis>clfs</emphasis>, un utilisateur qui
+  n'existe que sur le système hôte. Bien que vous puissiez effacer <filename
+  class="directory">/tools</filename> et <filename
+  class="directory">/cross-tools</filename> une fois fini le système CLFS,
+  vous pouvez les garder pour construire d'autres systèmes CLFS. Si vous gardez
+  ainsi les répertoires <filename class="directory">/tools</filename>
+  et <filename class="directory">/cross-tools</filename>, les fichiers
+  appartiennent à un ID utilisateur sans compse correspondant. C'est dangereux
+  car un compte utilisateur créé plus tard pourrait avoir cet ID utilisateur
+  et posséder ces répertoires et tous les fichiers qu'ils contiennent, exposant
+  ainsi ceux-ci à des manipulations malveillantes.</para>
 
-<screen os="b"><userinput>chown -Rv &uid-root;:&gid-root; ${CLFS}</userinput></screen>
+  <para os="b">Une correction possible de ce problème pourrait être d'ajouter
+  l'utilisateur <systemitem class="username">clfs</systemitem> au nouveau système
+  CLFS plus tard, lors de la création du fichier <filename>/etc/passwd</filename> 
+  en prenant soin d'y affecter les mêmes IDs de groupe et d'utilisateur que sur
+  le système hôte. Sinon, affectez aussi le contenu des répertoires <filename class="directory">/tools</filename>
+  et <filename class="directory">/cross-tools</filename> à l'utilisateur
+  user <systemitem class="username">root</systemitem> en lançant
+  les commandes suivantes :</para>
 
-  <para>Les fichiers suivants doivent appartenir au groupe
-  <systemitem class="username">utmp</systemitem> et non à
-  <systemitem class="username">root</systemitem>.</para>
+<screen os="c"><userinput>chown -Rv 0:0 ${CLFS}/tools
+chown -Rv 0:0 ${CLFS}/cross-tools</userinput></screen>
 
-<screen><userinput>chgrp -v &gid-utmp; ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog</userinput></screen>
-
 </sect1>

Modified: trunk/clfs/final-system/common/introduction.xml
===================================================================
--- trunk/clfs/final-system/common/introduction.xml	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/final-system/common/introduction.xml	2014-10-04 15:07:11 UTC (rev 6574)
@@ -23,7 +23,7 @@
 
   <para os="b">En utilisant les optimisations du compilateur, merci de lire l'astuce 
   sur l'optimisation sur
-  <ulink url="http://lfs.traduc.org/view/astuces/optimization-fr.txt"/>. Les optimisations du
+  <ulink url="http://www.fr.linuxfromscratch.org/view/astuces/optimization-fr.txt"/>. Les optimisations du
   compilateur peuvent faire qu'un programme s'exécute un peu plus rapidement mais
   elles peuvent aussi causer des difficultés et des problèmes de compilation
   à l'exécution de ce programme.

Modified: trunk/clfs/general.ent
===================================================================
--- trunk/clfs/general.ent	2014-10-03 19:54:40 UTC (rev 6573)
+++ trunk/clfs/general.ent	2014-10-04 15:07:11 UTC (rev 6574)
@@ -2,7 +2,7 @@
 
 <!ENTITY month "03"> <!-- Use two digits -->
 <!ENTITY month_name "mars">
-<!ENTITY day "02"> <!-- Use two digits -->
+<!ENTITY day "14"> <!-- Use two digits -->
 <!ENTITY year "2014"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

Added: trunk/clfs/maj
===================================================================
--- trunk/clfs/maj	                        (rev 0)
+++ trunk/clfs/maj	2014-10-04 15:07:11 UTC (rev 6574)
@@ -0,0 +1,19319 @@
+diff -ru /home/jp/a/BOOK/boot/common/createfiles.xml BOOK/boot/common/createfiles.xml
+--- /home/jp/a/BOOK/boot/common/createfiles.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/createfiles.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -10,17 +10,142 @@
+ 
+   <title>Creating Essential Symlinks</title>
+ 
+-  <para os="a">Some programs use hard-wired paths to programs which do not exist
++  <para os="a">Some programs use hard-wired paths to files which do not exist
+   yet. In order to satisfy these programs, create a number of symbolic
+   links which will be replaced by real files throughout the course of
+   the next chapter after the software has been installed.</para>
+ 
+-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
+-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
++<screen os="b"><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
+ ln -sv /tools/bin/file ${CLFS}/usr/bin
+ ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
++ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
++sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
+ ln -sv bash ${CLFS}/bin/sh
+-ln -sv /run ${CLFS}/var/run</userinput></screen>
++ln -sv /tools/sbin/init ${CLFS}/sbin
++ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
++
++  <variablelist os="c">
++    <title>The purpose of each link:</title>
++
++    <varlistentry os="c1">
++      <term><parameter><filename>/bin/bash</filename></parameter></term>
++      <listitem>
++        <para>Many <command>bash</command> scripts specify
++        <filename>/bin/bash</filename>.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c2">
++      <term><parameter><filename>/bin/cat</filename></parameter></term>
++      <listitem>
++        <para>This pathname is hard-coded into Glibc's configure script.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c3">
++      <term><parameter><filename>/bin/echo</filename></parameter></term>
++      <listitem>
++        <para>This is to satisfy one of the tests in Glibc's test suite, which
++        expects <filename>/bin/echo</filename>.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c4">
++      <term><parameter><filename>/bin/grep</filename></parameter></term>
++      <listitem>
++        <para>This to avoid a hard-coded
++        <filename class="directory">/tools</filename> reference in Libtool.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c5">
++      <term><parameter><filename>/bin/login</filename></parameter></term>
++      <listitem>
++        <para>The <command>agetty</command> program expects to find
++        <command>login</command> in <filename class="directory">/bin</filename>.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c6">
++      <term><parameter><filename>/bin/pwd</filename></parameter></term>
++      <listitem>
++        <para>Some <command>configure</command> scripts, particularly Glibc's,
++        have this pathname hard-coded.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c7">
++      <term><parameter><filename>/bin/stty</filename></parameter></term>
++      <listitem>
++        <para>This pathname is hard-coded into Expect, therefore it is needed
++        for Binutils and GCC test suites to pass.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c8">
++      <term><parameter><filename>/usr/bin/file</filename></parameter></term>
++      <listitem>
++        <para>Binutils' <command>configure</command> scripts specify this
++        command location.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c9">
++      <term><parameter><filename>/usr/lib/libgcc_s.so{,.1}</filename></parameter></term>
++      <listitem>
++        <para>Glibc needs this for the pthreads library to work.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c10">
++      <term><parameter><filename>/usr/lib/libstdc++{,.6}</filename></parameter></term>
++      <listitem>
++        <para>This is needed by several tests in Glibc's test suite, as well as
++        for C++ support in GMP.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c11">
++      <term><parameter><filename>/usr/lib/libstdc++.la</filename></parameter></term>
++      <listitem>
++        <para>This prevents a <filename class="directory">/tools</filename>
++        reference that would otherwise be in
++        <filename>/usr/lib/libstdc++.la</filename> after GCC is installed.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c12">
++      <term><parameter><filename>/bin/sh</filename></parameter></term>
++      <listitem>
++        <para>Many shell scripts hard-code <filename>/bin/sh</filename>.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c13">
++      <term><parameter><filename>/sbin/init</filename></parameter></term>
++      <listitem>
++        <para>This is where the kernel expects to find <command>init</command>.</para>
++      </listitem>
++    </varlistentry>
++
++    <varlistentry os="c14">
++      <term><parameter><filename>/etc/{login.{access,defs},limits}</filename></parameter></term>
++      <listitem>
++        <para>These are configuration files used by Shadow and are expected to
++        be found in <filename class="directory">/etc</filename>, for programs
++        such as <command>login</command> and <command>su</command> to work.</para>
++      </listitem>
++    </varlistentry>
++
++  </variablelist>
++
++  <para os="d">Historically, Linux maintains a list of the mounted file systems
++  in the file <filename>/etc/mtab</filename>. Modern kernels maintain this list
++  internally and expose it to the user via the
++  <filename class="directory">/proc</filename> filesystem. To satisfy utilities
++  that expect the presence of <filename>/etc/mtab</filename>, create the
++  following symbolic link:</para>
++
++<screen os="e"><userinput>ln -sv /proc/self/mounts ${CLFS}/etc/mtab</userinput></screen>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/common/creatingdirs.xml BOOK/boot/common/creatingdirs.xml
+--- /home/jp/a/BOOK/boot/common/creatingdirs.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/creatingdirs.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -10,30 +10,36 @@
+ 
+   <title>Creating Directories</title>
+ 
+-  <para os="a">It is time to create some structure in the CLFS file system. Create a
++    <note os="a">
++      <para>The commands in the remainder of the book should be run as
++      the <systemitem class="username">root</systemitem> user. Check
++      that ${CLFS} is set in the
++      <systemitem class="username">root</systemitem> user’s environment
++       before proceeding.</para>
++    </note>
++
++  <para os="b">It is time to create some structure in the CLFS file system. Create a
+   standard directory tree by issuing the following commands:</para>
+ 
+-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
++<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib/firmware,mnt}
+ mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
+ mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
+ mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
+ install -dv -m 0750 ${CLFS}/root
+ install -dv -m 1777 ${CLFS}{/var,}/tmp
++ln -sv ../run ${CLFS}/var/run
+ mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib,sbin,src}
+ mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
+ mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
+-for dir in ${CLFS}/usr{,/local}; do
+-  ln -sv share/{man,doc,info} $dir
+-done</userinput></screen>
++mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}</userinput></screen>
+ 
+-  <para os="c">Directories are, by default, created with permission mode 755,
++  <para os="d">Directories are, by default, created with permission mode 755,
+   but this is not desirable for all directories. In the commands above,
+   two changes are made—one to the home directory of user
+   <systemitem class="username">root</systemitem>, and another to the
+   directories for temporary files.</para>
+ 
+-  <para os="d">The first mode change ensures that not just anybody can enter
++  <para os="e">The first mode change ensures that not just anybody can enter
+   the <filename class="directory">/root</filename> directory—the
+   same as a normal user would do with his or her home directory. The
+   second mode change makes sure that any user can write to the
+@@ -43,7 +49,7 @@
+   by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
+   1777 bit mask.</para>
+ 
+-  <sect2 os="e">
++  <sect2 os="f">
+     <title>FHS Compliance Note</title>
+ 
+     <para>The directory tree is based on the Filesystem Hierarchy Standard
+diff -ru /home/jp/a/BOOK/boot/common/devices.xml BOOK/boot/common/devices.xml
+--- /home/jp/a/BOOK/boot/common/devices.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/devices.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -12,19 +12,12 @@
+ 
+   <indexterm zone="ch-boot-devices">
+     <primary sortas="e-/dev/*">/dev/*</primary>
++    <secondary>boot</secondary>
+   </indexterm>
+ 
+   <sect2>
+     <title>Creating Initial Device Nodes</title>
+ 
+-    <note os="a">
+-      <para>The commands in the remainder of the book should be run as
+-      the <systemitem class="username">root</systemitem> user. Check 
+-      that ${CLFS} is set in the 
+-      <systemitem class="username">root</systemitem> user’s environment
+-       before proceeding.</para>
+-    </note>
+-
+     <para os="b">When the kernel boots the system, it requires the presence
+     of a few device nodes, in particular the <filename
+     class="devicefile">console</filename> and <filename
+@@ -35,16 +28,8 @@
+     <filename class="devicefile">console</filename>). Create these by running
+     the following commands:</para>
+ 
+-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
+-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
+-
+-    <para>Before udev starts, a tmpfs filesystem is mounted over
+-    <filename class="directory">/dev</filename> and the previous entries are
+-    no longer available. The following command creates files that are copied
+-    over by the udev bootscript:</para>
+-
+-<screen><userinput>mknod -m 600 ${CLFS}/lib/udev/devices/console c 5 1
+-mknod -m 666 ${CLFS}/lib/udev/devices/null c 1 3</userinput></screen>
++<screen><userinput>mknod -m 0600 ${CLFS}/dev/console c 5 1
++mknod -m 0666 ${CLFS}/dev/null c 1 3</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/common/e2fsprogs.xml BOOK/boot/common/e2fsprogs.xml
+--- /home/jp/a/BOOK/boot/common/e2fsprogs.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/e2fsprogs.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -34,8 +34,7 @@
+     href="../../final-system/common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="aa"><userinput>PKG_CONFIG=true \
+-  ../configure --prefix=/tools \
++<screen os="aa"><userinput>../configure --prefix=/tools \
+     --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+     --disable-libblkid --disable-libuuid --disable-fsck \
+     --disable-uuidd</userinput></screen>
+@@ -47,14 +46,19 @@
+       href="../../final-system/common/e2fsprogs.xml"
+       xpointer="xpointer(//*[@os='e2'])"/>
+ 
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../final-system/common/e2fsprogs.xml"
++      xpointer="xpointer(//*[@os='e3'])"/>
++
+     </variablelist>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/common/e2fsprogs.xml"
++    xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/e2fsprogs.xml"
+@@ -72,11 +76,6 @@
+     href="../../final-system/common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+-    <para os="ad">Create needed symlinks for a bootable system:</para>
+-
+-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin</userinput></screen>
+-
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/boot/common/eudev.xml BOOK/boot/common/eudev.xml
+--- /home/jp/a/BOOK/boot/common/eudev.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/eudev.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -12,64 +12,293 @@
+ 
+   <indexterm zone="ch-boot-eudev">
+     <primary sortas="a-Eudev">Eudev</primary>
+-    <secondary>boot</secondary>
+   </indexterm>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../../final-system/common/eudev.xml"
+-  xpointer="xpointer(//*[@role='package'])"/>
++  <sect2 role="package">
++    <title/>
+ 
+-  <sect2 role="installation">
+-    <title>Installation of Eudev</title>
++    <para>The Eudev package contains programs for dynamic creation of device
++    nodes.</para>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
+-    xpointer="xpointer(//*[@os='a'])"/>
+-
+-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+-LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/usr \
+-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+-    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+-    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/usr/lib \
+-    --with-rootlibdir=/lib --disable-introspection --disable-gtk-doc-html \
+-    --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
+-    --enable-libkmod</userinput></screen>
++  </sect2>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
+-    xpointer="xpointer(//*[@os='c'])"/>
++  <sect2 role="installation">
++    <title>Installation of Eudev</title>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
+-    xpointer="xpointer(//*[@os='d'])"/>
++   <para os="a">Prepare Eudev for compilation:</para>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
+-    xpointer="xpointer(//*[@os='g'])"/>
++<screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
++    --disable-introspection --disable-gtk-doc-html \
++    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
++    --enable-libkmod</userinput></screen>
+ 
+-<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
++    <variablelist os="b1">
++      <title>The meaning of the new configure options:</title>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
++      <varlistentry>
++        <term><parameter>--disable-introspection --disable-gtk-doc-html
++        --disable-gudev --disable-keymap</parameter></term>
++        <listitem>
++          <para>These switches disable several features which are not needed
++          for the temporary system and have additional dependencies.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term><parameter>--with-firmware-path=/tools/lib/firmware</parameter></term>
++        <listitem>
++          <para>This allows Eudev to load firmware from
++          <filename class="directory">/tools/lib/firmware</filename> instead of
++          the default location of <filename class="directory">/lib/firmware</filename>.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term><parameter>--enable-libkmod</parameter></term>
++        <listitem>
++          <para>Allows Eudev to load modules by using
++          <filename class="libraryfile">libkmod</filename> directly.</para>
++        </listitem>
++      </varlistentry>
++
++    </variablelist>
++
++    <para os="c">Compile the package:</para>
++
++<screen os="d"><userinput>make</userinput></screen>
++
++    <para os="g">Install the package:</para>
++
++<screen os="j"><userinput>make install</userinput></screen>
++
++    <para os="i">Create a directory for storing firmware that can be
++    loaded by <command>udev</command>:</para>
+ 
+-<screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
++<screen os="k"><userinput>install -dv /tools/lib/firmware</userinput></screen>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
+-    xpointer="xpointer(//*[@os='r1'])"/>
++    <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
+ 
+-<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
+-> ${CLFS}/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
++<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" > \
++    /tools/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
+ 
+  </sect2>
+ 
+-  <sect2 role="content">
+-    <title/>
++  <sect2 id="contents-eudev" role="content">
++    <title>Contents of Eudev</title>
+ 
+-    <para>Details on this package are located in <xref
+-    linkend="contents-eudev" role="."/></para>
++    <segmentedlist>
++      <segtitle>Installed programs</segtitle>
++      <segtitle>Installed library</segtitle>
++      <segtitle>Installed directories</segtitle>
++
++      <seglistitem>
++        <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
++        firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
++        v4l_id, write_cd_rules, write_net_rules</seg>
++        <seg>libudev</seg>
++        <seg>/tools/etc/udev, /tools/lib/firmware, /tools/lib/udev</seg>
++      </seglistitem>
++    </segmentedlist>
++
++    <variablelist>
++      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
++      <?dbfo list-presentation="list"?>
++      <?dbhtml list-presentation="table"?>
++
++      <varlistentry id="udevadm-eudev">
++        <term><command>udevadm</command></term>
++        <listitem>
++        <para>Controls the runtime behavior of Eudev, requests kernel
++        events, manages the event queue, and provides simple debugging.</para>
++          <indexterm zone="ch-boot-eudev udevadm-eudev">
++            <primary sortas="b-udevadm-eudev">udevadm</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="udevd">
++        <term><command>udevd</command></term>
++        <listitem>
++          <para>A daemon that reorders hotplug events before submitting them to
++          <command>udev</command>,
++          thus avoiding various race conditions</para>
++          <indexterm zone="ch-boot-eudev udevd">
++            <primary sortas="b-udevd">udevd</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++ <!-- Start of Helpers -->
++      <varlistentry id="ata_id">
++        <term><command>ata_id</command></term>
++        <listitem>
++          <para>Provides Eudev with a unique string and additional
++          information (uuid, label) for an ATA drive</para>
++          <indexterm zone="ch-boot-eudev ata_id">
++            <primary sortas="b-ata_id">ata_id</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="cdrom_id">
++        <term><command>cdrom_id</command></term>
++        <listitem>
++          <para>Prints the capabilities of a CDROM or DVDROM drive.</para>
++          <indexterm zone="ch-boot-eudev cdrom_id">
++            <primary sortas="b-cdrom_id">cdrom_id</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="collect">
++        <term><command>collect</command></term>
++        <listitem>
++          <para>Given an ID for the current uevent and a list of IDs
++(for all target uevents), registers the current ID and indicates whether
++all target IDs have been registered.</para>
++          <indexterm zone="ch-boot-eudev collect">
++            <primary sortas="b-collect">collect</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="create_floppy_devices">
++        <term><command>create_floppy_devices</command></term>
++        <listitem>
++          <para>Creates all possible floppy devices based on the CMOS type</para>
++          <indexterm zone="ch-boot-eudev create_floppy_devices">
++            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="edd_id">
++        <term><command>edd_id</command></term>
++        <listitem>
++          <para>Identifies x86 disk drives from Enhanced Disk Drive calls</para>
++          <indexterm zone="ch-boot-eudev edd_id">
++            <primary sortas="b-edd_id">edd_id</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="firmware.sh">
++        <term><command>firmware.sh</command></term>
++        <listitem>
++          <para>Script to load firmware for a device</para>
++          <indexterm zone="ch-boot-eudev firmware.sh">
++            <primary sortas="b-firmware.sh">firmware.sh</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="fstab_import">
++        <term><command>fstab_import</command></term>
++        <listitem>
++          <para>Finds an entry in <filename>/etc/fstab</filename> that matches
++the current device, and provides its information to Udev.</para>
++          <indexterm zone="ch-boot-eudev fstab_import">
++            <primary sortas="b-fstab_import">fstab_import</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="path_id">
++        <term><command>path_id</command></term>
++        <listitem>
++          <para>Provides the shortest possible unique hardware path to a
++          device</para>
++          <indexterm zone="ch-boot-eudev path_id">
++            <primary sortas="b-path_id">path_id</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="scsi_id">
++        <term><command>scsi_id</command></term>
++        <listitem>
++          <para>Retrieves or generates a unique SCSI identifier.</para>
++          <indexterm zone="ch-boot-eudev scsi_id">
++            <primary sortas="b-scsi_id">scsi_id</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="usb_id">
++        <term><command>usb_id</command></term>
++        <listitem>
++          <para>Identifies a USB block device.</para>
++          <indexterm zone="ch-boot-eudev usb_id">
++            <primary sortas="b-usb_id">usb_id</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="v4l_id">
++        <term><command>v4l_id</command></term>
++        <listitem>
++          <para>Determines V4L capabilities for a given device.</para>
++          <indexterm zone="ch-boot-eudev v4l_id">
++            <primary sortas="b-v4l_id">v4l_id</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="write_cd_rules">
++        <term><command>write_cd_rules</command></term>
++        <listitem>
++          <para>A script which generates Eudev rules to provide stable names
++for network interfaces.</para>
++          <indexterm zone="ch-boot-eudev write_cd_rules">
++            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="write_net_rules">
++        <term><command>write_net_rules</command></term>
++        <listitem>
++          <para>A script which generates Eudev rules to provide stable names
++for network interfaces.</para>
++          <indexterm zone="ch-boot-eudev write_net_rules">
++            <primary sortas="b-write_net_rules">write_net_rules</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++<!-- End of Helpers -->
++
++      <varlistentry id="libudev-eudev">
++        <term><filename class="libraryfile">libudev</filename></term>
++        <listitem>
++          <para>A library interface to eudev device information.</para>
++          <indexterm zone="ch-boot-eudev libudev-eudev">
++            <primary sortas="c-libudev-eudev">libudev</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="etc-eudev">
++        <term><filename class="directory">/etc/udev</filename></term>
++        <listitem>
++          <para>Contains <command>udev</command> configuration files,
++          device permissions, and rules for device naming</para>
++          <indexterm zone="ch-boot-eudev etc-eudev">
++            <primary sortas="e-/etc/udev">/etc/udev</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="lib-eudev">
++        <term><filename class="directory">/lib/udev</filename></term>
++        <listitem>
++          <para>Contains <command>udev</command> helper programs
++          and static devices which get copied to /dev when booted.</para>
++          <indexterm zone="ch-boot-eudev lib-eudev">
++            <primary sortas="e-/lib/udev">/lib/udev</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++    </variablelist>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/common/fstab.xml BOOK/boot/common/fstab.xml
+--- /home/jp/a/BOOK/boot/common/fstab.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/fstab.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -12,6 +12,7 @@
+ 
+   <indexterm zone="ch-boot-fstab">
+     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
++    <secondary>boot</secondary>
+   </indexterm>
+ 
+   <para os="a">The <filename>/etc/fstab</filename> file is used by some
+@@ -27,22 +28,24 @@
+ 
+ /dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
+ /dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
+-proc           /proc        proc   defaults         0     0
+-sysfs          /sys         sysfs  defaults         0     0
+ devpts         /dev/pts     devpts gid=&gid-tty;,mode=620   0     0
+ shm            /dev/shm     tmpfs  defaults         0     0
+-tmpfs          /run         tmpfs  defaults         0     0
+-devtmpfs       /dev         devtmpfs mode=0755,nosuid 0     0
+ 
+ # End /etc/fstab</literal>
+ EOF</userinput></screen>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../../bootable/common/fstab.xml"
++  href="../../system-config/common/fstab.xml"
+   xpointer="xpointer(//*[@os='b'])"/>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../../bootable/common/fstab.xml"
+-  xpointer="xpointer(//*[@os='c'])"/>
++  <para os="c">The <filename class="directory">/dev/shm</filename> mount point
++  for <systemitem class="filesystem">tmpfs</systemitem> is included to
++  allow enabling POSIX-shared memory. The kernel must have the required
++  support built into it for this to work (more about this is in the next
++  section). Please note that very little software currently uses
++  POSIX-shared memory.  Therefore, consider the <filename
++  class="directory">/dev/shm</filename> mount point optional. For more
++  information, see <filename>Documentation/filesystems/tmpfs.txt</filename>
++  in the kernel source tree.</para>
+ 
+ </sect1>
+Seulement dans BOOK/boot/common: howtoview.xml
+diff -ru /home/jp/a/BOOK/boot/common/introduction.xml BOOK/boot/common/introduction.xml
+--- /home/jp/a/BOOK/boot/common/introduction.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/introduction.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -14,17 +14,4 @@
+   create a minimal system that will be used to boot the target machine and to
+   build the final system packages.</para>
+ 
+-  <para>There are a few additional packages that will need to be
+-  installed to allow you to boot the minimal system. Some of these
+-  packages will be installed onto root or in /usr on the CLFS
+-  partition (${CLFS}/bin, ${CLFS}/usr/bin, etc...), rather than /tools, using the
+-  "DESTDIR" option with make. This will require the
+-  <systemitem class="username">clfs</systemitem> user to have write access to
+-  the rest of the CLFS partition, so you will need to temporarily change the
+-  ownership of ${CLFS} to the <systemitem class="username">clfs</systemitem> user.
+-  Run the following command as <systemitem
+-  class="username">root</systemitem>:</para>
+-
+-<screen><userinput>chown -v clfs ${CLFS}</userinput></screen>
+-
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/common/kmod.xml BOOK/boot/common/kmod.xml
+--- /home/jp/a/BOOK/boot/common/kmod.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/kmod.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -22,15 +22,33 @@
+   <sect2 role="installation">
+     <title>Installation of Kmod</title>
+ 
++    <para os="s1">The following <command>sed</command> changes Kmod's default
++    module search location to
++    <filename class="directory">/tools/lib/modules</filename>:</para>
++
++<screen os="s2"><userinput>cp -v libkmod/libkmod.c{,.orig}
++sed '/dirname_default_prefix /s@/lib/modules@/tools&@' \
++    libkmod/libkmod.c.orig > libkmod/libkmod.c</userinput></screen>
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/kmod.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
+-zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
+-./configure --prefix=/tools --bindir=/bin \
+-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib \
+-    --disable-manpages</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/tools \
++    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
++
++    <variablelist os="c">
++      <title>The meaning of the new configure options:</title>
++
++      <varlistentry>
++        <term><parameter>--with-zlib --with-xz</parameter></term>
++        <listitem>
++          <para>These allow the Kmod package to handle zlib and XZ
++            compressed kernel modules.</para>
++        </listitem>
++      </varlistentry>
++
++    </variablelist>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/kmod.xml"
+@@ -44,18 +62,16 @@
+     href="../../final-system/common/kmod.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
++<screen os="h"><userinput>make install</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/common/kmod.xml"
++    xpointer="xpointer(//*[@os='i'])"/>
+ 
+-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-href="../../final-system/common/kmod.xml"
+-xpointer="xpointer(//*[@os='i'])"/>
+-
+-<screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
+-ln -sv ../bin/kmod ${CLFS}/sbin/depmod
+-ln -sv ../bin/kmod ${CLFS}/sbin/insmod
+-ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
+-ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
+-ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
++<screen os="j"><userinput>ln -sfv kmod /tools/bin/lsmod
++for tool in depmod insmod modprobe modinfo rmmod; do
++    ln -sv ../bin/kmod /tools/sbin/${tool}
++done</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/common/pwdgroup.xml BOOK/boot/common/pwdgroup.xml
+--- /home/jp/a/BOOK/boot/common/pwdgroup.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/pwdgroup.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -8,30 +8,16 @@
+ <sect1 id="ch-boot-pwdgroup">
+   <?dbhtml filename="pwdgroup.html"?>
+ 
+-  <title>Creating the passwd, group, and log Files</title>
++  <title>Creating the passwd and group Files</title>
+ 
+   <indexterm zone="ch-boot-pwdgroup">
+     <primary sortas="e-/etc/passwd">/etc/passwd</primary>
++    <secondary>boot</secondary>
+   </indexterm>
+ 
+   <indexterm zone="ch-boot-pwdgroup">
+     <primary sortas="e-/etc/group">/etc/group</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-boot-pwdgroup">
+-    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-boot-pwdgroup">
+-    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-boot-pwdgroup">
+-    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-boot-pwdgroup">
+-    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
++    <secondary>boot</secondary>
+   </indexterm>
+ 
+   <para os="a">In order for user <systemitem class="username">root</systemitem> to
+@@ -44,6 +30,10 @@
+ 
+ <screen><userinput>cat > ${CLFS}/etc/passwd << "EOF"
+ <literal>root::&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
++<literal>bin:x:&uid-bin;:&gid-bin;:/bin:/bin/false</literal>
++<literal>daemon:x:&uid-daemon;:&gid-daemon;:/sbin:/bin/false</literal>
++<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
++<literal>nobody:x:&uid-nobody;:&gid-nogroup;:Unprivileged User:/dev/null:/bin/false</literal>
+ EOF</userinput></screen>
+ 
+   <para os="b">The actual password for <systemitem class="username">root</systemitem>
+@@ -51,22 +41,9 @@
+   with no password) will be set later.</para>
+ 
+   <variablelist os="c">
+-  
+-    <title>Additional users you may want to add:</title>
+ 
+-    <varlistentry>
+-      <term><literal>bin:x:&uid-bin;:&gid-bin;:bin:/bin:/bin/false</literal></term>
+-      <listitem>
+-        <para>Can be useful for compatibility with legacy applications.</para>
+-      </listitem>
+-    </varlistentry>
+-    <varlistentry>
+-      <term><literal>daemon:x:&uid-daemon;:&gid-daemon;:daemon:/sbin:/bin/false</literal></term>
+-      <listitem>
+-        <para>It is often recommended to use an unprivileged User ID/Group ID
+-        for daemons to run as, in order to limit their access to the system.</para>
+-      </listitem>
+-    </varlistentry>
++    <title>Additional users you may want to add if not already included:</title>
++
+     <varlistentry>
+       <term><literal>adm:x:&uid-adm;:&gid-adm;:adm:/var/adm:/bin/false</literal></term>
+       <listitem>
+@@ -103,12 +80,6 @@
+         <para>Generally used as an account that receives all the information of troubles with the mail server</para>
+       </listitem>
+     </varlistentry>
+-    <varlistentry>
+-      <term><literal>nobody:x:&uid-nobody;:&gid-nobody;:nobody:/:/bin/false</literal></term>
+-      <listitem>
+-        <para>Used by NFS</para>
+-      </listitem>
+-    </varlistentry>
+   </variablelist>
+ 
+   <para>Create the <filename>${CLFS}/etc/group</filename> file by running
+@@ -130,20 +101,20 @@
+ video:x:&gid-video;:
+ utmp:x:&gid-utmp;:
+ usb:x:&gid-usb;:
+-cdrom:x:&gid-cdrom;:</literal>
++cdrom:x:&gid-cdrom;:
++adm:x:&gid-adm;:
++messagebus:x:&gid-messagebus;:
++systemd-journal:x:&gid-systemd-journal;:
++mail:x:&gid-mail;:
++wheel:x:&gid-wheel;:
++nogroup:x:&gid-nogroup;:</literal>
+ EOF</userinput></screen>
+ 
+   <variablelist os="d">
+ 
+-    <title>Additional groups you may want to add</title>
++    <title>Additional groups you may want to add if not already included:</title>
+ 
+     <varlistentry>
+-      <term><literal>adm:x:&gid-adm;:root,adm,daemon</literal></term>
+-      <listitem>
+-        <para>All users in this group are allowed to do administrative tasks</para>
+-      </listitem>
+-    </varlistentry>
+-    <varlistentry>
+       <term><literal>console:x:&gid-console;:</literal></term>
+       <listitem>
+         <para>This group has direct access to the console</para>
+@@ -156,12 +127,6 @@
+       </listitem>
+     </varlistentry>
+     <varlistentry>
+-      <term><literal>mail:x:&gid-mail;:mail</literal></term>
+-      <listitem>
+-        <para>Used by MTAs (Mail Transport Agents)</para>
+-      </listitem>
+-    </varlistentry>
+-    <varlistentry>
+       <term><literal>news:x:&gid-news;:news</literal></term>
+       <listitem>
+         <para>Used by Network News Servers</para>
+@@ -174,14 +139,7 @@
+       </listitem>
+     </varlistentry>
+     <varlistentry>
+-      <term><literal>nogroup:x:&gid-nogroup;:</literal></term>
+-      <listitem>
+-        <para>This is a default group used by some programs that do not
+-        require a group</para>
+-      </listitem>
+-    </varlistentry>
+-    <varlistentry>
+-      <term><literal>nobody:x:&gid-nobody;:</literal></term>
++      <term><literal>nobody:x:&gid-nogroup;:</literal></term>
+       <listitem>
+         <para>This is used by NFS</para>
+       </listitem>
+@@ -189,7 +147,7 @@
+   </variablelist>
+ 
+   <para os="e">The created groups are not part of any standard—they are
+-  groups decided on in part by the requirements of the Eudev configuration
++  groups decided on in part by the requirements of the Systemd configuration
+   in the final system, and in part by common convention employed by a
+   number of existing Linux distributions. The Linux Standard Base (LSB,
+   available at <ulink url="http://www.linuxbase.org"/>) recommends only
+@@ -199,22 +157,4 @@
+   well-written programs do not depend on GID numbers, but rather use the
+   group's name.</para>
+ 
+-  <para os="f">The <command>login</command>, <command>agetty</command>, and
+-  <command>init</command> programs (and others) use a number of log
+-  files to record information such as who was logged into the system and
+-  when. However, these programs will not write to the log files if they
+-  do not already exist. Initialize the log files and give them
+-  proper permissions:</para>
+-
+-<screen><userinput>touch ${CLFS}/var/run/utmp ${CLFS}/var/log/{btmp,lastlog,wtmp}
+-chmod -v 664 ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog
+-chmod -v 600 ${CLFS}/var/log/btmp</userinput></screen>
+-
+-  <para>The <filename>/var/run/utmp</filename> file records the users
+-  that are currently logged in. The <filename>/var/log/wtmp</filename>
+-  file records all logins and logouts. The
+-  <filename>/var/log/lastlog</filename> file records when
+-  each user last logged in. The <filename>/var/log/btmp</filename> file
+-  records the bad login attempts.</para>
+-
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/common/settingenviron.xml BOOK/boot/common/settingenviron.xml
+--- /home/jp/a/BOOK/boot/common/settingenviron.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/settingenviron.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -11,8 +11,8 @@
+   <title>Setting Up the Environment</title>
+ 
+   <para>The new instance of the shell that will start when the system is booted is a <emphasis>login</emphasis>
+-  shell, which will read <filename>.bash_profile</filename> file. Create the
+-  <filename>.bash_profile</filename> file now:</para>
++  shell, which will read the <filename>.bash_profile</filename> file. Create
++  <filename>.bash_profile</filename> now:</para>
+ 
+ <screen><userinput>cat > ${CLFS}/root/.bash_profile << "EOF"
+ <literal>set +h
+@@ -24,7 +24,7 @@
+ 
+   <para>The <envar>LC_ALL</envar> variable controls the localization of
+   certain programs, making their messages follow the conventions of a
+-  specified country. 
++  specified country.
+   Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
+   (the two are equivalent) ensures that everything will work as expected
+   on your temporary system.</para>
+@@ -34,7 +34,7 @@
+   the end of the standard <envar>PATH</envar>, all the programs installed in
+   <xref linkend="chapter-temp-system"/> are only picked up by the shell
+   if they have not yet been built on the target system. This configuration
+-  forces use of the final system binaries as they are built over the 
++  forces use of the final system binaries as they are built over the
+   temp-system, minimising the chance of final system programs being built
+   against the temp-system.</para>
+ 
+diff -ru /home/jp/a/BOOK/boot/common/shadow.xml BOOK/boot/common/shadow.xml
+--- /home/jp/a/BOOK/boot/common/shadow.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/shadow.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -22,39 +22,37 @@
+   <sect2 role="installation">
+     <title>Installation of Shadow</title>
+ 
+-    <para os="b">Disable the installation of the <command>groups</command>
+-    program, as Coreutils provides a better version:</para>
++    <para os="a">Run the following <command>sed</command> command to disable
++    the installation of the <command>groups</command> and
++    <command>nologin</command> programs, as better versions of these programs
++    are provided by other packages, and prevent Shadow from setting the suid
++    bit on its installed programs:</para>
+ 
+-<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
+-sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
++<screen os="b"><userinput>cp -v src/Makefile.in{,.orig}
++sed -e 's/groups$(EXEEXT) //' \
++    -e 's/= nologin$(EXEEXT)/= /' \
++    -e 's/\(^suidu*bins = \).*/\1/' \
++    src/Makefile.in.orig > src/Makefile.in</userinput></screen>
+ 
+-    <para os="d">Prepare Shadow for compilation:</para>
++    <para os="c">Tell Shadow to use <command>passwd</command> in
++    <filename class="directory">/tools/bin</filename>:</para>
+ 
+-<screen os="e"><userinput>./configure --prefix=/tools \
+-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc</userinput></screen>
++<screen os="d"><userinput>cat > config.cache << "EOF"
++shadow_cv_passwd_dir=/tools/bin
++EOF</userinput></screen>
+ 
+-<para os="f">The meaning of the configure options:</para>
++    <para os="e">Prepare Shadow for compilation:</para>
+ 
+-  <variablelist os="g">
+-    <varlistentry>
+-      <term><parameter>--sysconfdir=/etc</parameter></term>
+-      <listitem><para>Tells Shadow to install its configuration files into
+-      <filename class="directory">/etc</filename>, rather than
+-      <filename class="directory">/tools/etc</filename>.</para></listitem>
+-    </varlistentry>
+-    
+-  </variablelist>
++<screen os="f"><userinput>./configure --prefix=/tools \
++    --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
+ 
++    <para os="g">Compile the package:</para>
+ 
+-    <para os="h">Compile the package:</para>
++<screen os="h"><userinput>make</userinput></screen>
+ 
+-<screen os="i"><userinput>make</userinput></screen>
++    <para os="i">Install the package:</para>
+ 
+-    <para os="j">This package does not come with a test suite.</para>
+-
+-    <para os="k">Install the package:</para>
+-
+-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
++<screen os="j"><userinput>make install</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/common/sysvinit.xml BOOK/boot/common/sysvinit.xml
+--- /home/jp/a/BOOK/boot/common/sysvinit.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/common/sysvinit.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -12,35 +12,33 @@
+ 
+   <indexterm zone="ch-boot-sysvinit">
+     <primary sortas="a-Sysvinit">Sysvinit</primary>
+-    <secondary>boot</secondary>
+   </indexterm>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../../final-system/common/sysvinit.xml"
+-  xpointer="xpointer(//*[@role='package'])"/>
++  <sect2 role="package">
++    <title/>
++
++    <para>The Sysvinit package contains programs for controlling the startup,
++    running, and shutdown of the system.</para>
++
++  </sect2>
+ 
+   <sect2 role="installation">
+     <title>Installation of Sysvinit</title>
+ 
+-    <para os="aa">The following modifications help locate files specific to this
+-    particular build:</para>
++    <para os="p1">Apply a patch to prevent installation of unneeded programs,
++    and allow Sysvinit to be installed in
++    <filename class="directory">/tools</filename>:</para>
++
++<screen os="p2"><userinput>patch -Np1 -i ../sysvinit-&sysvinit-version;-tools_updates-1.patch</userinput></screen>
+ 
+-<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
+-sed -e 's,/usr/lib,/tools/lib,g' \
+-    src/Makefile.orig > src/Makefile</userinput></screen>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/sysvinit.xml"
+-    xpointer="xpointer(//*[@os='c'])"/>
++    <para os ="c">Compile the package:</para>
+ 
+ <screen os="ac"><userinput>make -C src clobber
+ make -C src CC="${CC}"</userinput></screen>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/sysvinit.xml"
+-    xpointer="xpointer(//*[@os='e'])"/>
++   <para os="e">Install the package:</para>
+ 
+-<screen os="ad"><userinput>make -C src ROOT=${CLFS} install</userinput></screen>
++<screen os="ad"><userinput>make -C src ROOT=/tools install</userinput></screen>
+ 
+   </sect2>
+ 
+@@ -49,72 +47,206 @@
+ 
+     <indexterm zone="conf-tools-sysvinit">
+       <primary sortas="a-Sysvinit">Sysvinit</primary>
+-      <secondary>boot, configuring</secondary>
++      <secondary>configuring</secondary>
+     </indexterm>
+ 
+     <indexterm zone="conf-tools-sysvinit">
+       <primary sortas="e-/etc/inittab">/etc/inittab</primary>
+     </indexterm>
+ 
+-    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by running the
++    <para>Create a new file <filename>/tools/etc/inittab</filename> by running the
+     following:</para>
+ 
+-<screen><userinput>cat > ${CLFS}/etc/inittab << "EOF"
+-<literal># Begin /etc/inittab
++<screen><userinput>cat > /tools/etc/inittab << "EOF"
++<literal># Begin /tools/etc/inittab
+ 
+ id:3:initdefault:
+ 
+-si::sysinit:/etc/rc.d/init.d/rc sysinit
++si::sysinit:/tools/etc/rc.d/init.d/rc sysinit
+ 
+-l0:0:wait:/etc/rc.d/init.d/rc 0
+-l1:S1:wait:/etc/rc.d/init.d/rc 1
+-l2:2:wait:/etc/rc.d/init.d/rc 2
+-l3:3:wait:/etc/rc.d/init.d/rc 3
+-l4:4:wait:/etc/rc.d/init.d/rc 4
+-l5:5:wait:/etc/rc.d/init.d/rc 5
+-l6:6:wait:/etc/rc.d/init.d/rc 6
++l0:0:wait:/tools/etc/rc.d/init.d/rc 0
++l1:S1:wait:/tools/etc/rc.d/init.d/rc 1
++l2:2:wait:/tools/etc/rc.d/init.d/rc 2
++l3:3:wait:/tools/etc/rc.d/init.d/rc 3
++l4:4:wait:/tools/etc/rc.d/init.d/rc 4
++l5:5:wait:/tools/etc/rc.d/init.d/rc 5
++l6:6:wait:/tools/etc/rc.d/init.d/rc 6
+ 
+-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
++ca:12345:ctrlaltdel:/tools/sbin/shutdown -t1 -a -r now
+ 
+-su:S016:once:/sbin/sulogin
++su:S016:once:/tools/sbin/sulogin
+ </literal>
+ EOF</userinput></screen>
+ 
+     <para>The following command adds the standard virtual terminals to
+-    <filename>${CLFS}/etc/inittab</filename>. If your system only has a serial
++    <filename>/tools/etc/inittab</filename>. If your system only has a serial
+     console skip the following command:</para>
+ 
+-<screen><userinput>cat >> ${CLFS}/etc/inittab << "EOF"
+-<literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
+-2:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
+-3:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
+-4:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
+-5:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
+-6:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
++<screen><userinput>cat >> /tools/etc/inittab << "EOF"
++<literal>1:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty1 9600
++2:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty2 9600
++3:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty3 9600
++4:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty4 9600
++5:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty5 9600
++6:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty6 9600
+ </literal>
+ EOF</userinput></screen>
+ 
+     <para>If your system has a serial console, run the following command to add
+-    the entry to <filename>${CLFS}/etc/inittab</filename>.</para>
++    the entry to <filename>/tools/etc/inittab</filename>.</para>
+ 
+-<screen><userinput>cat >> ${CLFS}/etc/inittab << "EOF"
+-<literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
++<screen><userinput>cat >> /tools/etc/inittab << "EOF"
++<literal>c0:12345:respawn:/tools/sbin/agetty --noclear 115200 ttyS0 vt100
+ </literal>
+ EOF</userinput></screen>
+ 
+-   <para>Finally, add the end line to <filename>${CLFS}/etc/inittab</filename>.</para>
++   <para>Finally, add the end line to <filename>/tools/etc/inittab</filename>.</para>
+ 
+-<screen><userinput>cat >> ${CLFS}/etc/inittab << "EOF"
+-<literal># End /etc/inittab</literal>
++<screen><userinput>cat >> /tools/etc/inittab << "EOF"
++<literal># End /tools/etc/inittab</literal>
+ EOF</userinput></screen>
+ 
++    <para>The <parameter>-I '\033(K'</parameter> option tells
++    <command>agetty</command> to send this escape sequence to the terminal
++    before doing anything else. This escape sequence switches the console
++    character set to a user-defined one, which can be modified by running
++    the <command>setfont</command> program. Sending this
++    escape sequence is necessary for people who use non-ISO 8859-1 screen
++    fonts, but it does not affect native English speakers.</para>
++
+   </sect2>
+ 
+-  <sect2 role="content">
+-    <title/>
++  <sect2 id="contents-sysvinit" role="content">
++    <title>Contents of Sysvinit</title>
++
++    <segmentedlist>
++      <segtitle>Installed programs</segtitle>
++
++      <seglistitem>
++        <seg>bootlogd, fstab-decode, halt, init, killall5,
++        poweroff (link to halt), reboot (link to halt), runlevel,
++        shutdown, and telinit (link to init)</seg>
++      </seglistitem>
++    </segmentedlist>
++
++    <variablelist>
++      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
++      <?dbfo list-presentation="list"?>
++      <?dbhtml list-presentation="table"?>
++
++      <varlistentry id="bootlogd">
++        <term><command>bootlogd</command></term>
++        <listitem>
++          <para>Logs boot messages to a log file</para>
++          <indexterm zone="ch-boot-sysvinit bootlogd">
++            <primary sortas="b-bootlogd">bootlogd</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="fstab-decode">
++        <term><command>fstab-decode</command></term>
++        <listitem>
++          <para>Runs a command with fstab-encoded arguments</para>
++          <indexterm zone="ch-boot-sysvinit fstab-decode">
++            <primary sortas="b-fstab-decode">fstab-decode</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="halt-sysv">
++        <term><command>halt</command></term>
++        <listitem>
++          <para>Normally invokes <command>shutdown</command> with the
++          <parameter>-h</parameter> option, except when already in run-level 0,
++          then it tells the kernel to halt the system; it notes in the
++          file <filename>/var/log/wtmp</filename> that the system is being
++          brought down</para>
++          <indexterm zone="ch-boot-sysvinit halt-sysv">
++            <primary sortas="b-halt-sysv">halt</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="init-sysv">
++        <term><command>init</command></term>
++        <listitem>
++          <para>The first process to be started when the kernel has initialized
++          the hardware which takes over the boot process and starts all the
++          proceses it is instructed to</para>
++          <indexterm zone="ch-boot-sysvinit init-sysv">
++            <primary sortas="b-init-sysv">init</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="killall5">
++        <term><command>killall5</command></term>
++        <listitem>
++          <para>Sends a signal to all processes, except the processes in its own
++          session so it will not kill the shell running the script that called
++          it</para>
++          <indexterm zone="ch-boot-sysvinit killall5">
++            <primary sortas="b-killall5">killall5</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="poweroff-sysv">
++        <term><command>poweroff</command></term>
++        <listitem>
++          <para>Tells the kernel to halt the system and switch off the computer
++          (see <command>halt</command>)</para>
++          <indexterm zone="ch-boot-sysvinit poweroff-sysv">
++            <primary sortas="b-poweroff-sysv">poweroff</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="reboot-sysv">
++        <term><command>reboot</command></term>
++        <listitem>
++          <para>Tells the kernel to reboot the system (see
++          <command>halt</command>)</para>
++          <indexterm zone="ch-boot-sysvinit reboot-sysv">
++            <primary sortas="b-reboot-sysv">reboot</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="runlevel-sysv">
++        <term><command>runlevel</command></term>
++        <listitem>
++          <para>Reports the previous and the current run-level, as noted in
++          the last run-level record in <filename>/run/utmp</filename></para>
++          <indexterm zone="ch-boot-sysvinit runlevel-sysv">
++            <primary sortas="b-runlevel-sysv">runlevel</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="shutdown-sysv">
++        <term><command>shutdown</command></term>
++        <listitem>
++          <para>Brings the system down in a secure way, signaling all processes
++          and notifying all logged-in users</para>
++          <indexterm zone="ch-boot-sysvinit shutdown-sysv">
++            <primary sortas="b-shutdown-sysv">shutdown</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry id="telinit-sysv">
++        <term><command>telinit</command></term>
++        <listitem>
++          <para>Tells <command>init</command> which run-level to change to</para>
++          <indexterm zone="ch-boot-sysvinit telinit-sysv">
++            <primary sortas="b-telinit-sysv">telinit</primary>
++          </indexterm>
++        </listitem>
++      </varlistentry>
+ 
+-    <para>Details on this package are located in <xref
+-    linkend="contents-sysvinit" role="."/></para>
++    </variablelist>
+ 
+   </sect2>
+ 
+Seulement dans /home/jp/a/BOOK/boot/common: util-linux.xml
+diff -ru /home/jp/a/BOOK/boot/mips/bootloaders.xml BOOK/boot/mips/bootloaders.xml
+--- /home/jp/a/BOOK/boot/mips/bootloaders.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips/bootloaders.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -17,6 +17,6 @@
+   this build method, we recommend to do a netboot. Information about
+   netbooting can be found at the link below.</para>
+ 
+-  <para><ulink url="http://documents.jg555.com/netboot"/></para>
++  <para><ulink url="&hints-root;Category:Netboot"/></para>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/mips/colo-build.xml BOOK/boot/mips/colo-build.xml
+--- /home/jp/a/BOOK/boot/mips/colo-build.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips/colo-build.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -36,6 +36,13 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/mips/colo.xml"
++    xpointer="xpointer(//*[@os='s1'])"/>
++
++<screen os="s2"><userinput>cp -v stage2/Makefile{,.orig}
++sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/mips/colo.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+ <screen os="aa"><userinput>cd tools/elf2rfx
+@@ -47,8 +54,8 @@
+     href="../../final-system/mips/colo.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="ab"><userinput>cp -v chain/colo-chain.elf ${CLFS}/boot/vmlinux
+-gzip -9 ${CLFS}/boot/vmlinux</userinput></screen>
++<screen os="ab"><userinput>cp -v chain/colo-chain.elf /tools/boot/vmlinux
++gzip -9 /tools/boot/vmlinux</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/mips/colo.xml BOOK/boot/mips/colo.xml
+--- /home/jp/a/BOOK/boot/mips/colo.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/mips/colo.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -32,8 +32,8 @@
+ #
+ # load linux
+ #
+-lcd 'Booting &linux-version;...'
+-load vmlinux-&linux-version;.gz
++lcd 'Booting &linux-version2;...'
++load vmlinux-&linux-version2;.gz
+ execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
+ EOF</userinput></screen>
+ 
+diff -ru /home/jp/a/BOOK/boot/mips/creatingdirs.xml BOOK/boot/mips/creatingdirs.xml
+--- /home/jp/a/BOOK/boot/mips/creatingdirs.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips/creatingdirs.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -18,6 +18,10 @@
+   href="../common/creatingdirs.xml"
+   xpointer="xpointer(//*[@os='b'])"/>
+ 
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/creatingdirs.xml"
++  xpointer="xpointer(//*[@os='c'])"/>
++
+    <para>These entries are needed for the RaQ2 bootloader. Only use these
+    if you are utilizing the Colo bootloader:</para>
+ 
+@@ -26,10 +30,6 @@
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='c'])"/>
+-
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../common/creatingdirs.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/boot/mips/kernel.xml BOOK/boot/mips/kernel.xml
+--- /home/jp/a/BOOK/boot/mips/kernel.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/mips/kernel.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -27,10 +27,18 @@
+     xpointer="xpointer(//*[@os='aa'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
++    href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+@@ -60,25 +68,17 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+ <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -88,8 +88,9 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
+-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
++gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/boot/mips64/colo-build.xml BOOK/boot/mips64/colo-build.xml
+--- /home/jp/a/BOOK/boot/mips64/colo-build.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips64/colo-build.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -23,6 +23,10 @@
+     <title>Installation of Colo</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../mips/colo-build.xml"
++    xpointer="xpointer(//*[@os='a'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/mips64/colo.xml"
+     xpointer="xpointer(//*[@os='p1'])"/>
+ 
+@@ -40,16 +44,24 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../mips/colo-build.xml"
+-    xpointer="xpointer(//*[@os='a'])"/>
++    xpointer="xpointer(//*[@os='s1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../mips/colo-build.xml"
++    xpointer="xpointer(//*[@os='s2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../mips/colo-build.xml"
++    xpointer="xpointer(//*[@os='b'])"/>
+ 
+ <screen os="aa"><userinput>cd tools/elf2rfx
+ make CC=gcc
+ cd ../..
+-make CC="${CC} ${BUILD64}" CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
++make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../mips/colo-build.xml"
+-    xpointer="xpointer(//*[@os='b'])"/>
++    xpointer="xpointer(//*[@os='c'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../mips/colo-build.xml"
+diff -ru /home/jp/a/BOOK/boot/mips64/createfiles.xml BOOK/boot/mips64/createfiles.xml
+--- /home/jp/a/BOOK/boot/mips64/createfiles.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips64/createfiles.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -14,16 +14,29 @@
+   href="../common/createfiles.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
++<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
+ ln -sv /tools/bin/file ${CLFS}/usr/bin
+-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
+ ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
+ ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
+-ln -sv /tools/lib32/libstd*so* ${CLFS}/usr/lib32
+-ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
++ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
++ln -sv /tools/lib32/libstdc++.so{.6,} ${CLFS}/usr/lib32
++ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
++sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
+ ln -sv bash ${CLFS}/bin/sh
+-ln -sv ../run ${CLFS}/var/run</userinput></screen>
++ln -sv /tools/sbin/init ${CLFS}/sbin
++ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
++
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/createfiles.xml"
++  xpointer="xpointer(//*[@os='c'])"/>
++
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/createfiles.xml"
++  xpointer="xpointer(//*[@os='d'])"/>
++
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/createfiles.xml"
++  xpointer="xpointer(//*[@os='e'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/mips64/creatingdirs.xml BOOK/boot/mips64/creatingdirs.xml
+--- /home/jp/a/BOOK/boot/mips64/creatingdirs.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips64/creatingdirs.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -20,13 +20,11 @@
+ mkdir -pv ${CLFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
+ install -dv ${CLFS}/root -m 0750
+ install -dv ${CLFS}{/var,}/tmp -m 1777
++ln -sv ../run ${CLFS}/var/run
+ mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,32,64},sbin,src}
+ mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
+ mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+ mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
+-for dir in ${CLFS}/usr{,/local}; do
+-  ln -sv share/{man,doc,info} $dir
+-done
+ install -dv ${CLFS}/usr/lib/locale
+ ln -sv ../lib/locale ${CLFS}/usr/lib32
+ ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
+diff -ru /home/jp/a/BOOK/boot/mips64/kernel.xml BOOK/boot/mips64/kernel.xml
+--- /home/jp/a/BOOK/boot/mips64/kernel.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips64/kernel.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -35,6 +35,14 @@
+     xpointer="xpointer(//*[@os='m1'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+@@ -64,25 +72,17 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+ <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -92,8 +92,9 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
+-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
++gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+Seulement dans /home/jp/a/BOOK/boot: mips64-64
+diff -ru /home/jp/a/BOOK/boot/mips64-64-chapter.xml BOOK/boot/mips64-64-chapter.xml
+--- /home/jp/a/BOOK/boot/mips64-64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/mips64-64-chapter.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -12,24 +12,25 @@
+   <title>If You Are Going to Boot</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/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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="mips64/kernel.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/mips64-chapter.xml BOOK/boot/mips64-chapter.xml
+--- /home/jp/a/BOOK/boot/mips64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/mips64-chapter.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -12,24 +12,25 @@
+   <title>If You Are Going to Boot</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="mips/bootloaders.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.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="mips64/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/mips-chapter.xml BOOK/boot/mips-chapter.xml
+--- /home/jp/a/BOOK/boot/mips-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/mips-chapter.xml	2014-10-03 20:44:43.892339260 +0200
+@@ -12,23 +12,24 @@
+   <title>If You Are Going to Boot</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="mips/bootloaders.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/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/util-linux.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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="mips/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/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/devices.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/fstab.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/multilib/createfiles.xml BOOK/boot/multilib/createfiles.xml
+--- /home/jp/a/BOOK/boot/multilib/createfiles.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/multilib/createfiles.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -14,14 +14,27 @@
+   href="../common/createfiles.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
++<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
+ ln -sv /tools/bin/file ${CLFS}/usr/bin
+-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
+ ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
+-ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
++ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
++ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
++sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
+ ln -sv bash ${CLFS}/bin/sh
+-ln -sv ../run ${CLFS}/var/run</userinput></screen>
++ln -sv /tools/sbin/init ${CLFS}/sbin
++ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
++
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/createfiles.xml"
++  xpointer="xpointer(//*[@os='c'])"/>
++
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/createfiles.xml"
++  xpointer="xpointer(//*[@os='d'])"/>
++
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/createfiles.xml"
++  xpointer="xpointer(//*[@os='e'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/multilib/creatingdirs.xml BOOK/boot/multilib/creatingdirs.xml
+--- /home/jp/a/BOOK/boot/multilib/creatingdirs.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/multilib/creatingdirs.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -14,32 +14,34 @@
+   href="../common/creatingdirs.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/creatingdirs.xml"
++  xpointer="xpointer(//*[@os='b'])"/>
++
++<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
+ mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
+ mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
+ mkdir -pv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
+ install -dv ${CLFS}/root -m 0750
+ install -dv ${CLFS}{/var,}/tmp -m 1777
++ln -sv ../run ${CLFS}/var/run
+ mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,64},sbin,src}
+ mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
+ mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+ mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
+-for dir in ${CLFS}/usr{,/local}; do
+-  ln -sv share/{man,doc,info} $dir
+-done
+ install -dv ${CLFS}/usr/lib/locale
+ ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='c'])"/>
++  xpointer="xpointer(//*[@os='d'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='d'])"/>
++  xpointer="xpointer(//*[@os='e'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='e'])"/>
++  xpointer="xpointer(//*[@os='f'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/multilib/e2fsprogs.xml BOOK/boot/multilib/e2fsprogs.xml
+--- /home/jp/a/BOOK/boot/multilib/e2fsprogs.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/multilib/e2fsprogs.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -40,8 +40,7 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+-  ../configure --prefix=/tools --enable-elf-shlibs \
++<screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+     --disable-libblkid --disable-libuuid --disable-fsck \
+     --disable-uuidd</userinput></screen>
+@@ -54,9 +53,9 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
+-    LDFLAGS="-Wl,-rpath,/tools/lib64"</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/e2fsprogs.xml"
++    xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/e2fsprogs.xml"
+@@ -74,14 +73,6 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/e2fsprogs.xml"
+-    xpointer="xpointer(//*[@os='ad'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/e2fsprogs.xml"
+-    xpointer="xpointer(//*[@os='ae'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/boot/multilib/eudev.xml BOOK/boot/multilib/eudev.xml
+--- /home/jp/a/BOOK/boot/multilib/eudev.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/multilib/eudev.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,40 +12,38 @@
+ 
+   <indexterm zone="ch-boot-eudev">
+     <primary sortas="a-Eudev">Eudev</primary>
+-    <secondary>boot</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../../final-system/common/eudev.xml"
++  href="../common/eudev.xml"
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+     <title>Installation of Eudev</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
++    href="../common/eudev.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
+-    ./configure --prefix=/usr --build=${CLFS_HOST} \
+-    --host=${CLFS_TARGET} --with-rootprefix='' --enable-split-usr \
+-    --sysconfdir=/etc --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin \
+-    --libdir=/usr/lib64 --with-rootlibdir=/lib64 --disable-introspection \
+-    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+-    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} \
++    --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
++    --disable-introspection --disable-gtk-doc-html --disable-gudev \
++    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/eudev.xml"
++    xpointer="xpointer(//*[@os='b1'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
++    href="../common/eudev.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
++    href="../common/eudev.xml"
+     xpointer="xpointer(//*[@os='d'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
++    href="../common/eudev.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -53,7 +51,7 @@
+     xpointer="xpointer(//*[@os='j'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/eudev.xml"
++    href="../common/eudev.xml"
+     xpointer="xpointer(//*[@os='r1'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -62,12 +60,8 @@
+ 
+   </sect2>
+ 
+-  <sect2 role="content">
+-    <title/>
+-
+-    <para>Details on this package are located in <xref
+-    linkend="contents-eudev" role="."/></para>
+-
+-  </sect2>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../common/eudev.xml"
++  xpointer="xpointer(//*[@role='content'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/boot/multilib/grub-build.xml BOOK/boot/multilib/grub-build.xml
+--- /home/jp/a/BOOK/boot/multilib/grub-build.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/multilib/grub-build.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -31,16 +31,25 @@
+     xpointer="xpointer(//*[@os='s1'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/x86/grub.xml"
++    href="../x86/grub-build.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/x86/grub.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
++<screen os="ab"><userinput>./configure --prefix=/tools \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+-    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
++    --libdir=/tools/lib64 --disable-werror \
++    --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/grub-build.xml"
++    xpointer="xpointer(//*[@os='b'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/grub-build.xml"
++    xpointer="xpointer(//*[@os='bc'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/x86/grub.xml"
+@@ -54,7 +63,9 @@
+     href="../../final-system/x86/grub.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+-<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/grub-build.xml"
++    xpointer="xpointer(//*[@os='ag'])"/>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/multilib/kmod.xml BOOK/boot/multilib/kmod.xml
+--- /home/jp/a/BOOK/boot/multilib/kmod.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/multilib/kmod.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -23,14 +23,24 @@
+     <title>Installation of Kmod</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kmod.xml"
++    xpointer="xpointer(//*[@os='s1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kmod.xml"
++    xpointer="xpointer(//*[@os='s2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/kmod.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib64 -llzma" \
+-zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
+-CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+-    --bindir=/bin --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+-    --libdir=/tools/lib64 --with-xz --with-zlib --disable-manpages</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/tools \
++    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
++    --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kmod.xml"
++    xpointer="xpointer(//*[@os='c'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/kmod.xml"
+@@ -44,18 +54,17 @@
+     href="../../final-system/common/kmod.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kmod.xml"
++    xpointer="xpointer(//*[@os='h'])"/>
+ 
+-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-href="../../final-system/common/kmod.xml"
+-xpointer="xpointer(//*[@os='i'])"/>
+-
+-<screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
+-ln -sv ../bin/kmod ${CLFS}/sbin/depmod
+-ln -sv ../bin/kmod ${CLFS}/sbin/insmod
+-ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
+-ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
+-ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kmod.xml"
++    xpointer="xpointer(//*[@os='i'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kmod.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
+ 
+   </sect2>
+ 
+Seulement dans /home/jp/a/BOOK/boot/multilib: sysvinit.xml
+Seulement dans /home/jp/a/BOOK/boot/multilib: util-linux.xml
+diff -ru /home/jp/a/BOOK/boot/ppc/kernel.xml BOOK/boot/ppc/kernel.xml
+--- /home/jp/a/BOOK/boot/ppc/kernel.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/ppc/kernel.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -31,6 +31,14 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+@@ -65,25 +73,17 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+ <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -93,7 +93,8 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/boot/ppc/powerpc-utils.xml BOOK/boot/ppc/powerpc-utils.xml
+--- /home/jp/a/BOOK/boot/ppc/powerpc-utils.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/ppc/powerpc-utils.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -30,14 +30,14 @@
+     href="../../final-system/ppc/powerpc-utils.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+-    <para os="a">This package's Makefile has issues with cross-compiling. Fortunately,
++    <para os="c">This package's Makefile has issues with cross-compiling. Fortunately,
+     we only need one program and it is a simple task to compile it.</para>
+ 
+-<screen><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
++<screen os="d"><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+ 
+-    <para os="c">Install the program:</para>
++    <para os="e">Install the program:</para>
+ 
+-<screen os="d"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
++<screen os="f"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/ppc64/e2fsprogs-libs.xml BOOK/boot/ppc64/e2fsprogs-libs.xml
+--- /home/jp/a/BOOK/boot/ppc64/e2fsprogs-libs.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/ppc64/e2fsprogs-libs.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -30,9 +30,9 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+-    <para>When cross-compiling configure cannot determine sizes and assumes
+-    short=2, int=4, long=4, long long=8. This is not correct for PowerPC64.
+-    Adjust the values with:</para>
++    <para>When cross-compiling, <command>configure</command> cannot determine
++    data type sizes and assumes short=2, int=4, long=4, long long=8.
++    This is not correct for PowerPC64. Adjust the values with:</para>
+ 
+ <!--<screen><userinput>echo "ac_cv_sizeof_long_long=8" > config.cache
+ echo "ac_cv_sizeof_long=8" >> config.cache
+@@ -45,7 +45,7 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
++<screen os="aa"><userinput>CC="${CC} ${BUILD32}" \
+   ../configure --prefix=/tools --enable-elf-shlibs \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+     --disable-libblkid --disable-libuuid --disable-fsck \
+@@ -56,11 +56,12 @@
+     xpointer="xpointer(//*[@os='e'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../64/e2fsprogs.xml"
++    href="../multilib/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/e2fsprogs.xml"
++    xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/e2fsprogs.xml"
+diff -ru /home/jp/a/BOOK/boot/ppc64/e2fsprogs.xml BOOK/boot/ppc64/e2fsprogs.xml
+--- /home/jp/a/BOOK/boot/ppc64/e2fsprogs.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/ppc64/e2fsprogs.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -38,9 +38,9 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+-    <para>When cross-compiling, <command>configure</command> cannot
+-    determine sizes and assumes short=2, int=4, long=4, long long=8. This is
+-    not correct for PowerPC64. Adjust the values with:</para>
++    <para>When cross-compiling, <command>configure</command> cannot determine
++    data type sizes and assumes short=2, int=4, long=4, long long=8.
++    This is not correct for PowerPC64. Adjust the values with:</para>
+ 
+ <!--<screen><userinput>echo "ac_cv_sizeof_long_long=8" > config.cache
+ echo "ac_cv_sizeof_long=8" >> config.cache
+@@ -53,8 +53,7 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+-  ../configure --prefix=/tools --enable-elf-shlibs \
++<screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+     --disable-libblkid --disable-libuuid --disable-fsck \
+     --disable-uuidd --cache-file=config.cache</userinput></screen>
+@@ -64,13 +63,11 @@
+     xpointer="xpointer(//*[@os='e'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../64/e2fsprogs.xml"
++    href="../multilib/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs
+-make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
+-    STATIC_LIBBLKID="-lblkid" LDFLAGS="-Wl,-rpath,/tools/lib64" -C e2fsck/</userinput></screen>
++<screen os="g"><userinput>make libs
++make -C e2fsck/</userinput></screen>
+ 
+     <para os="i">Install the e2fsck binary:</para>
+ 
+@@ -84,14 +81,6 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/e2fsprogs.xml"
+-    xpointer="xpointer(//*[@os='ad'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/e2fsprogs.xml"
+-    xpointer="xpointer(//*[@os='ae'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+Seulement dans /home/jp/a/BOOK/boot/ppc64: hfsutils.xml
+diff -ru /home/jp/a/BOOK/boot/ppc64/kernel.xml BOOK/boot/ppc64/kernel.xml
+--- /home/jp/a/BOOK/boot/ppc64/kernel.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/ppc64/kernel.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -35,6 +35,14 @@
+     xpointer="xpointer(//*[@os='m1'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+@@ -64,25 +72,17 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+ <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -92,7 +92,8 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/boot/ppc64/powerpc-utils.xml BOOK/boot/ppc64/powerpc-utils.xml
+--- /home/jp/a/BOOK/boot/ppc64/powerpc-utils.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/ppc64/powerpc-utils.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -23,26 +23,26 @@
+     <title>Installation of Powerpc-Utils</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/ppc/powerpc-utils.xml"
++    href="../ppc/powerpc-utils.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/ppc/powerpc-utils.xml"
++    href="../ppc/powerpc-utils.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/powerpc-utils.xml"
+-    xpointer="xpointer(//*[@os='a'])"/>
++    xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen><userinput>${CC} ${BUILD32} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
++<screen os="d"><userinput>${CC} ${BUILD32} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/powerpc-utils.xml"
+-    xpointer="xpointer(//*[@os='c'])"/>
++    xpointer="xpointer(//*[@os='e'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/powerpc-utils.xml"
+-    xpointer="xpointer(//*[@os='d'])"/>
++    xpointer="xpointer(//*[@os='f'])"/>
+ 
+   </sect2>
+ 
+Seulement dans /home/jp/a/BOOK/boot/ppc64: util-linux-32.xml
+Seulement dans /home/jp/a/BOOK/boot/ppc64-64: powerpc-utils.xml
+diff -ru /home/jp/a/BOOK/boot/ppc64-64-chapter.xml BOOK/boot/ppc64-64-chapter.xml
+--- /home/jp/a/BOOK/boot/ppc64-64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/ppc64-64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,25 +12,26 @@
+   <title>If You Are Going to Boot</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/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot-build.xml"/>
+   <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="64/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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="ppc64/kernel.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/powerpc-utils.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/ppc64-chapter.xml BOOK/boot/ppc64-chapter.xml
+--- /home/jp/a/BOOK/boot/ppc64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/ppc64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,27 +12,27 @@
+   <title>If You Are Going to Boot</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="multilib/creatingdirs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/util-linux-32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.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="ppc64/kernel.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/powerpc-utils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/ppc-chapter.xml BOOK/boot/ppc-chapter.xml
+--- /home/jp/a/BOOK/boot/ppc-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/ppc-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,24 +12,25 @@
+   <title>If You Are Going to Boot</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/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/util-linux.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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="ppc/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
++  <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/devices.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/fstab.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/sparc/fstab.xml BOOK/boot/sparc/fstab.xml
+--- /home/jp/a/BOOK/boot/sparc/fstab.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/sparc/fstab.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,6 +12,7 @@
+ 
+   <indexterm zone="ch-boot-fstab">
+     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
++    <secondary>boot</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -26,12 +27,8 @@
+ 
+ /dev/<replaceable>[xxx]</replaceable>        /            <replaceable>[fff]</replaceable>       defaults         1     1
+ /dev/<replaceable>[yyy]</replaceable>        swap         swap        pri=1            0     0
+-proc           /proc           proc        defaults         0     0
+-sysfs          /sys            sysfs       defaults         0     0
+ devpts         /dev/pts        devpts      gid=&gid-tty;,mode=620   0     0
+ shm            /dev/shm        tmpfs       defaults         0     0
+-tmpfs          /run            tmpfs       defaults         0     0
+-devtmpfs       /dev            devtmpfs    mode=0755,nosuid 0     0
+ none           /proc/openprom  openpromfs  defaults         0     0
+ # End /etc/fstab</literal>
+ EOF</userinput></screen>
+diff -ru /home/jp/a/BOOK/boot/sparc/kernel.xml BOOK/boot/sparc/kernel.xml
+--- /home/jp/a/BOOK/boot/sparc/kernel.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/sparc/kernel.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -31,6 +31,14 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+@@ -60,25 +68,17 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+ <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -88,7 +88,8 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/boot/sparc/silo-build.xml BOOK/boot/sparc/silo-build.xml
+--- /home/jp/a/BOOK/boot/sparc/silo-build.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/sparc/silo-build.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -32,7 +32,8 @@
+ 
+ <para os="ae">This sed allows us to compile the bin2h binary separately.</para>
+ 
+-<screen os="ad"><userinput>sed -i -e 's@\$(PROGRAMS)$@programs\n\nprograms: &@' common/Makefile</userinput></screen>
++<screen os="ad"><userinput>cp -v common/Makefile{,.orig}
++sed -e 's@\$(PROGRAMS)$@programs\n\nprograms: &@' common/Makefile.orig > common/Makefile</userinput></screen>
+ 
+ <para os="af">Compile the bin2h and util binaries for the host.</para>
+ 
+@@ -43,7 +44,7 @@
+       <varlistentry>
+         <term><parameter>CC=cc</parameter></term>
+         <listitem>
+-          <para>Overwrites the default value of <command>gcc -m32</command> which will fail 
++          <para>Overwrites the default value of <command>gcc -m32</command> which will fail
+ to compile on 64 bit targets. This is not to be confused with <command>CC=${CC}</command> below.</para>
+         </listitem>
+       </varlistentry>
+diff -ru /home/jp/a/BOOK/boot/sparc/silo.xml BOOK/boot/sparc/silo.xml
+--- /home/jp/a/BOOK/boot/sparc/silo.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/sparc/silo.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -16,7 +16,7 @@
+   </indexterm>
+ 
+   <para os="a">This is for the configuration of <command>silo</command>, similar
+-  to what is in bootscripts.</para>
++  to what is in boot-scripts.</para>
+ 
+ <screen><userinput>cat > ${CLFS}/etc/silo.conf << "EOF"
+ <literal># Begin /etc/silo.conf
+@@ -24,7 +24,7 @@
+ root = /dev/sda1      # Root partition
+ timeout = 150         # Wait 15 seconds before booting the default section
+ 
+-image = /boot/clfskernel-&linux-version;
++image = /tools/boot/vmlinuz-clfs-&linux-version2;
+   label = linux
+ # End /etc/silo.conf</literal>
+ EOF</userinput></screen>
+Seulement dans /home/jp/a/BOOK/boot/sparc64: flags.xml
+diff -ru /home/jp/a/BOOK/boot/sparc64/kernel.xml BOOK/boot/sparc64/kernel.xml
+--- /home/jp/a/BOOK/boot/sparc64/kernel.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/sparc64/kernel.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -31,6 +31,14 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+@@ -62,17 +70,9 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+-<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=${CLFS} \
++<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=/tools \
+    CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -80,7 +80,7 @@
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -90,7 +90,8 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+Seulement dans /home/jp/a/BOOK/boot/sparc64-64: flags.xml
+diff -ru /home/jp/a/BOOK/boot/sparc64-64-chapter.xml BOOK/boot/sparc64-64-chapter.xml
+--- /home/jp/a/BOOK/boot/sparc64-64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/sparc64-64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,24 +12,25 @@
+   <title>If You Are Going to Boot</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/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+   <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="64/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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="sparc64/kernel.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/sparc64-chapter.xml BOOK/boot/sparc64-chapter.xml
+--- /home/jp/a/BOOK/boot/sparc64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/sparc64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,24 +12,25 @@
+   <title>If You Are Going to Boot</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="multilib/creatingdirs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.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="sparc64/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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="sparc/fstab.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/sparc-chapter.xml BOOK/boot/sparc-chapter.xml
+--- /home/jp/a/BOOK/boot/sparc-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/sparc-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,23 +12,24 @@
+   <title>If You Are Going to Boot</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/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/util-linux.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.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="sparc/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
++  <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/devices.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="sparc/fstab.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/boot/x86/grub-build.xml BOOK/boot/x86/grub-build.xml
+--- /home/jp/a/BOOK/boot/x86/grub-build.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/x86/grub-build.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -30,9 +30,8 @@
+     href="../../final-system/x86/grub.xml"
+     xpointer="xpointer(//*[@os='s1'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/x86/grub.xml"
+-    xpointer="xpointer(//*[@os='s2'])"/>
++<screen os="s2"><userinput>cp -v grub-core/gnulib/stdio.in.h{,.orig}
++sed -e '/gets is a/d' grub-core/gnulib/stdio.in.h.orig > grub-core/gnulib/stdio.in.h</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/x86/grub.xml"
+@@ -40,7 +39,25 @@
+ 
+ <screen os="ab"><userinput>./configure --prefix=/tools \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+-    --sysconfdir=/etc --disable-werror</userinput></screen>
++    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
++
++<para os="b">The meaning of the new configure option:</para>
++
++  <variablelist os="bc">
++
++    <varlistentry>
++      <term><parameter>--enable-grub-mkfont=no</parameter></term>
++      <listitem><para>Prevents GRUB from trying to build
++      <command>grub-mkfont</command>, which requires Freetype.</para></listitem>
++    </varlistentry>
++
++    <varlistentry>
++      <term><parameter>--with-bootdir=tools/boot</parameter></term>
++      <listitem><para>This modifies GRUB's default location where it
++      searches for kernel images and installs its bootloader files.</para></listitem>
++    </varlistentry>
++
++  </variablelist>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/x86/grub.xml"
+@@ -54,7 +71,7 @@
+     href="../../final-system/x86/grub.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+-<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
++<screen os="ag"><userinput>make install</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/boot/x86/kernel.xml BOOK/boot/x86/kernel.xml
+--- /home/jp/a/BOOK/boot/x86/kernel.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/x86/kernel.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -38,6 +38,14 @@
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -48,6 +56,19 @@
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='d'])"/>
+ 
++    <note os="kc"><para>A good starting place for setting up the kernel
++    configuration is to run <command>make defconfig</command>. This will set the    base configuration to a good state that takes your current system
++    architecture into account.</para>
++
++    <para>Be sure to configure the following options as
++    shown, or the system might not work correctly or boot at all.</para>
++
++    <screen role="nodump">Device Drivers  --->
++  Generic Driver Options  --->
++    ()  path to uevent helper (CONFIG_UEVENT_HELPER_PATH)
++    [*] Maintain a devtmpfs filesystem to mount at /dev (CONFIG_DEVTMPFS)
++    [ ] Fallback user-helper invocation for firmware loading (CONFIG_FW_LOADER_USER_HELPER)</screen></note>
++
+     <para os="ae">Configure the kernel via a menu-driven interface:</para>
+ 
+ <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+@@ -58,57 +79,48 @@
+ 
+ <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
+ 
+-    <para os="af">If the use of kernel modules can't be avoided, an
+-    <filename>/etc/modprobe.conf</filename> file may be needed.
++    <para os="af">If the use of kernel modules can't be avoided, a file in
++    <filename class="directory">/etc/modprobe.d</filename> may be needed.
+     Information pertaining to modules and kernel configuration is
+     located in the kernel documentation in the <filename
+     class="directory">Documentation</filename> directory of the kernel
+-    sources tree. The <filename>modprobe.conf</filename> man page may also
++    sources tree. The <filename>modprobe.d</filename> man page may also
+     be of interest.</para>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../bootable/x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+ <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
+-    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
++    INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++    INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <para os="u">After kernel compilation is complete, additional steps are
+     required to complete the installation. Some files need to be copied to
+-    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
++    the <filename class="directory">/tools/boot</filename> directory.</para>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../bootable/x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='v'])"/>
++    <para os="v">Issue the following commands to install the kernel:</para>
+ 
+-<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='w'])"/>
+ 
+-<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
++<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='x'])"/>
+ 
+-<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
++<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version2;</userinput></screen>
+ 
+   </sect2>
+ 
+Seulement dans /home/jp/a/BOOK/boot/x86_64: flags.xml
+diff -ru /home/jp/a/BOOK/boot/x86_64/kernel.xml BOOK/boot/x86_64/kernel.xml
+--- /home/jp/a/BOOK/boot/x86_64/kernel.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/x86_64/kernel.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-boot-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-boot-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -35,6 +35,14 @@
+     ELF and emulations for 32bit ELF into the kernel.</para>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+@@ -64,25 +72,17 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+ <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../bootable/x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
+ <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
+-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
++   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -92,7 +92,8 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
++<screen><userinput>mkdir -pv /tools/boot
++cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+Seulement dans /home/jp/a/BOOK/boot: x86_64-64
+diff -ru /home/jp/a/BOOK/boot/x86_64-64-chapter.xml BOOK/boot/x86_64-64-chapter.xml
+--- /home/jp/a/BOOK/boot/x86_64-64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/x86_64-64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,23 +12,24 @@
+   <title>If You Are Going to Boot</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/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
+   <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="64/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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="x86_64/kernel.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/boot/x86_64-chapter.xml BOOK/boot/x86_64-chapter.xml
+--- /home/jp/a/BOOK/boot/x86_64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
++++ BOOK/boot/x86_64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,23 +12,24 @@
+   <title>If You Are Going to Boot</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="multilib/creatingdirs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.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="x86_64/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.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/fstab.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/boot/x86-chapter.xml BOOK/boot/x86-chapter.xml
+--- /home/jp/a/BOOK/boot/x86-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/boot/x86-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,22 +12,23 @@
+   <title>If You Are Going to Boot</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/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/util-linux.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
++   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.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="x86/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
++  <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/devices.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/fstab.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
+ 
+ </chapter>
+Seulement dans /home/jp/a/BOOK/bootable: alpha
+Seulement dans /home/jp/a/BOOK/bootable: alpha-chapter.xml
+Seulement dans /home/jp/a/BOOK/bootable/common: fstab.xml
+diff -ru /home/jp/a/BOOK/bootable/common/introduction.xml BOOK/bootable/common/introduction.xml
+--- /home/jp/a/BOOK/bootable/common/introduction.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/common/introduction.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -11,9 +11,8 @@
+   <title>Introduction</title>
+ 
+   <para>It is time to make the CLFS system bootable. This chapter
+-  discusses creating an <filename>fstab</filename> file, building a
+-  kernel for the new CLFS system, and installing the boot loader so
+-  that the CLFS system can be selected for booting at startup.</para>
++  discusses building a kernel for the new CLFS system and installing the boot
++  loader so that the CLFS system can be selected for booting at startup.</para>
+ 
+ </sect1>
+ 
+diff -ru /home/jp/a/BOOK/bootable/mips/arcload.xml BOOK/bootable/mips/arcload.xml
+--- /home/jp/a/BOOK/bootable/mips/arcload.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/mips/arcload.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -30,9 +30,9 @@
+ append  "console=ttyS0,9600";
+ 
+ CLFS {
+-  &linux-version; {
+-    description  "&linux-version;";
+-    image system "/&linux-version;";
++  &linux-version2; {
++    description  "&linux-version2;";
++    image system "/&linux-version2;";
+   }
+ 
+   debug {
+@@ -47,6 +47,6 @@
+ 
+ <screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash sash
+ dvhtool --unix-to-vh /boot/arc.cf arc.cf
+-dvhtool --unix-to-vh /boot/&linux-version; &linux-version;</userinput></screen>
++dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/bootable/mips/colo.xml BOOK/bootable/mips/colo.xml
+--- /home/jp/a/BOOK/bootable/mips/colo.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/mips/colo.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -40,8 +40,8 @@
+ #
+ # load linux
+ #
+-lcd 'Booting &linux-version;...'
+-load vmlinux-&linux-version;.gz
++lcd 'Booting &linux-version2;...'
++load vmlinux-&linux-version2;.gz
+ execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
+ EOF</userinput></screen>
+ 
+diff -ru /home/jp/a/BOOK/bootable/mips/kernel.xml BOOK/bootable/mips/kernel.xml
+--- /home/jp/a/BOOK/bootable/mips/kernel.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/mips/kernel.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-bootable-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-bootable-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -27,51 +27,55 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='b'])"/>
++    xpointer="xpointer(//*[@os='p1'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='c'])"/>
++    xpointer="xpointer(//*[@os='p2'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='d'])"/>
++    xpointer="xpointer(//*[@os='b'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='h'])"/>
++    xpointer="xpointer(//*[@os='c'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
++    xpointer="xpointer(//*[@os='d'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='k'])"/>
++    xpointer="xpointer(//*[@os='kc'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='m'])"/>
++    xpointer="xpointer(//*[@os='kd'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='n'])"/>
++    xpointer="xpointer(//*[@os='h'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='o'])"/>
++    xpointer="xpointer(//*[@os='i'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
++    xpointer="xpointer(//*[@os='k'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
++    xpointer="xpointer(//*[@os='m'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='r'])"/>
++    xpointer="xpointer(//*[@os='n'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='o'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+@@ -80,7 +84,7 @@
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='t'])"/>
+-    
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+@@ -97,8 +101,8 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux /boot/vmlinux-&linux-version;
+-gzip -9 /boot/vmlinux-&linux-version;</userinput></screen>
++<screen><userinput>cp -v vmlinux /boot/vmlinux-&linux-version2;
++gzip -9 /boot/vmlinux-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/bootable/mips64/arcload.xml BOOK/bootable/mips64/arcload.xml
+--- /home/jp/a/BOOK/bootable/mips64/arcload.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/mips64/arcload.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -30,9 +30,9 @@
+ append  "console=ttyS0,9600";
+ 
+ CLFS {
+-  &linux-version; {
+-    description  "&linux-version;";
+-    image system "/&linux-version;";
++  &linux-version2; {
++    description  "&linux-version2;";
++    image system "/&linux-version2;";
+   }
+ 
+   debug {
+@@ -47,6 +47,6 @@
+ 
+ <screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash64 sash64
+ dvhtool --unix-to-vh /boot/arc.cf arc.cf
+-dvhtool --unix-to-vh /boot/&linux-version; &linux-version;</userinput></screen>
++dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/bootable/mips64-64-chapter.xml BOOK/bootable/mips64-64-chapter.xml
+--- /home/jp/a/BOOK/bootable/mips64-64-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/mips64-64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/arcload.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
+diff -ru /home/jp/a/BOOK/bootable/mips64-chapter.xml BOOK/bootable/mips64-chapter.xml
+--- /home/jp/a/BOOK/bootable/mips64-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/mips64-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/arcload.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
+diff -ru /home/jp/a/BOOK/bootable/mips-chapter.xml BOOK/bootable/mips-chapter.xml
+--- /home/jp/a/BOOK/bootable/mips-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/mips-chapter.xml	2014-10-03 20:44:43.896339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/arcload.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
+diff -ru /home/jp/a/BOOK/bootable/ppc/kernel.xml BOOK/bootable/ppc/kernel.xml
+--- /home/jp/a/BOOK/bootable/ppc/kernel.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/ppc/kernel.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-bootable-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-bootable-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -27,6 +27,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -39,6 +47,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='kc'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='kd'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -56,7 +72,7 @@
+     <command>make oldconfig</command> and manually select many of the
+     mac-specific options for ide and input.</para>
+     </warning>
+-   
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='k'])"/>
+@@ -75,24 +91,12 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='r'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='t'])"/>
+-    
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+@@ -109,7 +113,7 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
++<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/bootable/ppc/yaboot.xml BOOK/bootable/ppc/yaboot.xml
+--- /home/jp/a/BOOK/bootable/ppc/yaboot.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/ppc/yaboot.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -62,7 +62,7 @@
+   to the image(s), such as
+   <parameter>device=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:</parameter>
+   for the disk, and
+-  <parameter>image=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:9,/boot/clfskernel-&linux-version;</parameter>
++  <parameter>image=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:9,/boot/clfskernel-&linux-version2;</parameter>
+   which definitely works.</para>
+ 
+   <para os="k">Create a <quote>yaboot.conf</quote> file defining yaboot's boot
+@@ -112,7 +112,7 @@
+ # For all images, the pathname is relative to the filesystem
+ # on which they are situated and can include at most one
+ # directory
+-image=/boot/clfskernel-&linux-version;
++image=/boot/clfskernel-&linux-version2;
+     label=&version;
+     read-only</literal>
+ EOF</userinput></screen>
+Seulement dans /home/jp/a/BOOK/bootable/ppc64: kernel.xml
+diff -ru /home/jp/a/BOOK/bootable/ppc64-64-chapter.xml BOOK/bootable/ppc64-64-chapter.xml
+--- /home/jp/a/BOOK/bootable/ppc64-64-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/ppc64-64-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/bootable/ppc64-chapter.xml BOOK/bootable/ppc64-chapter.xml
+--- /home/jp/a/BOOK/bootable/ppc64-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/ppc64-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,8 +12,7 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/bootable/ppc-chapter.xml BOOK/bootable/ppc-chapter.xml
+--- /home/jp/a/BOOK/bootable/ppc-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/ppc-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
+ 
+Seulement dans /home/jp/a/BOOK/bootable/sparc: fstab.xml
+diff -ru /home/jp/a/BOOK/bootable/sparc/kernel.xml BOOK/bootable/sparc/kernel.xml
+--- /home/jp/a/BOOK/bootable/sparc/kernel.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/sparc/kernel.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-bootable-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-bootable-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -27,6 +27,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -39,6 +47,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='kc'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='kd'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -67,24 +83,12 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='r'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='t'])"/>
+-    
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+@@ -101,7 +105,7 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
++<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/bootable/sparc/silo.xml BOOK/bootable/sparc/silo.xml
+--- /home/jp/a/BOOK/bootable/sparc/silo.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/sparc/silo.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -24,7 +24,7 @@
+ root = /dev/sda1      # Root partition
+ timeout = 150         # Wait 15 seconds before booting the default section
+ 
+-image = /boot/clfskernel-&linux-version;
++image = /boot/clfskernel-&linux-version2;
+   label = linux
+ # End /etc/silo.conf</literal>
+ EOF</userinput></screen>
+diff -ru /home/jp/a/BOOK/bootable/sparc64-64-chapter.xml BOOK/bootable/sparc64-64-chapter.xml
+--- /home/jp/a/BOOK/bootable/sparc64-64-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/sparc64-64-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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="sparc/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/bootable/sparc64-chapter.xml BOOK/bootable/sparc64-chapter.xml
+--- /home/jp/a/BOOK/bootable/sparc64-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/sparc64-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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="sparc/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/bootable/sparc-chapter.xml BOOK/bootable/sparc-chapter.xml
+--- /home/jp/a/BOOK/bootable/sparc-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/sparc-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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="sparc/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/bootable/x86/grub.xml BOOK/bootable/x86/grub.xml
+--- /home/jp/a/BOOK/bootable/x86/grub.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/bootable/x86/grub.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -38,7 +38,7 @@
+     .</para>
+   </warning>
+ 
+-  <para os="e">Instruct GRUB to install itself int othe MBR of
++  <para os="e">Instruct GRUB to install itself into the MBR of
+   <filename class="partition">sda</filename>:</para>
+ 
+ <screen os="f"><userinput>grub-install /dev/sda</userinput></screen>
+diff -ru /home/jp/a/BOOK/bootable/x86/kernel.xml BOOK/bootable/x86/kernel.xml
+--- /home/jp/a/BOOK/bootable/x86/kernel.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/bootable/x86/kernel.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-bootable-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-bootable-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -27,6 +27,10 @@
+     file in the kernel source tree for alternative methods to the way this
+     book configures the kernel.</para>
+ 
++    <para os="p1">Apply the latest Linux sublevel patch:</para>
++
++<screen os="p2"><userinput>xzcat ../&linux-sublevel-patch; | patch -Np1 -i -</userinput></screen>
++
+     <para os="b">Prepare for compilation by running the following command:</para>
+ 
+ <screen os="c"><userinput>make mrproper</userinput></screen>
+@@ -36,11 +40,54 @@
+     kernel compilation. Do not rely on the source tree being clean after
+     un-tarring.</para>
+ 
++    <note os="kc"><para>A good starting place for setting up the kernel
++    configuration is to run <command>make defconfig</command>. This will set the    base configuration to a good state that takes your current system
++    architecture into account.</para>
++
++    <para>Be sure to configure the following options as
++    shown, or the system might not work correctly or boot at all.
++    Refer to <filename>/usr/share/doc/systemd-&systemd-version;/README</filename>:</para>
++
++    <screen role="nodump">General setup  --->
++  [*] open by fhandle syscalls (CONFIG_FHANDLE)
++  [ ] Auditing support (CONFIG_AUDIT)
++  [*] Control Group support (CONFIG_CGROUPS)
++Processor type and features  --->
++  [*] Enable seccomp to safely compute untrusted bytecode (CONFIG_SECCOMP)
++Networking support  --->
++  Networking options  --->
++    <*> The IPv6 protocol (CONFIG_IPV6)
++Device Drivers  --->
++  Generic Driver Options  --->
++    ()  path to uevent helper (CONFIG_UEVENT_HELPER_PATH)
++    [*] Maintain a devtmpfs filesystem to mount at /dev (CONFIG_DEVTMPFS)
++    [ ] Fallback user-helper invocation for firmware loading (CONFIG_FW_LOADER_USER_HELPER)
++File systems  --->
++  [*] Inotify support for userspace (CONFIG_FSNOTIFY)
++  <*> Kernel automounter version 4 support (also supports v3) (CONFIG_AUTOFS4_FS)
++  Pseudo filesystems  --->
++    [*] Tmpfs POSIX Access Control Lists (CONFIG_TMPFS_POSIX_ACL)
++    [*] Tmpfs extended attributes (CONFIG_TMPFS_XATTR)
++Firmware Drivers --->
++  EFI (Extensible Firmware Interface) Support --->
++    <*> EFI Variable Support via sysfs (CONFIG_EFI_VARS)
++-*- Enable the block layer ---> (CONFIG_BLOCK)
++  Partition Types --->
++    [*] Advanced partition selection (CONFIG_PARTITION_ADVANCED)
++    [*]   EFI GUID Partition support (CONFIG_EFI_PARTITION)
++Kernel Hacking --->
++  [*] Collect scheduler debugging info (CONFIG_SCHED_DEBUG)
++  [*] Collect scheduler statistics (CONFIG_SCHEDSTATS)</screen></note>
++
++    <note os="kd"><para>While "The IPv6 Protocol" is not strictly required, it
++    is highly recommended by the Systemd developers. "EFI Variable support" and
++    "EFI GUID Partition support" are for UEFI systems. "Collect scheduler
++    debugging info" and "Collect scheduler statistics" is for systemd-bootchart.
++    </para></note>
++
+     <para os="h">Configure the kernel via a menu-driven interface.
+-    Please note that the udev bootscript requires "rtc", "tmpfs" and "devtmpfs" to be
+-    enabled and built into the kernel, not as modules. CBLFS has
+-    some information regarding particular kernel configuration requirements of
+-    packages outside of CLFS at <ulink
++    CBLFS has some information regarding particular kernel configuration
++    requirements of packages outside of CLFS at <ulink
+     url="&cblfs-root;"/>:</para>
+ 
+ <screen os="i"><userinput>make menuconfig</userinput></screen>
+@@ -60,29 +107,14 @@
+ 
+ <screen os="n"><userinput>make</userinput></screen>
+ 
+-    <para os="o">If using kernel modules, an
+-    <filename>/etc/modprobe.conf</filename> file may be needed.
++    <para os="o">If using kernel modules, a configuration file in
++    <filename class="directory">/etc/modprobe.d</filename> file may be needed.
+     Information pertaining to modules and kernel configuration is
+     located in the kernel documentation in the <filename
+     class="directory">Documentation</filename> directory of the kernel
+-    sources tree. Also, <filename>modprobe.conf(5)</filename> may
++    sources tree. Also, <filename>modprobe.d(5)</filename> may
+     be of interest.</para>
+ 
+-    <para os="p">Be very careful when reading other documentation relating to
+-    kernel modules because it usually applies to 2.4.x kernels only. As
+-    far as we know, kernel configuration issues specific to Hotplug and
+-    Eudev are not documented. The problem is that Eudev will create a device
+-    node only if Hotplug or a user-written script inserts the corresponding
+-    module into the kernel, and not all modules are detectable by Hotplug.
+-    Note that statements like the one below in the
+-    <filename>/etc/modprobe.conf</filename> file do not work with Eudev:</para>
+-
+-<screen os="q"><literal>alias char-major-XXX some-module</literal></screen>
+-
+-    <para os="r">Because of the complications with Eudev and modules,
+-    we strongly recommend starting with a completely non-modular kernel
+-    configuration, especially if this is the first time using Eudev.</para>
+-
+     <para os="s">Install the modules, if the kernel configuration uses
+     them:</para>
+ 
+@@ -99,21 +131,21 @@
+ 
+     <para os="v">Issue the following command to install the kernel:</para>
+ 
+-<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version;</userinput></screen>
++<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
+ 
+     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
+     It maps the function entry points of every function in the kernel API,
+     as well as the addresses of the kernel data structures for the running
+     kernel. Issue the following command to install the map file:</para>
+ 
+-<screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version;</userinput></screen>
++<screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version2;</userinput></screen>
+ 
+     <para os="x">The kernel configuration file <filename>.config</filename>
+     produced by the <command>make menuconfig</command> step above contains
+     all the configuration selections for the kernel that was just compiled.
+     It is a good idea to keep this file for future reference:</para>
+ 
+-<screen os="x1"><userinput>cp -v .config /boot/config-&linux-version;</userinput></screen>
++<screen os="x1"><userinput>cp -v .config /boot/config-&linux-version2;</userinput></screen>
+ 
+     <para os="y">It is important to note that the files in the kernel source
+     directory are not owned by <systemitem class="username">root</systemitem>.
+diff -ru /home/jp/a/BOOK/bootable/x86_64/kernel.xml BOOK/bootable/x86_64/kernel.xml
+--- /home/jp/a/BOOK/bootable/x86_64/kernel.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/x86_64/kernel.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -8,7 +8,7 @@
+ <sect1 id="ch-bootable-kernel" role="wrap">
+   <?dbhtml filename="kernel.html"?>
+ 
+-  <title>Linux-&linux-version;</title>
++  <title>Linux-&linux-version2;</title>
+ 
+   <indexterm zone="ch-bootable-kernel">
+     <primary sortas="a-Linux">Linux</primary>
+@@ -27,6 +27,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -39,6 +47,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='kc'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
++    xpointer="xpointer(//*[@os='kd'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -67,24 +83,12 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='p'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='q'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+-    xpointer="xpointer(//*[@os='r'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='t'])"/>
+-    
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+@@ -101,7 +105,7 @@
+     href="../x86/kernel.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
+-<screen><userinput>cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version;</userinput></screen>
++<screen><userinput>cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../x86/kernel.xml"
+diff -ru /home/jp/a/BOOK/bootable/x86_64-64-chapter.xml BOOK/bootable/x86_64-64-chapter.xml
+--- /home/jp/a/BOOK/bootable/x86_64-64-chapter.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/bootable/x86_64-64-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/bootable/x86_64-chapter.xml BOOK/bootable/x86_64-chapter.xml
+--- /home/jp/a/BOOK/bootable/x86_64-chapter.xml	2014-05-11 16:24:52.614516679 +0200
++++ BOOK/bootable/x86_64-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
+ 
+diff -ru /home/jp/a/BOOK/bootable/x86-chapter.xml BOOK/bootable/x86-chapter.xml
+--- /home/jp/a/BOOK/bootable/x86-chapter.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/bootable/x86-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,6 @@
+   <title>Making the CLFS System Bootable</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/fstab.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
+ 
+Seulement dans /home/jp/a/BOOK/: bootscripts
+diff -ru /home/jp/a/BOOK/chroot/64/createfiles.xml BOOK/chroot/64/createfiles.xml
+--- /home/jp/a/BOOK/chroot/64/createfiles.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/64/createfiles.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -19,15 +19,27 @@
+ <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
+ ln -sv /tools/bin/file /usr/bin
+ ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+-ln -sv /tools/lib/libstd* /usr/lib
+-ln -sv bash /bin/sh
+-ln -sv /run /var/run</userinput></screen>
++ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
++sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
++ln -sv bash /bin/sh</userinput></screen>
++
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++  href="../../boot/common/createfiles.xml"
++  xpointer="xpointer(//*[@os='c'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../../boot/64/createfiles.xml"
+-  xpointer="xpointer(//*[@os='b'])"/>
++  xpointer="xpointer(//*[@os='f'])"/>
+ 
+ <screen><userinput>mkdir -pv /usr/lib64
+-ln -sv /tools/lib/libstd*so* /usr/lib64</userinput></screen>
++ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib64</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/createfiles.xml"
++    xpointer="xpointer(//*[@os='d'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/createfiles.xml"
++    xpointer="xpointer(//*[@os='e'])"/>
+ 
+ </sect1>
+Seulement dans /home/jp/a/BOOK/chroot: alpha-chapter.xml
+diff -ru /home/jp/a/BOOK/chroot/common/changingowner.xml BOOK/chroot/common/changingowner.xml
+--- /home/jp/a/BOOK/chroot/common/changingowner.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/common/changingowner.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -10,32 +10,24 @@
+ 
+   <title>Changing Ownership</title>
+ 
+-    <note>
+-      <para>This step is not optional as some of the binaries in 
+-      <filename class="directory">/tools</filename> are set u+s.
+-      leaving the permissions as is could cause some commands,
+-      mount in particular, to fail later.</para>
+-    </note>
+-
+     <para os="a">Currently, the <filename class="directory">/tools</filename>
+     and <filename class="directory">/cross-tools</filename> directories
+     are owned by the user <emphasis>clfs</emphasis>, a user that
+-    exists only on the host system. Although the <filename
++    exists only on the host system. Although <filename
+     class="directory">/tools</filename> and <filename
+-    class="directory">/cross-tools</filename> directories can be deleted
+-    once the CLFS system has been finished, they can be retained to build
++    class="directory">/cross-tools</filename> can be deleted once the CLFS
++    system has been finished, they can be retained to build
+     additional CLFS systems. If the <filename class="directory">/tools</filename>
+     and <filename class="directory">/cross-tools</filename> directories are
+     kept as is, the files are owned by a user ID without a corresponding
+     account. This is dangerous because a user account created later could
+-    get this same user ID and would own the <filename
+-    class="directory">/tools</filename> directory and all the files therein,
+-    thus exposing these files to possible malicious manipulation.</para>
++    get this same user ID and would own these directories and all the files
++    therein, thus exposing those files to possible malicious manipulation.</para>
+ 
+-    <para os="b">To avoid this issue, add the <systemitem
+-    class="username">clfs</systemitem> user to the new CLFS system later when
+-    creating the <filename>/etc/passwd</filename> file, taking care to assign
+-    it the same user and group IDs as on the host system. Alternatively,
++    <para os="b">One possible fix for this issue might be to add the
++    <systemitem class="username">clfs</systemitem> user to the new CLFS system
++    later when creating the <filename>/etc/passwd</filename> file, taking care
++    to assign it the same user and group IDs as on the host system. Alternatively,
+     assign the contents of the <filename class="directory">/tools</filename>
+     and <filename class="directory">/cross-tools</filename> directories to
+     user <systemitem class="username">root</systemitem> by running the
+diff -ru /home/jp/a/BOOK/chroot/common/createfiles.xml BOOK/chroot/common/createfiles.xml
+--- /home/jp/a/BOOK/chroot/common/createfiles.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/common/createfiles.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -10,15 +10,74 @@
+ 
+   <title>Creating Essential Symlinks</title>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../../boot/common/createfiles.xml"
+-  xpointer="xpointer(//*[@os='a'])"/>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../boot/common/createfiles.xml"
++    xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
+ ln -sv /tools/bin/file /usr/bin
+ ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+-ln -sv /tools/lib/libstd* /usr/lib
+-ln -sv bash /bin/sh
+-ln -sv /run /var/run</userinput></screen>
++ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
++sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
++ln -sv bash /bin/sh</userinput></screen>
++
++    <variablelist os="c">
++      <title>The purpose of each link:</title>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c1'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c2'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c3'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c4'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c6'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c7'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c8'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c9'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c10'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c11'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c12'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../../boot/common/createfiles.xml"
++      xpointer="xpointer(//*[@os='c13'])"/>
++
++    </variablelist>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../boot/common/createfiles.xml"
++    xpointer="xpointer(//*[@os='d'])"/>
++
++<screen os="e"><userinput>ln -sv /proc/self/mounts /etc/mtab</userinput></screen>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/common/creatingdirs.xml BOOK/chroot/common/creatingdirs.xml
+--- /home/jp/a/BOOK/chroot/common/creatingdirs.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/common/creatingdirs.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,32 +12,30 @@
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../../boot/common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='a'])"/>
++  xpointer="xpointer(//*[@os='b'])"/>
+ 
+-<screen os="b"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
++<screen os="c"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+ mkdir -pv /{proc,media/{floppy,cdrom},run/shm,sbin,srv,sys}
+ mkdir -pv /var/{lock,log,mail,spool}
+ mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
+ install -dv -m 0750 /root
+ install -dv -m 1777 {/var,}/tmp
++ln -sv ../run /var/run
+ mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
+ mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
+ mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
+-mkdir -pv /usr/{,local/}share/man/man{1..8}
+-for dir in /usr{,/local}; do
+-  ln -sv share/{man,doc,info} $dir
+-done</userinput></screen>
++mkdir -pv /usr/{,local/}share/man/man{1..8}</userinput></screen>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../../boot/common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='c'])"/>
++  xpointer="xpointer(//*[@os='d'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../../boot/common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='d'])"/>
++  xpointer="xpointer(//*[@os='e'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../../boot/common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='e'])"/>
++  xpointer="xpointer(//*[@os='f'])"/>
+ 
+ </sect1>
+Seulement dans /home/jp/a/BOOK/chroot/common: devices.xml
+diff -ru /home/jp/a/BOOK/chroot/common/kernfs.xml BOOK/chroot/common/kernfs.xml
+--- /home/jp/a/BOOK/chroot/common/kernfs.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/common/kernfs.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -10,9 +10,13 @@
+ 
+   <title>Mounting Virtual Kernel File Systems</title>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../boot/common/devices.xml"
+-    xpointer="xpointer(//*[@os='a'])"/>
++    <note os="a">
++      <para>The commands in the remainder of the book should be run as
++      the <systemitem class="username">root</systemitem> user. Check
++      that ${CLFS} is set in the
++      <systemitem class="username">root</systemitem> user’s environment
++       before proceeding.</para>
++    </note>
+ 
+   <para>Various file systems exported by the kernel are used to communicate
+   to and from the kernel itself. These file systems are virtual in that no
+@@ -22,45 +26,39 @@
+   <para>Begin by creating directories onto which the file systems will
+   be mounted:</para>
+ 
+-<screen><userinput>mkdir -pv ${CLFS}/{dev,proc,sys}</userinput></screen>
++<screen><userinput>mkdir -pv ${CLFS}/{dev,proc,run,sys}</userinput></screen>
+ 
+-  <para>Now mount the file systems:</para>
+-
+-<screen><userinput>mount -vt proc proc ${CLFS}/proc
+-mount -vt sysfs sysfs ${CLFS}/sys</userinput></screen>
+-
+-  <para>Remember that if for any reason you stop working on the CLFS system
+-  and start again later, it is important to check that these file systems
+-  are mounted again before entering the chroot environment.</para>
+-
+-  <para>Two device nodes, /dev/console and /dev/null, are required to be
+-  present on the filesystem.  These are needed by the kernel even before
+-  starting Eudev early in the boot process, so we create them here:</para>
++  <para>Two device nodes, <filename class="devicefile">/dev/console</filename>
++  and <filename class="devicefile">/dev/null</filename>, are required to be
++  present on the file system. These are needed by the kernel even before
++  starting Udev early in the boot process, so we create them here:</para>
+ 
+ <screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
+ mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
+ 
+   <para>Once the system is complete and booting, the rest of our device
+-  nodes are created by the Eudev package.  Since this package is not
+-  available to us right now, we must take other steps to provide device
+-  nodes under on the CLFS filesystem.  We will use the <quote>bind</quote>
+-  option in the mount command to make our host system's /dev structure
+-  appear in the new CLFS filesystem:</para>
++  nodes will be created by the kernel's
++  <systemitem class="filesystem">devtmpfs</systemitem> file system. For now
++  though, we will just use the <quote>bind</quote> option in the mount command
++  to make our host system's <filename class="directory">/dev</filename> structure appear in the new CLFS file system:</para>
+ 
+ <screen><userinput>mount -v -o bind /dev ${CLFS}/dev</userinput></screen>
+ 
+-  <para>Additional file systems will soon be mounted from within the chroot 
+-  environment. To keep the host up to date, perform a <quote>fake mount</quote>
+-  for each of these now:</para>
+-
+-<screen><userinput>if [ -h ${CLFS}/dev/shm ]; then
+-  link=$(readlink ${CLFS}/dev/shm)
+-  mkdir -p ${CLFS}/$link
+-  mount -f -vt tmpfs shm ${CLFS}/$link
+-  unset link
+-else
+-  mount -f -vt tmpfs shm ${CLFS}/dev/shm
+-fi
+-mount -f -vt devpts -o gid=&gid-tty;,mode=620 devpts ${CLFS}/dev/pts</userinput></screen>
++  <para>Now mount the remaining file systems:</para>
++
++<screen><userinput>mount -vt devpts -o gid=&gid-tty;,mode=620 devpts ${CLFS}/dev/pts
++mount -vt proc proc ${CLFS}/proc
++mount -vt tmpfs tmpfs ${CLFS}/run
++mount -vt sysfs sysfs ${CLFS}/sys</userinput></screen>
++
++  <para>On some host systems, <filename class="directory">/dev/shm</filename>
++  is a symbolic link to <filename class="directory">/run/shm</filename>.
++  If it is, create a directory in <filename class="directory">/run</filename>:</para>
++
++<screen><userinput>[ -h ${CLFS}/dev/shm ] && mkdir -pv ${CLFS}/$(readlink ${CLFS}/dev/shm)</userinput></screen>
++
++  <para>Remember that if for any reason you stop working on the CLFS system
++  and start again later, it is important to check that these file systems
++  are mounted again before entering the chroot environment.</para>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/common/pwdgroup.xml BOOK/chroot/common/pwdgroup.xml
+--- /home/jp/a/BOOK/chroot/common/pwdgroup.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/common/pwdgroup.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -8,41 +8,31 @@
+ <sect1 id="ch-chroot-pwdgroup">
+   <?dbhtml filename="pwdgroup.html"?>
+ 
+-  <title>Creating the passwd, group, and log Files</title>
++  <title>Creating the passwd and group Files</title>
+ 
+   <indexterm zone="ch-chroot-pwdgroup">
+     <primary sortas="e-/etc/passwd">/etc/passwd</primary>
++    <secondary>chroot</secondary>
+   </indexterm>
+ 
+   <indexterm zone="ch-chroot-pwdgroup">
+     <primary sortas="e-/etc/group">/etc/group</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-chroot-pwdgroup">
+-    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-chroot-pwdgroup">
+-    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-chroot-pwdgroup">
+-    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
+-  </indexterm>
+-
+-  <indexterm zone="ch-chroot-pwdgroup">
+-    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
++    <secondary>chroot</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../../boot/common/pwdgroup.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
+-  
++
+   <para>Create the <filename>/etc/passwd</filename> file by running the
+   following command:</para>
+ 
+ <screen><userinput>cat > /etc/passwd << "EOF"
+ <literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
++<literal>bin:x:&uid-bin;:&gid-bin;:/bin:/bin/false</literal>
++<literal>daemon:x:&uid-daemon;:&gid-daemon;:/sbin:/bin/false</literal>
++<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
++<literal>nobody:x:&uid-nobody;:&gid-nogroup;:Unprivileged User:/dev/null:/bin/false</literal>
+ EOF</userinput></screen>
+ 
+   <para os="b">The actual password for
+@@ -72,7 +62,13 @@
+ video:x:&gid-video;:
+ utmp:x:&gid-utmp;:
+ usb:x:&gid-usb;:
+-cdrom:x:&gid-cdrom;:</literal>
++cdrom:x:&gid-cdrom;:
++adm:x:&gid-adm;:
++messagebus:x:&gid-messagebus;:
++systemd-journal:x:&gid-systemd-journal;:
++mail:x:&gid-mail;:
++wheel:x:&gid-wheel;:
++nogroup:x:&gid-nogroup;:</literal>
+ EOF</userinput></screen>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -98,19 +94,4 @@
+   they are installed, the <parameter>+h</parameter> directive will be used
+   for the duration of the next chapters.</para>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../../boot/common/pwdgroup.xml"
+-  xpointer="xpointer(//*[@os='f'])"/>
+-
+-<screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
+-chgrp -v utmp /var/run/utmp /var/log/lastlog
+-chmod -v 664 /var/run/utmp /var/log/lastlog
+-chmod -v 600 /var/log/btmp</userinput></screen>
+-
+-  <para>The <filename>/var/run/utmp</filename> file records the users that
+-  are currently logged in. The <filename>/var/log/wtmp</filename> file records
+-  all logins and logouts. The <filename>/var/log/lastlog</filename> file
+-  records when each user last logged in. The <filename>/var/log/btmp</filename>
+-  file records the bad login attempts.</para>
+-
+ </sect1>
+Seulement dans /home/jp/a/BOOK/chroot/common: util-linux.xml
+diff -ru /home/jp/a/BOOK/chroot/mips/creatingdirs.xml BOOK/chroot/mips/creatingdirs.xml
+--- /home/jp/a/BOOK/chroot/mips/creatingdirs.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/mips/creatingdirs.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,11 +12,11 @@
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='a'])"/>
++  xpointer="xpointer(//*[@os='b'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='b'])"/>
++  xpointer="xpointer(//*[@os='c'])"/>
+ 
+    <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
+    if you are utilizing the Colo bootloader:</para>
+@@ -26,14 +26,14 @@
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='c'])"/>
++  xpointer="xpointer(//*[@os='d'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='d'])"/>
++  xpointer="xpointer(//*[@os='e'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='e'])"/>
++  xpointer="xpointer(//*[@os='f'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/mips64/createfiles.xml BOOK/chroot/mips64/createfiles.xml
+--- /home/jp/a/BOOK/chroot/mips64/createfiles.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/chroot/mips64/createfiles.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -19,10 +19,18 @@
+ ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+ ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32
+ ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
+-ln -sv /tools/lib/libstd* /usr/lib
+-ln -sv /tools/lib32/libstd* /usr/lib32
+-ln -sv /tools/lib64/libstd* /usr/lib64
+-ln -sv bash /bin/sh
+-ln -sv /run /var/run</userinput></screen>
++ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
++ln -sv /tools/lib32/libstdc++.so{.6,} /usr/lib32
++ln -sv /tools/lib64/libstdc++.so{.6,} /usr/lib64
++sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
++ln -sv bash /bin/sh</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../boot/common/createfiles.xml"
++    xpointer="xpointer(//*[@os='c'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/createfiles.xml"
++    xpointer="xpointer(//*[@os='d'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/mips64/creatingdirs.xml BOOK/chroot/mips64/creatingdirs.xml
+--- /home/jp/a/BOOK/chroot/mips64/creatingdirs.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/chroot/mips64/creatingdirs.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='a'])"/>
++  xpointer="xpointer(//*[@os='b'])"/>
+ 
+ <screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
+ mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
+@@ -20,13 +20,11 @@
+ mkdir -pv /var/{opt,cache,lib{,32,64}/{misc,locate},local}
+ install -dv /root -m 0750
+ install -dv {/var,}/tmp -m 1777
++ln -sv ../run /var/run
+ mkdir -pv /usr/{,local/}{bin,include,lib{,32,64},sbin,src}
+ mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
+ mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
+ mkdir -pv /usr/{,local/}share/man/man{1..8}
+-for dir in /usr{,/local}; do
+-  ln -sv share/{man,doc,info} $dir
+-done
+ install -dv /usr/lib/locale
+ ln -sv ../lib/locale /usr/lib32
+ ln -sv ../lib/locale /usr/lib64</userinput></screen>
+@@ -41,14 +39,14 @@
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='c'])"/>
++  xpointer="xpointer(//*[@os='d'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='d'])"/>
++  xpointer="xpointer(//*[@os='e'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='e'])"/>
++  xpointer="xpointer(//*[@os='f'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/mips64-64-chapter.xml BOOK/chroot/mips64-64-chapter.xml
+--- /home/jp/a/BOOK/chroot/mips64-64-chapter.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/chroot/mips64-64-chapter.xml	2014-10-03 20:44:43.900339261 +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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+@@ -20,6 +19,5 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.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/chroot/mips64-chapter.xml BOOK/chroot/mips64-chapter.xml
+--- /home/jp/a/BOOK/chroot/mips64-chapter.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/mips64-chapter.xml	2014-10-03 20:44:43.900339261 +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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+@@ -20,6 +19,5 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.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/chroot/mips-chapter.xml BOOK/chroot/mips-chapter.xml
+--- /home/jp/a/BOOK/chroot/mips-chapter.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/mips-chapter.xml	2014-10-03 20:44:43.900339261 +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="mips/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="mips/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/chroot/multilib/createfiles.xml BOOK/chroot/multilib/createfiles.xml
+--- /home/jp/a/BOOK/chroot/multilib/createfiles.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/multilib/createfiles.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -20,7 +20,18 @@
+ ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
+ ln -sv /tools/lib/libstd* /usr/lib
+ ln -sv /tools/lib64/libstd* /usr/lib64
+-ln -sv bash /bin/sh
+-ln -sv /run /var/run</userinput></screen>
++ln -sv bash /bin/sh</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../boot/common/createfiles.xml"
++    xpointer="xpointer(//*[@os='c'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/createfiles.xml"
++    xpointer="xpointer(//*[@os='d'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/createfiles.xml"
++    xpointer="xpointer(//*[@os='d'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/multilib/creatingdirs.xml BOOK/chroot/multilib/creatingdirs.xml
+--- /home/jp/a/BOOK/chroot/multilib/creatingdirs.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/multilib/creatingdirs.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='a'])"/>
++  xpointer="xpointer(//*[@os='b'])"/>
+ 
+ <screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
+ mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
+@@ -20,26 +20,24 @@
+ mkdir -pv /var/{opt,cache,lib{,64}/{misc,locate},local}
+ install -dv /root -m 0750
+ install -dv {/var,}/tmp -m 1777
++ln -sv ../run /var/run
+ mkdir -pv /usr/{,local/}{bin,include,lib{,64},sbin,src}
+ mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
+ mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
+ mkdir -pv /usr/{,local/}share/man/man{1..8}
+-for dir in /usr{,/local}; do
+-  ln -sv share/{man,doc,info} $dir
+-done
+ install -dv /usr/lib/locale
+ ln -sv ../lib/locale /usr/lib64</userinput></screen>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='c'])"/>
++  xpointer="xpointer(//*[@os='d'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='d'])"/>
++  xpointer="xpointer(//*[@os='e'])"/>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   href="../common/creatingdirs.xml"
+-  xpointer="xpointer(//*[@os='e'])"/>
++  xpointer="xpointer(//*[@os='f'])"/>
+ 
+ </sect1>
+Seulement dans /home/jp/a/BOOK/chroot/multilib: util-linux.xml
+diff -ru /home/jp/a/BOOK/chroot/ppc64-64-chapter.xml BOOK/chroot/ppc64-64-chapter.xml
+--- /home/jp/a/BOOK/chroot/ppc64-64-chapter.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/chroot/ppc64-64-chapter.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -12,13 +12,11 @@
+   <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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+   <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="64/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/chroot/ppc64-chapter.xml BOOK/chroot/ppc64-chapter.xml
+--- /home/jp/a/BOOK/chroot/ppc64-chapter.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/chroot/ppc64-chapter.xml	2014-10-03 20:44:43.900339261 +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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+@@ -20,6 +19,5 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/flags.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/chroot/ppc-chapter.xml BOOK/chroot/ppc-chapter.xml
+--- /home/jp/a/BOOK/chroot/ppc-chapter.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/ppc-chapter.xml	2014-10-03 20:44:43.900339261 +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="ppc/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/chroot/sparc64/flags.xml BOOK/chroot/sparc64/flags.xml
+--- /home/jp/a/BOOK/chroot/sparc64/flags.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/sparc64/flags.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -30,11 +30,11 @@
+ EOF</userinput></screen>
+ 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-   href="../../cross-tools/sparc64/flags.xml"
+-   xpointer="xpointer(//*[@os='e'])"/>
++   href="../../final-preps/sparc64/variables.xml"
++   xpointer="xpointer(//*[@os='k'])"/>
+ 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-   href="../../cross-tools/sparc64/flags.xml"
+-   xpointer="xpointer(//*[@os='f'])"/>
++   href="../../final-preps/sparc64/variables.xml"
++   xpointer="xpointer(//*[@os='l'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/sparc64-64/flags.xml BOOK/chroot/sparc64-64/flags.xml
+--- /home/jp/a/BOOK/chroot/sparc64-64/flags.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/sparc64-64/flags.xml	2014-10-03 20:44:43.900339261 +0200
+@@ -21,11 +21,11 @@
+ <screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ~/.bash_profile</userinput></screen>
+ 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-   href="../../cross-tools/sparc64-64/flags.xml"
+-   xpointer="xpointer(//*[@os='e'])"/>
++   href="../../final-preps/sparc64-64/variables.xml"
++   xpointer="xpointer(//*[@os='k'])"/>
+ 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-   href="../../cross-tools/sparc64-64/flags.xml"
+-   xpointer="xpointer(//*[@os='f'])"/>
++   href="../../final-preps/sparc64-64/variables.xml"
++   xpointer="xpointer(//*[@os='l'])"/>
+ 
+ </sect1>
+diff -ru /home/jp/a/BOOK/chroot/sparc64-64-chapter.xml BOOK/chroot/sparc64-64-chapter.xml
+--- /home/jp/a/BOOK/chroot/sparc64-64-chapter.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/chroot/sparc64-64-chapter.xml	2014-10-03 20:44:43.900339261 +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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+@@ -20,6 +19,5 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.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/chroot/sparc64-chapter.xml BOOK/chroot/sparc64-chapter.xml
+--- /home/jp/a/BOOK/chroot/sparc64-chapter.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/sparc64-chapter.xml	2014-10-03 20:44:43.900339261 +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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+@@ -20,6 +19,5 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.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/chroot/sparc-chapter.xml BOOK/chroot/sparc-chapter.xml
+--- /home/jp/a/BOOK/chroot/sparc-chapter.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/sparc-chapter.xml	2014-10-03 20:44:43.900339261 +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="sparc/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/chroot/x86/before-chroot.xml BOOK/chroot/x86/before-chroot.xml
+--- /home/jp/a/BOOK/chroot/x86/before-chroot.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/x86/before-chroot.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -45,9 +45,10 @@
+   <sect2 role="using-setarch">
+     <title>Using Setarch</title>
+ 
+-    <para>If your host has a tool called <command>setarch</command> this may
+-    solve your problems. The reason for saying may is because on a architecture
+-    such as x86_64, using <command>setarch linux32 uname -m</command> will only
++    <para>If your host has a tool called <command>setarch</command>, this may
++    solve your problems, at least if you're building for i686. On an
++    architecture such as x86_64, using
++    <command>setarch linux32 uname -m</command> will only
+     ever output i686. It is not possible to get an output of i486 or i586.</para>
+ 
+     <para>To test if setarch does everything you need it to, execute the
+diff -ru /home/jp/a/BOOK/chroot/x86_64-64-chapter.xml BOOK/chroot/x86_64-64-chapter.xml
+--- /home/jp/a/BOOK/chroot/x86_64-64-chapter.xml	2014-05-11 16:24:52.622516679 +0200
++++ BOOK/chroot/x86_64-64-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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+@@ -20,6 +19,5 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.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/chroot/x86_64-chapter.xml BOOK/chroot/x86_64-chapter.xml
+--- /home/jp/a/BOOK/chroot/x86_64-chapter.xml	2014-05-11 16:24:52.618516679 +0200
++++ BOOK/chroot/x86_64-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="multilib/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="common/chroot.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+@@ -20,6 +19,5 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.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/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>
+Seulement dans BOOK/cross-tools/64: binutils.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/64: eglibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/64: flags.xml
+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'])"/>
+ 
+Seulement dans BOOK/cross-tools/64: glibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools: alpha
+Seulement dans /home/jp/a/BOOK/cross-tools: alpha-chapter.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/common: bc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/common: binutils-32.xml
+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">
+Seulement dans /home/jp/a/BOOK/cross-tools/common: cflags.xml
+diff -ru /home/jp/a/BOOK/cross-tools/common/cloog.xml BOOK/cross-tools/common/cloog.xml
+--- /home/jp/a/BOOK/cross-tools/common/cloog.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/cloog.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-cloog">
+     <primary sortas="a-CLooG">CLooG</primary>
+-    <secondary>cross-tools</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -32,9 +32,8 @@
+     href="../../final-system/common/cloog.xml"
+     xpointer="xpointer(//*[@os='s1'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../../final-system/common/cloog.xml"
+-    xpointer="xpointer(//*[@os='s2'])"/>
++<screen os="s2"><userinput>cp -v Makefile{,.orig}
++sed '/cmake/d' Makefile.orig > Makefile</userinput></screen>
+ 
+     <para os="c">Compile the package:</para>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/common: eglibc.xml
+diff -ru /home/jp/a/BOOK/cross-tools/common/file.xml BOOK/cross-tools/common/file.xml
+--- /home/jp/a/BOOK/cross-tools/common/file.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/file.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-file">
+     <primary sortas="a-File">File</primary>
+-    <secondary>cross-tools</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -22,6 +22,17 @@
+   <sect2 role="installation">
+     <title>Installation of File</title>
+ 
++    <para>One method that <command>file</command> uses for identifying a given
++    file is to run <quote>magic tests</quote>, where it compares the file's
++    contents to data in <quote>magic files</quote>, which contain information
++    about a number of standard file formats. When File is compiled, it will run
++    <command>file -C</command> to combine the information from the
++    magic files in its source tree into a single <filename>magic.mgc</filename>
++    file, which it will use after it is installed. When we build File in 
++    <xref linkend="chapter-temp-system"/>, it will be cross-compiled, so it
++    will not be able to run the <command>file</command> program that it just
++    built, which means that we need one that will run on the host system.</para>
++
+     <para>Prepare File for compilation:</para>
+ 
+ <screen><userinput>./configure --prefix=/cross-tools --disable-static</userinput></screen>
+diff -ru /home/jp/a/BOOK/cross-tools/common/gcc-final.xml BOOK/cross-tools/common/gcc-final.xml
+--- /home/jp/a/BOOK/cross-tools/common/gcc-final.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/gcc-final.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -59,17 +59,15 @@
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+-  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+-  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
+-  --with-native-system-header-dir=/tools/include --disable-nls \
+-  --enable-shared --disable-static --enable-languages=c,c++ \
+-  --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+-  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
+-  --with-gmp=/cross-tools --with-cloog=/cross-tools \
+-  --enable-cloog-backend=isl --with-isl=/cross-tools \
+-  --disable-isl-version-check --with-system-zlib --enable-checking=release \
+-  --enable-libstdcxx-time</userinput></screen>
++    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
++    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
++    --with-sysroot=${CLFS} --with-local-prefix=/tools \
++    --with-native-system-header-dir=/tools/include --disable-nls \
++    --disable-static --enable-languages=c,c++ --enable-__cxa_atexit \
++    --enable-threads=posix --disable-multilib \
++    --with-mpc=/cross-tools --with-mpfr=/cross-tools --with-gmp=/cross-tools \
++    --with-cloog=/cross-tools --with-isl=/cross-tools --with-system-zlib \
++    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
+ 
+     <variablelist os="bg">
+       <title>The meaning of the new configure options:</title>
+@@ -93,23 +91,18 @@
+       </varlistentry>
+ 
+       <varlistentry os="bg3">
+-        <term><parameter>--enable-c99</parameter></term>
++        <term><parameter>--enable-threads=posix</parameter></term>
+         <listitem>
+-          <para>Enable C99 support for C programs.</para>
++          <para>This enables C++ exception handling for multi-threaded code.</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry os="bg4">
+-        <term><parameter>--enable-long-long</parameter></term>
+-        <listitem>
+-          <para>Enables long long support in the compiler.</para>
+-        </listitem>
+-      </varlistentry>
+-
+-      <varlistentry os="bg5">
+-        <term><parameter>--enable-threads=posix</parameter></term>
++        <term><parameter>--enable-libstdcxx-time</parameter></term>
+         <listitem>
+-          <para>This enables C++ exception handling for multi-threaded code.</para>
++          <para>This enables link-time checks for the availability of
++          clock_gettime clocks, and nanosleep and sched_yield functions, in the
++          C library.</para>
+         </listitem>
+       </varlistentry>
+ 
+diff -ru /home/jp/a/BOOK/cross-tools/common/gcc-static.xml BOOK/cross-tools/common/gcc-static.xml
+--- /home/jp/a/BOOK/cross-tools/common/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/gcc-static.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -23,6 +23,16 @@
+     <title>Installation of Cross GCC Compiler with Static libgcc
+     and no Threads</title>
+ 
++    <para os="e">Here we will compile GCC, as a cross-compiler that will create
++    executables for our target architecture, statically so that it will not
++    need to look for Glibc's startfiles, which do not yet exist in
++    <filename class="directory">/tools</filename>. We will use this
++    cross-compiler, plus the cross-linker we have just installed with Binutils,
++    to compile Glibc. After Glibc is installed into
++    <filename class="directory">/tools</filename>, we can rebuild GCC
++    so that it will then be able to build executables that link against the
++    libraries in <filename class="directory">/tools</filename>.</para>
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/gcc.xml"
+     xpointer="xpointer(//*[@os='p1'])"/>
+@@ -31,17 +41,16 @@
+     href="../../final-system/common/gcc.xml"
+     xpointer="xpointer(//*[@os='p2'])"/>
+ 
+-    <para os="aa">Make a couple of essential adjustments to the
+-    <filename>specs</filename> file to ensure GCC uses our build
+-    environment:</para>
++    <para os="aa">Make a couple of essential adjustments to GCC's specs
++    to ensure GCC uses our build environment:</para>
+ 
+ <screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
+ 
+-    <para os="ag">Change the StartFile Spec so that GCC looks in 
++    <para os="ag">Change the StartFile Spec so that GCC looks in
+ <filename class="directory">/tools</filename>:</para>
+ 
+-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
+-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h</userinput></screen>
++<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
++echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h</userinput></screen>
+ 
+     <para os="t1">We will create a dummy <filename>limits.h</filename> so
+     the build will not use the one provided by the host distro:</para>
+@@ -61,30 +70,30 @@
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+-  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+-  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
+-  --with-native-system-header-dir=/tools/include --disable-nls \
+-  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+-  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
+-  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
+-  --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
+-  --disable-libatomic --disable-libitm --disable-libsanitizer \
+-  --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
+-  --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
+-  --enable-languages=c --enable-checking=release</userinput></screen>
++    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
++    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
++    --with-sysroot=${CLFS} --with-local-prefix=/tools \
++    --with-native-system-header-dir=/tools/include --disable-nls \
++    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
++    --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
++    --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
++    --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
++    --disable-libsanitizer --disable-libquadmath --disable-threads \
++    --disable-multilib --disable-target-zlib --with-system-zlib \
++    --enable-languages=c --enable-checking=release</userinput></screen>
+ 
+     <variablelist os="am">
+       <title>The meaning of the new configure options:</title>
+ 
+       <varlistentry>
+-        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
++        <term><parameter>--build=${CLFS_HOST}</parameter></term>
+         <listitem>
+-          <para>Tells GCC to consider ${CLFS} as the root file system.</para>
++          <para>This specifies the system on which the cross-compiler is being
++          built.</para>
+         </listitem>
+       </varlistentry>
+ 
+-     <varlistentry>
++      <varlistentry>
+         <term><parameter>--with-local-prefix=/tools</parameter></term>
+         <listitem>
+           <para>The purpose of this switch is to remove <filename
+@@ -95,7 +104,6 @@
+         </listitem>
+       </varlistentry>
+ 
+-
+       <varlistentry>
+         <term><parameter>--with-native-system-headers-dir=/tools/include</parameter></term>
+         <listitem>
+@@ -106,10 +114,9 @@
+       </varlistentry>
+ 
+       <varlistentry>
+-        <term><parameter>--disable-nls</parameter></term>
++        <term><parameter>--disable-shared</parameter></term>
+         <listitem>
+-          <para>This disables internationalization as i18n is not needed for the
+-          cross-compile tools.</para>
++          <para>This tells GCC not to create a shared library.</para>
+         </listitem>
+       </varlistentry>
+ 
+@@ -123,7 +130,9 @@
+       <varlistentry>
+         <term><parameter>--with-newlib</parameter></term>
+         <listitem>
+-          <para>Tells GCC that the target libc will use 'newlib'.</para>
++          <para>This causes GCC to enable the <envar>inhibit_libc</envar> flag,
++          which prevents <filename class="libraryfile">libgcc</filename>
++          from building code that uses libc support.</para>
+         </listitem>
+       </varlistentry>
+ 
+@@ -135,23 +144,10 @@
+       </varlistentry>
+ 
+       <varlistentry>
+-        <term><parameter>--disable-libgomp</parameter></term>
+-        <listitem>
+-          <para>Disables the creation of runtime libraries used by GOMP.</para>
+-        </listitem>
+-      </varlistentry>
+-
+-      <varlistentry>
+-        <term><parameter>--disable-libmudflap</parameter></term>
++        <term><parameter>--disable-lib*</parameter></term>
+         <listitem>
+-          <para>Disables the creation of runtime libaries used by libmudflap.</para>
+-        </listitem>
+-      </varlistentry>
+-
+-      <varlistentry>
+-        <term><parameter>--disable-libssp</parameter></term>
+-        <listitem>
+-          <para>Disables the use of Stack Smashing Protection for runtime libraries.</para>
++          <para>These options prevent GCC from building a number of libraries
++          that are not needed at this time.</para>
+         </listitem>
+       </varlistentry>
+ 
+@@ -166,30 +162,18 @@
+       </varlistentry>
+ 
+       <varlistentry>
+-        <term><parameter>--disable-libatomic</parameter></term>
+-        <listitem>
+-          <para>The atomic library isn't needed at this time.</para>
+-        </listitem>
+-      </varlistentry>
+-
+-      <varlistentry>
+-        <term><parameter>--disable-libitm</parameter></term>
+-        <listitem>
+-          <para>The itm library isn't neeeded at this tiem.</para>
+-        </listitem>
+-      </varlistentry>
+-
+-      <varlistentry>
+-        <term><parameter>--disable-libsanitizer</parameter></term>
++        <term><parameter>--disable-target-zlib</parameter></term>
+         <listitem>
+-          <para>The sanitizer library isn't needed at this time.</para>
++          <para>This tells GCC not to build the copy of Zlib in its
++          source tree.</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+-        <term><parameter>--disable-libquadmath</parameter></term>
++        <term><parameter>--with-system-zlib</parameter></term>
+         <listitem>
+-          <para>The quadmath library isn't needed at this time.</para>
++          <para>This tells GCC to link to the system-installed zlib instead
++          of the one in its source tree.</para>
+         </listitem>
+       </varlistentry>
+ 
+Seulement dans BOOK/cross-tools/common: glibc.xml
+diff -ru /home/jp/a/BOOK/cross-tools/common/gmp.xml BOOK/cross-tools/common/gmp.xml
+--- /home/jp/a/BOOK/cross-tools/common/gmp.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/gmp.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-gmp">
+     <primary sortas="a-GMP">GMP</primary>
+-    <secondary>cross-tools</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -32,6 +32,10 @@
+     xpointer="xpointer(//*[@os='p2'])"/>
+ -->
+ 
++    <para>This package and the next two - MPFR and MPC - will be installed
++    into <filename class="directory">/cross-tools</filename> because GCC
++    requires them to build.</para>
++
+     <note os="n1">
+       <para>If you are building with a host which has 32-bit user-space with a
+       64-bit capable CPU, cross-tools GMP will attempt to link with 64-bit
+@@ -42,10 +46,10 @@
+     <para os="a">Prepare GMP for compilation:</para>
+ 
+ <screen os="b"><userinput>./configure --prefix=/cross-tools --enable-cxx \
+-  --disable-static</userinput></screen>
++    --disable-static</userinput></screen>
+ 
+     <variablelist os="b1">
+-      <title>The meaning of the new configure options:</title>
++      <title>The meaning of the new configure option:</title>
+ 
+       <varlistentry>
+         <term><parameter>--enable-cxx</parameter></term>
+diff -ru /home/jp/a/BOOK/cross-tools/common/isl.xml BOOK/cross-tools/common/isl.xml
+--- /home/jp/a/BOOK/cross-tools/common/isl.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/isl.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-isl">
+     <primary sortas="a-ISL">ISL</primary>
+-    <secondary>cross-tools</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -22,6 +22,10 @@
+   <sect2 role="installation">
+     <title>Installation of ISL</title>
+ 
++    <para>We will install ISL and CLooG to enable extra functionality for GCC.
++    They are not strictly required, but GCC can link to them to enable its
++    new loop generation feature called Graphite.</para>
++
+     <para os="a">Prepare ISL for compilation:</para>
+ 
+ <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+diff -ru /home/jp/a/BOOK/cross-tools/common/m4.xml BOOK/cross-tools/common/m4.xml
+--- /home/jp/a/BOOK/cross-tools/common/m4.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/m4.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-m4">
+     <primary sortas="a-M4">M4</primary>
+-    <secondary>temporary system</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -22,6 +22,12 @@
+   <sect2 role="installation">
+     <title>Installation of M4</title>
+ 
++    <para>M4 is required to build GMP. We will compile and install an
++    <command>m4</command> program into
++    <filename class="directory">/cross-tools</filename>, so that we have a
++    known-good version which can be used to build GMP, both in
++    Cross-Tools and the Temporary System.</para>
++
+     <para os="a">Prepare M4 for compilation:</para>
+ 
+ <screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen>
+diff -ru /home/jp/a/BOOK/cross-tools/common/mpc.xml BOOK/cross-tools/common/mpc.xml
+--- /home/jp/a/BOOK/cross-tools/common/mpc.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/mpc.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-mpc">
+     <primary sortas="a-MPC">MPC</primary>
+-    <secondary>cross-tools</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/cross-tools/common/mpfr.xml BOOK/cross-tools/common/mpfr.xml
+--- /home/jp/a/BOOK/cross-tools/common/mpfr.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/mpfr.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-mpfr">
+     <primary sortas="a-MPFR">MPFR</primary>
+-    <secondary>cross-tools</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -47,14 +47,6 @@
+         </listitem>
+       </varlistentry>
+ 
+-      <varlistentry>
+-        <term><parameter>--enable-shared</parameter></term>
+-        <listitem>
+-          <para>This tells <command>configure</command> to build MPFR's
+-          shared libraries.</para>
+-        </listitem>
+-      </varlistentry>
+-
+       <varlistentry>
+         <term><parameter>--with-gmp=/cross-tools</parameter></term>
+         <listitem>
+diff -ru /home/jp/a/BOOK/cross-tools/common/ncurses.xml BOOK/cross-tools/common/ncurses.xml
+--- /home/jp/a/BOOK/cross-tools/common/ncurses.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/common/ncurses.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,7 +12,7 @@
+ 
+   <indexterm zone="ch-cross-tools-ncurses">
+     <primary sortas="a-Ncurses">Ncurses</primary>
+-    <secondary>cross-tools</secondary>
++    <secondary>cross tools</secondary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -22,6 +22,16 @@
+   <sect2 role="installation">
+     <title>Installation of Ncurses</title>
+ 
++    <para os="e1">When Ncurses is compiled, it executes <command>tic</command>
++    to create a terminfo database in
++    <filename class="directory">${prefix}/share/terminfo</filename>. If
++    possible, the <filename>Makefile</filename> will use the
++    <command>tic</command> binary that was just compiled in its
++    source tree, but this does not work when Ncurses is cross-compiled. To
++    allow the Ncurses build in <xref linkend="chapter-temp-system" /> to succeed, we
++    will build and install a <command>tic</command> program that can be run on
++    the host system.</para>
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../temp-system/common/ncurses.xml"
+     xpointer="xpointer(//*[@os='p1'])"/>
+Seulement dans BOOK/cross-tools/common: pkg-config-lite.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips: eglibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips: gcc-final.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips: gcc-static.xml
+diff -ru /home/jp/a/BOOK/cross-tools/mips/linux-headers.xml BOOK/cross-tools/mips/linux-headers.xml
+--- /home/jp/a/BOOK/cross-tools/mips/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/mips/linux-headers.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -8,10 +8,10 @@
+ <sect1 id="ch-cross-tools-linux-headers" role="wrap">
+   <?dbhtml filename="linux-headers.html"?>
+ 
+-  <title>Linux-Headers-&linux-version;</title>
++  <title>Linux-&linux-version2; Headers</title>
+ 
+   <indexterm zone="ch-cross-tools-linux-headers">
+-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
++    <primary sortas="a-Linux Headers">Linux Headers</primary>
+     <secondary>cross tools</secondary>
+   </indexterm>
+ 
+@@ -20,13 +20,21 @@
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+-    <title>Installation of Linux-Headers</title>
++    <title>Installation of Linux Headers</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/mips: variables.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64: eglibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64: eglibc-n32.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64: eglibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64: flags.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64: gcc-final.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64: gcc-static.xml
+Seulement dans BOOK/cross-tools/mips64: glibc-n32.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64: variables.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64-64: eglibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64-64: flags.xml
+diff -ru /home/jp/a/BOOK/cross-tools/mips64-64/gcc-final.xml BOOK/cross-tools/mips64-64/gcc-final.xml
+--- /home/jp/a/BOOK/cross-tools/mips64-64/gcc-final.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/mips64-64/gcc-final.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -59,17 +59,16 @@
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+-  ../gcc-4.8.2/configure --prefix=/cross-tools \
+-  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
+-  --with-native-system-header-dir=/tools/include --disable-nls \
+-  --enable-shared --disable-static --enable-languages=c,c++ \
+-  --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+-  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
+-  --with-gmp=/cross-tools --with-cloog=/cross-tools \
+-  --enable-cloog-backend=isl --with-isl=/cross-tools \
+-  --disable-isl-version-check --with-system-zlib --enable-checking=release \
+-  --enable-libstdcxx-time --with-abi=64</userinput></screen>
++    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
++    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
++    --with-sysroot=${CLFS} --with-local-prefix=/tools \
++    --with-native-system-header-dir=/tools/include --disable-nls \
++    --disable-static --enable-languages=c,c++ \
++    --enable-__cxa_atexit --enable-threads=posix \
++    --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
++    --with-gmp=/cross-tools --with-cloog=/cross-tools \
++    --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
++    --enable-libstdcxx-time --with-abi=64</userinput></screen>
+ 
+     <variablelist os="bg">
+       <title>The meaning of the new configure options:</title>
+@@ -77,7 +76,8 @@
+       <varlistentry>
+         <term><parameter>--with-abi=64</parameter></term>
+         <listitem>
+-          <para>This option do ...</para>
++          <para>For MIPS64, GCC defaults to building for the N32 ABI. This
++          option changes the default to 64 bits.</para>
+         </listitem>
+       </varlistentry>
+ 
+@@ -97,10 +97,6 @@
+       href="../common/gcc-final.xml"
+       xpointer="xpointer(//*[@os='bg4'])"/>
+ 
+-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-      href="../common/gcc-final.xml"
+-      xpointer="xpointer(//*[@os='bg5'])"/>
+-
+     </variablelist>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/cross-tools/mips64-64/gcc-static.xml BOOK/cross-tools/mips64-64/gcc-static.xml
+--- /home/jp/a/BOOK/cross-tools/mips64-64/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/mips64-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'])"/>
+ 
+@@ -68,18 +72,17 @@
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+-  ../gcc-4.8.2/configure --prefix=/cross-tools \
+-  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
+-  --with-native-system-header-dir=/tools/include --disable-nls \
+-  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+-  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
+-  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
+-  --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
+-  --disable-libatomic --disable-libitm --disable-libsanitizer \
+-  --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
+-  --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
+-  --enable-languages=c --enable-checking=release --with-abi=64</userinput></screen>
++    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
++    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
++    --with-sysroot=${CLFS} --with-local-prefix=/tools \
++    --with-native-system-header-dir=/tools/include --disable-nls \
++    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
++    --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
++    --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
++    --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
++    --disable-libsanitizer --disable-libquadmath --disable-threads \
++    --disable-multilib --disable-target-zlib --with-system-zlib \
++    --enable-languages=c --enable-checking=release --with-abi=64</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gcc-static.xml"
+Seulement dans /home/jp/a/BOOK/cross-tools/mips64-64: variables.xml
+diff -ru /home/jp/a/BOOK/cross-tools/mips64-64-chapter.xml BOOK/cross-tools/mips64-64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/mips64-64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/mips64-64-chapter.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,22 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/mips64-chapter.xml BOOK/cross-tools/mips64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/mips64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/mips64-chapter.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,24 +12,21 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-final.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/mips-chapter.xml BOOK/cross-tools/mips-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/mips-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/mips-chapter.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,21 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc-final.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/multilib/binutils.xml BOOK/cross-tools/multilib/binutils.xml
+--- /home/jp/a/BOOK/cross-tools/multilib/binutils.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/multilib/binutils.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -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:/tools/lib64 \
+-  --disable-nls --disable-static --enable-64-bit-bfd</userinput></screen>
++    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
++    --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
++    --disable-nls --disable-static --enable-64-bit-bfd --disable-werror</userinput></screen>
+ 
+     <variablelist os="bd">
+       <title>The meaning of the configure options:</title>
+@@ -80,8 +80,12 @@
+       xpointer="xpointer(//*[@os='bd6'])"/>
+ 
+       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-      href="../common/binutils.xml"
+-      xpointer="xpointer(//*[@os='bd7'])"/>
++      href="../64/binutils.xml"
++      xpointer="xpointer(//*[@os='bd8'])"/>
++
++      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++      href="../64/binutils.xml"
++      xpointer="xpointer(//*[@os='bd9'])"/>
+ 
+     </variablelist>
+ 
+@@ -95,24 +99,12 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/binutils.xml"
+-    xpointer="xpointer(//*[@os='bg'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/binutils.xml"
+     xpointer="xpointer(//*[@os='bh'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/binutils.xml"
+     xpointer="xpointer(//*[@os='bi'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/binutils.xml"
+-    xpointer="xpointer(//*[@os='bj'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/binutils.xml"
+-    xpointer="xpointer(//*[@os='bk'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+Seulement dans /home/jp/a/BOOK/cross-tools/multilib: eglibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/multilib: eglibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/multilib: flags.xml
+diff -ru /home/jp/a/BOOK/cross-tools/multilib/gcc-final.xml BOOK/cross-tools/multilib/gcc-final.xml
+--- /home/jp/a/BOOK/cross-tools/multilib/gcc-final.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/multilib/gcc-final.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -59,17 +59,15 @@
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+-  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+-  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
+-  --with-native-system-header-dir=/tools/include \
+-  --disable-nls --enable-shared --disable-static \
+-  --enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 \
+-  --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \
+-  --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
+-  --enable-cloog-backend=isl --with-isl=/cross-tools \
+-  --disable-isl-version-check --with-system-zlib --enable-checking=release \
+-  --enable-libstdcxx-time</userinput></screen>
++    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
++    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
++    --with-sysroot=${CLFS} --with-local-prefix=/tools \
++    --with-native-system-header-dir=/tools/include \
++    --disable-nls --disable-static --enable-languages=c,c++ \
++    --enable-__cxa_atexit --enable-threads=posix --with-mpc=/cross-tools \
++    --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
++    --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
++    --enable-libstdcxx-time</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gcc-final.xml"
+diff -ru /home/jp/a/BOOK/cross-tools/multilib/gcc-static.xml BOOK/cross-tools/multilib/gcc-static.xml
+--- /home/jp/a/BOOK/cross-tools/multilib/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/multilib/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'])"/>
+ 
+@@ -68,18 +72,17 @@
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+-  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+-  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
+-  --with-native-system-header-dir=/tools/include --disable-nls \
+-  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+-  --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
+-  --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
+-  --disable-libssp --disable-threads --disable-libatomic --disable-libitm \
+-  --disable-libsanitizer --disable-libquadmath --disable-target-libiberty \
+-  --disable-target-zlib --with-system-zlib --enable-cloog-backend=isl \
+-  --with-isl=/cross-tools --disable-isl-version-check --enable-languages=c \
+-  --enable-checking=release</userinput></screen>
++    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
++    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
++    --with-sysroot=${CLFS} --with-local-prefix=/tools \
++    --with-native-system-header-dir=/tools/include --disable-nls \
++    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
++    --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
++    --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
++    --disable-libssp --disable-libatomic --disable-libitm \
++    --disable-libsanitizer --disable-libquadmath --disable-threads \
++    --disable-target-zlib --with-system-zlib --with-isl=/cross-tools \
++    --enable-languages=c --enable-checking=release</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gcc-static.xml"
+Seulement dans BOOK/cross-tools/multilib: glibc-64bit.xml
+Seulement dans BOOK/cross-tools/multilib: glibc.xml
+Seulement dans BOOK/cross-tools/multilib: pkg-config-lite.xml
+Seulement dans /home/jp/a/BOOK/cross-tools: pp64-64
+Seulement dans /home/jp/a/BOOK/cross-tools/ppc: eglibc.xml
+diff -ru /home/jp/a/BOOK/cross-tools/ppc/gcc-static.xml BOOK/cross-tools/ppc/gcc-static.xml
+--- /home/jp/a/BOOK/cross-tools/ppc/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/ppc/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'])"/>
+ 
+@@ -43,8 +47,8 @@
+     href="../common/gcc-static.xml"
+     xpointer="xpointer(//*[@os='ag'])"/>
+ 
+-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
+-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h</userinput></screen>
++<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
++echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gcc-static.xml"
+diff -ru /home/jp/a/BOOK/cross-tools/ppc/linux-headers.xml BOOK/cross-tools/ppc/linux-headers.xml
+--- /home/jp/a/BOOK/cross-tools/ppc/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/ppc/linux-headers.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -8,10 +8,10 @@
+ <sect1 id="ch-cross-tools-linux-headers" role="wrap">
+   <?dbhtml filename="linux-headers.html"?>
+ 
+-  <title>Linux-Headers-&linux-version;</title>
++  <title>Linux-&linux-version2; Headers</title>
+ 
+   <indexterm zone="ch-cross-tools-linux-headers">
+-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
++    <primary sortas="a-Linux Headers">Linux Headers</primary>
+     <secondary>cross tools</secondary>
+   </indexterm>
+ 
+@@ -20,13 +20,21 @@
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+-    <title>Installation of Linux-Headers</title>
++    <title>Installation of Linux Headers</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/ppc: variables.xml
+Seulement dans /home/jp/a/BOOK/cross-tools: ppc64
+Seulement dans /home/jp/a/BOOK/cross-tools/ppc64-64: eglibc.xml
+diff -ru /home/jp/a/BOOK/cross-tools/ppc64-64/gcc-static.xml BOOK/cross-tools/ppc64-64/gcc-static.xml
+--- /home/jp/a/BOOK/cross-tools/ppc64-64/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/ppc64-64/gcc-static.xml	2014-10-03 20:44:43.908339261 +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'])"/>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/ppc64-64: variables.xml
+diff -ru /home/jp/a/BOOK/cross-tools/ppc64-64-chapter.xml BOOK/cross-tools/ppc64-64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/ppc64-64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/ppc64-64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,22 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/ppc64-chapter.xml BOOK/cross-tools/ppc64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/ppc64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/ppc64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,23 +12,20 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc-final.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/ppc-chapter.xml BOOK/cross-tools/ppc-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/ppc-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/ppc-chapter.xml	2014-10-03 20:44:43.904339261 +0200
+@@ -12,21 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/sparc/linux-headers.xml BOOK/cross-tools/sparc/linux-headers.xml
+--- /home/jp/a/BOOK/cross-tools/sparc/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/sparc/linux-headers.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -8,10 +8,10 @@
+ <sect1 id="ch-cross-tools-linux-headers" role="wrap">
+   <?dbhtml filename="linux-headers.html"?>
+ 
+-  <title>Linux-Headers-&linux-version;</title>
++  <title>Linux-&linux-version2; Headers</title>
+ 
+   <indexterm zone="ch-cross-tools-linux-headers">
+-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
++    <primary sortas="a-Linux Headers">Linux Headers</primary>
+     <secondary>cross tools</secondary>
+   </indexterm>
+ 
+@@ -20,13 +20,21 @@
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+-    <title>Installation of Linux-Headers</title>
++    <title>Installation of Linux Headers</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc: variables.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64: eglibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64: eglibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64: flags.xml
+Seulement dans BOOK/cross-tools/sparc64: glibc-64bit.xml
+diff -ru /home/jp/a/BOOK/cross-tools/sparc64/linux-headers.xml BOOK/cross-tools/sparc64/linux-headers.xml
+--- /home/jp/a/BOOK/cross-tools/sparc64/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/sparc64/linux-headers.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -8,10 +8,10 @@
+ <sect1 id="ch-cross-tools-linux-headers" role="wrap">
+   <?dbhtml filename="linux-headers.html"?>
+ 
+-  <title>Linux-Headers-&linux-version;</title>
++  <title>Linux-&linux-version2; Headers</title>
+ 
+   <indexterm zone="ch-cross-tools-linux-headers">
+-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
++    <primary sortas="a-Linux Headers">Linux Headers</primary>
+     <secondary>cross tools</secondary>
+   </indexterm>
+ 
+@@ -20,13 +20,21 @@
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+-    <title>Installation of Linux-Headers</title>
++    <title>Installation of Linux Headers</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64: variables.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64-64: eglibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64-64: flags.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64-64: gcc-static.xml
+Seulement dans BOOK/cross-tools/sparc64-64: glibc.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/sparc64-64: variables.xml
+diff -ru /home/jp/a/BOOK/cross-tools/sparc64-64-chapter.xml BOOK/cross-tools/sparc64-64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/sparc64-64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/sparc64-64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,22 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/sparc64-chapter.xml BOOK/cross-tools/sparc64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/sparc64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/sparc64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,14 +12,11 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+@@ -27,8 +24,8 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/eglibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/glibc-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/sparc-chapter.xml BOOK/cross-tools/sparc-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/sparc-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/sparc-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,21 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
+ 
+ </chapter>
+Seulement dans /home/jp/a/BOOK/cross-tools/x86: eglibc.xml
+diff -ru /home/jp/a/BOOK/cross-tools/x86/linux-headers.xml BOOK/cross-tools/x86/linux-headers.xml
+--- /home/jp/a/BOOK/cross-tools/x86/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/x86/linux-headers.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -8,10 +8,10 @@
+ <sect1 id="ch-cross-tools-linux-headers" role="wrap">
+   <?dbhtml filename="linux-headers.html"?>
+ 
+-  <title>Linux-Headers-&linux-version;</title>
++  <title>Linux-&linux-version2; Headers</title>
+ 
+   <indexterm zone="ch-cross-tools-linux-headers">
+-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
++    <primary sortas="a-Linux Headers">Linux Headers</primary>
+     <secondary>cross tools</secondary>
+   </indexterm>
+ 
+@@ -20,13 +20,21 @@
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+-    <title>Installation of Linux-Headers</title>
++    <title>Installation of Linux Headers</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/x86: variables.xml
+Seulement dans /home/jp/a/BOOK/cross-tools/x86_64: eglibc.xml
+diff -ru /home/jp/a/BOOK/cross-tools/x86_64/linux-headers.xml BOOK/cross-tools/x86_64/linux-headers.xml
+--- /home/jp/a/BOOK/cross-tools/x86_64/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/x86_64/linux-headers.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -8,10 +8,10 @@
+ <sect1 id="ch-cross-tools-linux-headers" role="wrap">
+   <?dbhtml filename="linux-headers.html"?>
+ 
+-  <title>Linux-Headers-&linux-version;</title>
++  <title>Linux-&linux-version2; Headers</title>
+ 
+   <indexterm zone="ch-cross-tools-linux-headers">
+-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
++    <primary sortas="a-Linux Headers">Linux Headers</primary>
+     <secondary>cross tools</secondary>
+   </indexterm>
+ 
+@@ -20,13 +20,21 @@
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+-    <title>Installation of Linux-Headers</title>
++    <title>Installation of Linux Headers</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <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'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../final-system/common/linux-headers.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
+ 
+Seulement dans /home/jp/a/BOOK/cross-tools/x86_64: variables.xml
+Seulement dans /home/jp/a/BOOK/cross-tools: x86_64-64
+diff -ru /home/jp/a/BOOK/cross-tools/x86_64-64-chapter.xml BOOK/cross-tools/x86_64-64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/x86_64-64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/x86_64-64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,22 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/x86_64-chapter.xml BOOK/cross-tools/x86_64-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/x86_64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/x86_64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,14 +12,11 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+@@ -27,8 +24,8 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
+ 
+ </chapter>
+diff -ru /home/jp/a/BOOK/cross-tools/x86-chapter.xml BOOK/cross-tools/x86-chapter.xml
+--- /home/jp/a/BOOK/cross-tools/x86-chapter.xml	2014-05-11 16:24:52.642516678 +0200
++++ BOOK/cross-tools/x86-chapter.xml	2014-10-03 20:44:43.908339261 +0200
+@@ -12,21 +12,19 @@
+   <title>Constructing Cross-Compile Tools</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/cflags.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
+ 
+ </chapter>
+Seulement dans /home/jp/a/BOOK/final-preps: aboutclfs.xml
+Seulement dans /home/jp/a/BOOK/final-preps: abouttestsuites.xml
+Seulement dans /home/jp/a/BOOK/final-preps: addinguser.xml
+Seulement dans /home/jp/a/BOOK/final-preps: chapter.xml
+Seulement dans BOOK/final-preps: common
+Seulement dans /home/jp/a/BOOK/final-preps: creatingcrossdir.xml
+Seulement dans /home/jp/a/BOOK/final-preps: creatingtoolsdir.xml
+Seulement dans BOOK/final-preps: mips
+Seulement dans BOOK/final-preps: mips64
+Seulement dans BOOK/final-preps: mips64-64
+Seulement dans BOOK/final-preps: mips64-64-chapter.xml
+Seulement dans BOOK/final-preps: mips64-chapter.xml
+Seulement dans BOOK/final-preps: mips-chapter.xml
+Seulement dans BOOK/final-preps: ppc
+Seulement dans BOOK/final-preps: ppc64
+Seulement dans BOOK/final-preps: ppc64-64
+Seulement dans BOOK/final-preps: ppc64-64-chapter.xml
+Seulement dans BOOK/final-preps: ppc64-chapter.xml
+Seulement dans BOOK/final-preps: ppc-chapter.xml
+Seulement dans /home/jp/a/BOOK/final-preps: settingenviron.xml
+Seulement dans BOOK/final-preps: sparc
+Seulement dans BOOK/final-preps: sparc64
+Seulement dans BOOK/final-preps: sparc64-64
+Seulement dans BOOK/final-preps: sparc64-64-chapter.xml
+Seulement dans BOOK/final-preps: sparc64-chapter.xml
+Seulement dans BOOK/final-preps: sparc-chapter.xml
+Seulement dans BOOK/final-preps: x86
+Seulement dans BOOK/final-preps: x86_64
+Seulement dans BOOK/final-preps: x86_64-64
+Seulement dans BOOK/final-preps: x86_64-64-chapter.xml
+Seulement dans BOOK/final-preps: x86_64-chapter.xml
+Seulement dans BOOK/final-preps: x86-chapter.xml
+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"
+Seulement dans /home/jp/a/BOOK/final-system: alpha
+Seulement dans /home/jp/a/BOOK/final-system: alpha-chapter.xml
+Seulement dans BOOK/final-system/common: acl.xml
+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>
+ 
+Seulement dans BOOK/final-system/common: attr.xml
+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/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>
+Seulement dans BOOK/final-system/common: dbus.xml
+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>
+Seulement dans /home/jp/a/BOOK/final-system/common: eglibc.xml
+Seulement dans /home/jp/a/BOOK/final-system/common: eudev.xml
+Seulement dans BOOK/final-system/common: expat.xml
+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>
+Seulement dans BOOK/final-system/common: gdbm.xml
+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>
+ 
+Seulement dans BOOK/final-system/common: glibc.xml
+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>
+ 
+Seulement dans BOOK/final-system/common: gperf.xml
+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>
+ 
+Seulement dans BOOK/final-system/common: intltool.xml
+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/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>
+ 
+Seulement dans BOOK/final-system/common: libcap.xml
+Seulement dans /home/jp/a/BOOK/final-system/common: libee.xml
+Seulement dans /home/jp/a/BOOK/final-system/common: libestr.xml
+Seulement dans BOOK/final-system/common: libpipeline.xml
+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>
+Seulement dans BOOK/final-system/common: man-db.xml
+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>
+Seulement dans /home/jp/a/BOOK/final-system/common: man.xml
+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
+@@ -25,26 +25,24 @@
+   <sect2 role="installation">
+     <title>Installation of Perl</title>
+ 
+-    <para os="s3">By default, Perl's Compress::Raw::Zlib module builds and
+-    links against its own internal copy of Zlib. The following command will
+-    tell it to use the system-installed Zlib:</para>
+-
+-<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/s/True/False/' \
+-       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+-       -e '/^LIB/s,\./zlib-src,/usr/lib,' \
+-       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
++    <para os="s3">By default, Perl's Compress::Raw::Zlib and
++    Compress::Raw::Bzip2 modules build and link against internal copies of
++    Zlib and Bzip2. The following command will make Perl use the
++    system-installed copies of these libraries:</para>
++
++<screen os="s4"><userinput>export BUILD_ZLIB=False
++export BUILD_BZIP2=0</userinput></screen>
+ 
+     <note os="a00">
+       <para>If you are following the boot method you will need to enable the
+-      loopback device as well as set a hostname for some of the tests:</para>
++      loopback device:</para>
+ 
+-<screen><userinput remap="test">ip link set lo up
+-hostname clfs</userinput></screen>
++<screen><userinput remap="test">ip link set lo up</userinput></screen>
+     </note>
+ 
+     <para os="a01">Before starting to configure, create a basic
+     <filename>/etc/hosts</filename> file which will be referenced by one
+-    of Perl's configuration files as well as used by the testsuite:</para>
++    of Perl's configuration files as well as used by the test suite:</para>
+ 
+ <screen os="a02"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
+ 
+@@ -64,19 +62,21 @@
+       <title>The meaning of the configure option:</title>
+ 
+       <varlistentry os="c1">
+-        <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
++        <term><parameter>-Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3</parameter></term>
+         <listitem>
+-          <para>This corrects an error in the way that <command>perldoc</command>
+-          invokes the <command>less</command> program.</para>
++          <para>Since Groff is not installed yet,
++          <command>configure.gnu</command> thinks that we do not want
++          man pages for Perl. Issuing these parameters overrides this decision.</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry os="c2">
+-        <term><parameter>-Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3</parameter></term>
++        <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
+         <listitem>
+-          <para>Since Groff is not installed yet,
+-          <command>configure.gnu</command> thinks that we do not want
+-          man pages for Perl. Issuing these parameters overrides this decision.</para>
++          <para>Less has not yet been installed, so by default
++          <command>perldoc</command> will invoke the <command>more</command>
++          program for viewing documentation. This option ensures that it will
++          use <command>less</command> instead.</para>
+         </listitem>
+       </varlistentry>
+ 
+@@ -104,9 +104,10 @@
+ 
+ <screen os="h2"><userinput remap="test">make test</userinput></screen>
+ 
+-    <para os="j">Install the package:</para>
++    <para os="j">Install the package and remove the variables set previously:</para>
+ 
+-<screen os="k"><userinput>make install</userinput></screen>
++<screen os="k"><userinput>make install
++unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
+ 
+   </sect2>
+ 
+@@ -125,7 +126,7 @@
+         perldoc, perlivp, perlthanks (link to perlbug), piconv, pl2pm, pod2html,
+         pod2latex, pod2man, pod2text, pod2usage, podchecker, podselect, prove,
+         psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, ptargrep,
+-        s2p, shasum, splain, xsubpp, and zipdetails</seg>
++        s2p, shasum, splain, xsubpp, zipdetails</seg>
+         <seg>Several hundred which cannot all be listed here</seg>
+         <seg>/usr/lib/perl5</seg>
+       </seglistitem>
+diff -ru /home/jp/a/BOOK/final-system/common/pkg-config-lite.xml BOOK/final-system/common/pkg-config-lite.xml
+--- /home/jp/a/BOOK/final-system/common/pkg-config-lite.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/pkg-config-lite.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -27,7 +27,7 @@
+ 
+     <para os="a">Prepare Pkg-config-lite for compilation:</para>
+ 
+-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version;</userinput></screen>
+ 
+     <para os="c">Compile the package:</para>
+ 
+@@ -52,7 +52,7 @@
+ 
+       <seglistitem>
+         <seg>pkg-config</seg>
+-        <seg>/usr/share/doc/pkg-config</seg>
++        <seg>/usr/share/doc/pkg-config-&pkg-config-lite-version;</seg>
+       </seglistitem>
+     </segmentedlist>
+ 
+Seulement dans BOOK/final-system/common: procps-ng.xml
+Seulement dans /home/jp/a/BOOK/final-system/common: procps.xml
+diff -ru /home/jp/a/BOOK/final-system/common/psmisc.xml BOOK/final-system/common/psmisc.xml
+--- /home/jp/a/BOOK/final-system/common/psmisc.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/psmisc.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -27,47 +27,17 @@
+ 
+     <para os="a">Prepare Psmisc for compilation:</para>
+ 
+-<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+ 
+-    <variablelist os="c">
+-      <title>The meaning of the configure option:</title>
++    <para os="c">Compile the package:</para>
+ 
+-      <varlistentry>
+-        <term><parameter>--exec-prefix=""</parameter></term>
+-        <listitem>
+-          <para>This ensures that the Psmisc binaries will install into
+-          <filename class="directory">/bin</filename> instead of
+-          <filename class="directory">/usr/bin</filename>. This is the
+-          correct location according to the FHS, because some of the Psmisc
+-          binaries are used by the CLFS-Bootscripts package.</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>
+-
+-    <para os="g">Install the package:</para>
+-
+-<screen os="h"><userinput>make install</userinput></screen>
+-
+-    <para os="i">There is no reason for the <command>pstree</command> and
+-    <command>pstree.x11</command> programs to reside in <filename
+-    class="directory">/bin</filename>. Therefore, move them to <filename
+-    class="directory">/usr/bin</filename>:</para>
+-
+-<screen os="j"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
+-
+-    <para os="k">By default, Psmisc's <command>pidof</command> program is not installed.
+-    This usually is not a problem because it is installed later in the Sysvinit
+-    package, which provides a better <command>pidof</command> program. If
+-    Sysvinit will not be used for a particular system, complete the installation
+-    of Psmisc by creating the following symlink:</para>
+-
+-<screen os="l" role="nodump"><userinput>ln -sv killall /bin/pidof</userinput></screen>
++<screen os="g"><userinput>make install</userinput></screen>
+ 
+   </sect2>
+ 
+@@ -78,7 +48,7 @@
+       <segtitle>Installed programs</segtitle>
+ 
+       <seglistitem>
+-        <seg>fuser, killall, peekfd, prtstat, pstree, and pstree.x11
++        <seg>fuser, killall, peekfd, prtstat, pstree, pstree.x11
+         (link to pstree)</seg>
+       </seglistitem>
+     </segmentedlist>
+diff -ru /home/jp/a/BOOK/final-system/common/readline.xml BOOK/final-system/common/readline.xml
+--- /home/jp/a/BOOK/final-system/common/readline.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/readline.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -32,7 +32,8 @@
+ 
+     <para os="a">Prepare Readline for compilation:</para>
+ 
+-<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
++    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
+ 
+     <para os="c">Compile the package:</para>
+ 
+@@ -42,23 +43,17 @@
+ 
+     <para os="f">Install the package:</para>
+ 
+-<screen os="g"><userinput>make install</userinput></screen>
++<screen os="g"><userinput>make SHLIB_LIBS=-lncurses htmldir=/usr/share/doc/readline-&readline-version; install</userinput></screen>
+ 
+-    <para os="h">Install the documentation:</para>
++    <para os="h">Now move the static libraries to a more appropriate location:</para>
+ 
+-<screen os="i"><userinput>make install-doc</userinput></screen>
++<screen os="i"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
+ 
+-    <para os="j">Now move the static libraries to a more appropriate location:</para>
++    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
+ 
+-<screen os="k"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
+-
+-    <para os="l">Next, remove the <filename class="extension">.so</filename>
+-    files in <filename class="directory">/lib</filename> and relink them into
+-    <filename class="directory">/usr/lib</filename>.</para>
+-
+-<screen os="m"><userinput>rm -v /lib/lib{readline,history}.so
+-ln -svf ../../lib/libreadline.so.&readline-version2; /usr/lib/libreadline.so
+-ln -svf ../../lib/libhistory.so.&readline-version2; /usr/lib/libhistory.so</userinput></screen>
++<screen os="k"><userinput>ln -svf ../../lib/$(readlink /lib/libreadline.so) /usr/lib/libreadline.so
++ln -svf ../../lib/$(readlink /lib/libhistory.so) /usr/lib/libhistory.so
++rm -v /lib/lib{readline,history}.so</userinput></screen>
+ 
+   </sect2>
+ 
+@@ -70,8 +65,8 @@
+       <segtitle>Installed directories</segtitle>
+ 
+       <seglistitem>
+-        <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
+-        <seg>/usr/include/readline, /usr/share/readline</seg>
++        <seg>libhistory.[a,so], libreadline.[a,so]</seg>
++        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
+       </seglistitem>
+     </segmentedlist>
+ 
+Seulement dans /home/jp/a/BOOK/final-system/common: rsyslog.xml
+diff -ru /home/jp/a/BOOK/final-system/common/sed.xml BOOK/final-system/common/sed.xml
+--- /home/jp/a/BOOK/final-system/common/sed.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/sed.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -26,7 +26,8 @@
+ 
+     <para os="a">Prepare Sed for compilation:</para>
+ 
+-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
++    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
+ 
+     <para os="c">Compile the package:</para>
+ 
+@@ -59,7 +60,7 @@
+ 
+       <seglistitem>
+         <seg>sed</seg>
+-        <seg>/usr/share/doc/sed</seg>
++        <seg>/usr/share/doc/sed-&sed-version;</seg>
+       </seglistitem>
+     </segmentedlist>
+ 
+diff -ru /home/jp/a/BOOK/final-system/common/shadow.xml BOOK/final-system/common/shadow.xml
+--- /home/jp/a/BOOK/final-system/common/shadow.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/shadow.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -28,11 +28,16 @@
+     <note os="a">
+       <para>If you would like to enforce the use of strong passwords,
+       refer to <ulink url="&cblfs-root;index.php/Cracklib"/>
+-      for installing Cracklib prior to building Shadow. Then add
+-      <parameter>--with-libcrack</parameter> to the <command>configure</command>
+-      command below.</para>
+-    </note>
++      for installing Cracklib prior to building Shadow. After Cracklib is
++      installed, execute this <command>sed</command> in Shadow's source
++      directory to correct the path to the Cracklib dictionary:</para>
++
++<screen role="nodump"><userinput>sed -i 's@\(DICTPATH.\).*@\1/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
+ 
++      <para>Finally, add <parameter>--with-libcrack</parameter> to the
++      <command>configure</command> command below.</para>
++
++    </note>
+ 
+     <para os="b">Disable the installation of the <command>groups</command> and
+     <command>nologin</command> programs and their man pages, as better versions
+@@ -47,7 +52,7 @@
+ 
+ <screen os="e"><userinput>./configure --sysconfdir=/etc</userinput></screen>
+ 
+-<para os="f">The meaning of the configure options:</para>
++<para os="f">The meaning of the new configure option:</para>
+ 
+   <variablelist os="g">
+     <varlistentry>
+@@ -56,9 +61,8 @@
+       <filename class="directory">/etc</filename>, rather than
+       <filename class="directory">/usr/etc</filename>.</para></listitem>
+     </varlistentry>
+-    
+-  </variablelist>
+ 
++  </variablelist>
+ 
+     <para os="h">Compile the package:</para>
+ 
+@@ -71,7 +75,7 @@
+ <screen os="l"><userinput>make install</userinput></screen>
+ 
+     <para os="m" id="shadow-login_defs">Instead of using the default
+-    <emphasis>crypt</emphasis> method, use the more secure
++    <emphasis>DES</emphasis> method, use the more secure
+     <emphasis>SHA512</emphasis> method of password encryption, which also allows
+     passwords longer than 8 characters. It is also necessary to change the
+     obsolete <filename class="directory">/var/spool/mail</filename> location
+@@ -88,17 +92,19 @@
+     -e 's@#\(ENCRYPT_METHOD \).*@\1SHA512@' \
+     -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
+ 
+-    <note os="t">
+-      <para>If you built Shadow with Cracklib support, execute
+-      this <command>sed</command> to correct the path to the Cracklib
+-      dictionary:</para>
+-
+-<screen role="nodump"><userinput>sed -i 's at DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</userinput></screen>
+-    </note>
++    <para os="t">Move a misplaced program to its proper location:</para>
+ 
+-    <para os="u">Move a misplaced program to its proper location:</para>
++<screen os="u"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
+ 
+-<screen os="v"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
++    <para os="v">The <command>login</command> program will write to
++    <filename>/var/log/lastlog</filename>, if it exists, to record the date and
++    time of the latest successful login for each user. This log file is not
++    created automatically if it does not already exist, so we will
++    create it now and give it appropriate ownership and permissions:</para>
++
++<screen os="w"><userinput>touch /var/log/lastlog
++chgrp -v utmp /var/log/lastlog
++chmod -v 664 /var/log/lastlog</userinput></screen>
+ 
+   </sect2>
+ 
+@@ -153,11 +159,11 @@
+       <segtitle>Installed directory</segtitle>
+ 
+       <seglistitem>
+-        <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
++        <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
+         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
+         lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
+         pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
+-        vigr (link to vipw), and vipw</seg>
++        vigr (link to vipw), vipw</seg>
+         <seg>/etc/default</seg>
+       </seglistitem>
+     </segmentedlist>
+Seulement dans BOOK/final-system/common: systemd.xml
+Seulement dans /home/jp/a/BOOK/final-system/common: sysvinit.xml
+diff -ru /home/jp/a/BOOK/final-system/common/tar.xml BOOK/final-system/common/tar.xml
+--- /home/jp/a/BOOK/final-system/common/tar.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/tar.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -48,7 +48,11 @@
+ 
+     <para os="h">Generate the man page and place it in the proper location:</para>
+ 
+-<screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
++<screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
++
++    <para os="j">Install the documentation:</para>
++
++<screen os="k"><userinput>make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
+ 
+   </sect2>
+ 
+@@ -57,9 +61,11 @@
+ 
+     <segmentedlist>
+       <segtitle>Installed programs</segtitle>
++      <segtitle>Installed directory</segtitle>
+ 
+       <seglistitem>
+-        <seg>rmt and tar</seg>
++        <seg>rmt, tar</seg>
++        <seg>/usr/share/doc/tar-&tar-version;</seg>
+       </seglistitem>
+     </segmentedlist>
+ 
+diff -ru /home/jp/a/BOOK/final-system/common/temp-perl.xml BOOK/final-system/common/temp-perl.xml
+--- /home/jp/a/BOOK/final-system/common/temp-perl.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/temp-perl.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -22,10 +22,14 @@
+   <sect2 role="installation">
+     <title>Installation of Perl</title>
+ 
+-    <para os="a">First adapt some hard-wired paths to the C library by applying
+-    the following patch:</para>
+-
+-<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
++    <note os="a">
++      <para>In this section, we will add Perl to the temporary system in
++      <filename class="directory">/tools</filename>. This package installation
++      should technically be part of
++      <xref linkend="chapter-temp-system"/>, but Perl has often had problems
++      with cross-compiling, so we will compile and install it while in the
++      final build environment.</para>
++    </note>
+ 
+     <para os="s1">Change a hardcoded path from
+     <filename class="directory">/usr/include</filename> to
+diff -ru /home/jp/a/BOOK/final-system/common/testsuitesagain.xml BOOK/final-system/common/testsuitesagain.xml
+--- /home/jp/a/BOOK/final-system/common/testsuitesagain.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/testsuitesagain.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -11,9 +11,16 @@
+   <title>About Test Suites, Again</title>
+ 
+   <para>In the final-system build, you are no longer cross-compiling so it
+-  is possible to run package testsuites. Some test suites are more important
+-  than others. For example,  the test suites for the core toolchain
+-  packages—GCC, Binutils, and Glibc—are of the utmost
++  is possible to run package test suites. Running the test suite for a
++  newly built package is a good idea because it can provide a <quote>sanity
++  check</quote> indicating that everything compiled correctly. A test suite
++  that passes its set of checks usually proves that the package is
++  functioning as the developer intended. It does not, however, guarantee
++  that the package is totally bug free.</para>
++
++  <para>Some test suites are more important than others. For example, the test
++  suites for the core toolchain packages—GCC, Binutils,
++  and Glibc—are of the utmost
+   importance due to their central role in a properly functioning system.
+   The test suites for GCC and Glibc can take a very long time to complete,
+   especially on slower hardware, but are strongly recommended.</para>
+diff -ru /home/jp/a/BOOK/final-system/common/texinfo.xml BOOK/final-system/common/texinfo.xml
+--- /home/jp/a/BOOK/final-system/common/texinfo.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/texinfo.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -41,21 +41,6 @@
+ 
+ <screen os="g"><userinput>make install</userinput></screen>
+ 
+-    <para os="h">The Info documentation system uses a plain text file to hold
+-    its list of menu entries. The file is located at
+-    <filename>/usr/share/info/dir</filename>. Unfortunately, due to occasional
+-    problems in the Makefiles of various packages, it can sometimes get out of
+-    sync with the info pages installed on the system. If the
+-    <filename>/usr/share/info/dir</filename> file ever needs to be recreated,
+-    the following optional commands will accomplish the task:</para>
+-
+-<screen os="i" role="nodump"><userinput>pushd /usr/share/info
+-rm dir
+-for f in *
+-do install-info $f dir 2>/dev/null
+-done
+-popd</userinput></screen>
+-
+   </sect2>
+ 
+   <sect2 id="contents-texinfo" role="content">
+@@ -67,7 +52,7 @@
+ 
+       <seglistitem>
+         <seg>info, infokey, install-info, makeinfo (link to texi2any),
+-        pdftexi2dvi, texi2dvi, texi2pdf, and texindex</seg>
++        pdftexi2dvi, texi2dvi, texi2pdf, texindex</seg>
+         <seg>/usr/share/texinfo</seg>
+       </seglistitem>
+     </segmentedlist>
+diff -ru /home/jp/a/BOOK/final-system/common/util-linux.xml BOOK/final-system/common/util-linux.xml
+--- /home/jp/a/BOOK/final-system/common/util-linux.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/util-linux.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -41,9 +41,16 @@
+   <sect2 role="installation">
+     <title>Installation of Util-linux</title>
+ 
++    <note os="n">
++      <para><command>findmnt</command> and <command>lsblk</command> can
++      utilize <filename class="libraryfile">libudev</filename> for WWN and serial
++      number information. If this is desired, rebuild Util-linux after
++      <xref linkend="ch-system-systemd"/></para>
++    </note>
++
+     <para os="a">Prepare Util-linux for compilation:</para>
+ 
+-<screen os="b"><userinput>./configure --enable-write</userinput></screen>
++<screen os="b"><userinput>./configure --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+ 
+     <variablelist os="c">
+       <title>The meaning of the configure options:</title>
+@@ -62,27 +69,15 @@
+ 
+ <screen os="e"><userinput>make</userinput></screen>
+ 
+-    <para os="dummy1">Create two <systemitem class="groupname">dummy</systemitem> groups and a <systemitem class="username">dummy</systemitem> user to be used during Util-linux and Coreutils test suites:</para>
+-
+-<screen os="dummy2"><userinput remap="test">echo "dummy1:x:1000:" >> /etc/group
+-echo "dummy2:x:1001:dummy" >> /etc/group
+-echo "dummy:x:1000:1000::/root:/bin/bash" >> /etc/passwd</userinput></screen>
+-
+     <para os="f">To test the results, issue:</para>
+ 
+-<screen os="f2"><userinput remap="test">chown -Rv dummy . &&
+-su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
++<screen os="f2"><userinput remap="test">chown -Rv nobody . &&
++su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
+ 
+     <para os="g">Install the package:</para>
+ 
+ <screen os="h"><userinput>make install</userinput></screen>
+ 
+-    <para os="i">Move the <command>logger</command> binary to
+-    <filename class="directory">/bin</filename> as it is needed by the
+-    CLFS-Bootscripts package:</para>
+-
+-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
+-
+   </sect2>
+ 
+   <sect2 id="contents-util-linux" role="content">
+@@ -105,10 +100,12 @@
+         raw, readprofile, rename, renice, resizepart, rev, rtcwake, script,
+         scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
+         swapoff, swapon, switch_root, tailf, taskset, ul, umount, unshare,
+-        utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, and write</seg>
+-        <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
++        utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, write</seg>
++        <seg>libblkid.[a,so], libmount.[a,so], libuuid.[a,so]</seg>
+         <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
+-        /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
++        /usr/share/bash-completion,
++        /usr/share/doc/util-linux-&util-linux-version;/getopt,
++        /var/lib/hwclock</seg>
+       </seglistitem>
+     </segmentedlist>
+ 
+@@ -272,17 +269,6 @@
+           </indexterm>
+         </listitem>
+       </varlistentry>
+-
+-      <varlistentry id="ddate">
+-        <term><command>ddate</command></term>
+-        <listitem>
+-          <para>Gives the Discordian date or converts the given Gregorian date
+-          to a Discordian one</para>
+-          <indexterm zone="ch-system-util-linux ddate">
+-            <primary sortas="b-ddate">ddate</primary>
+-          </indexterm>
+-        </listitem>
+-      </varlistentry>
+ 
+       <varlistentry id="delpart">
+         <term><command>delpart</command></term>
+diff -ru /home/jp/a/BOOK/final-system/common/vim.xml BOOK/final-system/common/vim.xml
+--- /home/jp/a/BOOK/final-system/common/vim.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/vim.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -46,25 +46,7 @@
+ 
+     <para os="d">Prepare Vim for compilation:</para>
+ 
+-<screen os="e"><userinput>./configure \
+-    --prefix=/usr --enable-multibyte</userinput></screen>
+-
+-    <variablelist os="f">
+-      <title>The meaning of the configure options:</title>
+-
+-      <varlistentry>
+-        <term><parameter>--enable-multibyte</parameter></term>
+-        <listitem>
+-          <para>This optional but highly recommended switch enables support
+-          for editing files in multibyte character encodings. This is needed
+-          if using a locale with a multibyte character set. This switch is
+-          also helpful to be able to edit text files initially created in
+-          Linux distributions like Fedora that use UTF-8 as a default
+-          character set.</para>
+-        </listitem>
+-      </varlistentry>
+-
+-    </variablelist>
++<screen os="e"><userinput>./configure --prefix=/usr</userinput></screen>
+ 
+     <para os="g">Compile the package:</para>
+ 
+@@ -171,7 +153,7 @@
+         <seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
+         pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
+         tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
+-        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
++        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, xxd</seg>
+         <seg>/usr/share/vim</seg>
+       </seglistitem>
+     </segmentedlist>
+Seulement dans BOOK/final-system/common: xml-parser.xml
+diff -ru /home/jp/a/BOOK/final-system/common/xz.xml BOOK/final-system/common/xz.xml
+--- /home/jp/a/BOOK/final-system/common/xz.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/xz.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -8,28 +8,28 @@
+ <sect1 id="ch-system-xz" role="wrap">
+   <?dbhtml filename="xz.html"?>
+ 
+-  <title>XZ-Utils-&xz-version;</title>
++  <title>XZ Utils-&xz-version;</title>
+ 
+   <indexterm zone="ch-system-xz">
+-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
++    <primary sortas="a-XZ Utils">XZ Utils</primary>
+   </indexterm>
+ 
+   <sect2 role="package">
+     <title/>
+ 
+-    <para>The XZ-Utils package contains programs for compressing and
+-    decompressing files. Compressing text files with <command>XZ-Utils</command>
++    <para>The XZ Utils package contains programs for compressing and
++    decompressing files. Compressing text files with <command>XZ Utils</command>
+     yields a much better compression percentage than with the traditional
+     <command>gzip</command>.</para>
+ 
+   </sect2>
+ 
+   <sect2 role="installation">
+-    <title>Installation of XZ-Utils</title>
++    <title>Installation of XZ Utils</title>
+ 
+-    <para os="a">Prepare XZ-Utils for compilation:</para>
++    <para os="a">Prepare XZ Utils for compilation:</para>
+ 
+-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
++<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+ 
+     <para os="c">Compile the package:</para>
+ 
+@@ -52,12 +52,12 @@
+     location, and recreate the symlink pointing to it:</para>
+ 
+ <screen os="k"><userinput>mv -v /usr/lib/liblzma.so.* /lib
+-ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
++ln -sfv ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
+ 
+   </sect2>
+ 
+   <sect2 id="contents-xz" role="content">
+-    <title>Contents of XZ-Utils</title>
++    <title>Contents of XZ Utils</title>
+ 
+     <segmentedlist>
+       <segtitle>Installed programs</segtitle>
+@@ -71,9 +71,9 @@
+         lzmainfo, lzmore (link to xzmore), unlzma (link to xz), unxz (link to
+         xz), xz, xzcat (link to xz), xzcmp (link to xzdiff), xzdec, xzdiff,
+         xzegrep (link to xzgrep), xzfgrep (link to xzgrep), xzgrep, xzless,
+-        and xzmore</seg>
++        xzmore</seg>
+         <seg>liblzma.[a,so]</seg>
+-        <seg>/usr/include/lzma, /usr/share/doc/xz</seg>
++        <seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
+       </seglistitem>
+     </segmentedlist>
+ 
+diff -ru /home/jp/a/BOOK/final-system/common/zlib.xml BOOK/final-system/common/zlib.xml
+--- /home/jp/a/BOOK/final-system/common/zlib.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/common/zlib.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -38,7 +38,7 @@
+ 
+     <para os="e">To test the results, issue:</para>
+ 
+-<screen os="e2" ><userinput remap="test">make check</userinput></screen>
++<screen os="e2"><userinput remap="test">make check</userinput></screen>
+ 
+     <para os="f">Install the package:</para>
+ 
+@@ -46,12 +46,17 @@
+ 
+     <para os="h">The previous command installed two <filename
+     class="extension">.so</filename> files into <filename
+-    class="directory">/usr/lib</filename>. We will move it into
+-    <filename class="directory">/lib</filename> and then relink it
+-    to <filename class="directory">/usr/lib</filename>:</para>
++    class="directory">/usr/lib</filename>. We will move them into
++    <filename class="directory">/lib</filename> and then recreate a link
++    in <filename class="directory">/usr/lib</filename>:</para>
+ 
+ <screen os="i"><userinput>mv -v /usr/lib/libz.so.* /lib
+-ln -svf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
++ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
++
++    <para os="j">Install the documentation:</para>
++
++<screen os="k"><userinput>mkdir -pv /usr/share/doc/zlib-&zlib-version;
++cp -rv doc/* examples /usr/share/doc/zlib-&zlib-version;</userinput></screen>
+ 
+   </sect2>
+ 
+@@ -60,9 +65,11 @@
+ 
+     <segmentedlist>
+       <segtitle>Installed libraries</segtitle>
++      <segtitle>Installed directory</segtitle>
+ 
+       <seglistitem>
+         <seg>libz.[a,so]</seg>
++        <seg>/usr/share/doc/zlib-&zlib-version;</seg>
+       </seglistitem>
+     </segmentedlist>
+ 
+Seulement dans /home/jp/a/BOOK/final-system/mips: adjusting.xml
+diff -ru /home/jp/a/BOOK/final-system/mips/colo.xml BOOK/final-system/mips/colo.xml
+--- /home/jp/a/BOOK/final-system/mips/colo.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips/colo.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -34,6 +34,11 @@
+ 
+ <screen os="p4"><userinput>patch -Np1 -i ../&colo-relocation-patch;</userinput></screen>
+ 
++    <para os="s1">Disable -Werror in one of the <filename>Makefile</filename>s
++    to prevent a compile failure:</para>
++
++<screen os="s2"><userinput>sed -i '/^CFLAGS/s/-Werror //' stage2/Makefile</userinput></screen>
++
+     <para os="b">Compile the Colo package:</para>
+ 
+ <screen><userinput>make</userinput></screen>
+Seulement dans /home/jp/a/BOOK/final-system/mips: eglibc.xml
+Seulement dans /home/jp/a/BOOK/final-system/mips: gcc.xml
+diff -ru /home/jp/a/BOOK/final-system/mips64/adjusting.xml BOOK/final-system/mips64/adjusting.xml
+--- /home/jp/a/BOOK/final-system/mips64/adjusting.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips64/adjusting.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -11,7 +11,7 @@
+   <title>Adjusting the Toolchain</title>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../mips/adjusting.xml"
++  href="../ppc/adjusting.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="c"><userinput>gcc -dumpspecs | \
+@@ -22,18 +22,13 @@
+      $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../mips/adjusting.xml"
++  href="../ppc/adjusting.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+-  <para>Note that <filename class="directory">/lib</filename>,
+-  <filename class="directory">/lib32</filename>, or
+-  <filename class="directory">/lib64</filename> is now the prefix
+-  of our dynamic linker.</para>
+-
+   <caution>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -45,11 +40,11 @@
+     xpointer="xpointer(//*[@os='m3'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+     <para>For N32 ABI:</para>
+@@ -59,7 +54,7 @@
+ readelf -l a.out | grep ': /lib'</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen><computeroutput>[Requesting program interpreter: /lib32/ld.so.1]</computeroutput></screen>
+@@ -73,7 +68,7 @@
+     xpointer="xpointer(//*[@os='m5'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+ <screen><computeroutput>[Requesting program interpreter: /lib64/ld.so.1]</computeroutput></screen>
+@@ -84,15 +79,15 @@
+     of our dynamic linker.</para>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='k'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='m'])"/>
+ 
+   </caution>
+diff -ru /home/jp/a/BOOK/final-system/mips64/binutils.xml BOOK/final-system/mips64/binutils.xml
+--- /home/jp/a/BOOK/final-system/mips64/binutils.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips64/binutils.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -75,13 +75,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"
+@@ -107,14 +103,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/mips64/colo.xml BOOK/final-system/mips64/colo.xml
+--- /home/jp/a/BOOK/final-system/mips64/colo.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips64/colo.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -21,6 +21,10 @@
+   <sect2 role="installation">
+     <title>Installation of Colo</title>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../mips/colo.xml"
++    xpointer="xpointer(//*[@os='a'])"/>
++
+     <para os="p1">This patch updates the Colo bootloader to build under
+     64 bit:</para>
+ 
+@@ -36,7 +40,11 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../mips/colo.xml"
+-    xpointer="xpointer(//*[@os='a'])"/>
++    xpointer="xpointer(//*[@os='s1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../mips/colo.xml"
++    xpointer="xpointer(//*[@os='s2'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../mips/colo.xml"
+Seulement dans /home/jp/a/BOOK/final-system/mips64: eglibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/mips64: eglibc-n32.xml
+Seulement dans /home/jp/a/BOOK/final-system/mips64: eglibc.xml
+diff -ru /home/jp/a/BOOK/final-system/mips64/gcc.xml BOOK/final-system/mips64/gcc.xml
+--- /home/jp/a/BOOK/final-system/mips64/gcc.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips64/gcc.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -39,14 +39,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"
+@@ -57,16 +49,18 @@
+     href="../common/gcc.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-<screen os="i"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
++<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include ${BUILD64}" \
+ CXX="g++ -isystem /usr/include ${BUILD64}" \
+ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib" \
+   ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
+-    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
+-    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
+-    --enable-clocale=gnu --enable-languages=c,c++ --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>
++    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit \
++    --with-abi=64 --enable-clocale=gnu --enable-languages=c,c++ \
++    --disable-libstdcxx-pch --with-system-zlib --enable-checking=release \
++    --enable-libstdcxx-time</userinput></screen>
++
++   <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"
+@@ -140,9 +134,9 @@
+     href="../multilib/gcc.xml"
+     xpointer="xpointer(//*[@os='y'])"/>
+ 
+-<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
+-mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32
+-mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
++<screen os="z"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib
++mv -v /usr/lib32/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib32
++mv -v /usr/lib64/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
+ 
+   </sect2>
+ 
+Seulement dans BOOK/final-system/mips64: glibc-64bit.xml
+Seulement dans BOOK/final-system/mips64: glibc-n32.xml
+diff -ru /home/jp/a/BOOK/final-system/mips64/gmp-64bit.xml BOOK/final-system/mips64/gmp-64bit.xml
+--- /home/jp/a/BOOK/final-system/mips64/gmp-64bit.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips64/gmp-64bit.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -73,18 +73,30 @@
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../multilib/gmp-64bit.xml"
++    href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='j'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../multilib/gmp-64bit.xml"
++    href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='k'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../multilib/gmp-64bit.xml"
++    href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+-<screen os="m"><userinput>cat > /usr/include/gmp.h << "EOF"
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../multilib/gmp-64bit.xml"
++    xpointer="xpointer(//*[@os='m'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../multilib/gmp-64bit.xml"
++    xpointer="xpointer(//*[@os='n'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../multilib/gmp-64bit.xml"
++    xpointer="xpointer(//*[@os='o'])"/>
++
++<screen os="p"><userinput>cat > /usr/include/gmp.h << "EOF"
+ /* gmp.h - Stub Header  */
+ #ifndef __STUB__GMP_H__
+ #define __STUB__GMP_H__
+diff -ru /home/jp/a/BOOK/final-system/mips64-64/adjusting.xml BOOK/final-system/mips64-64/adjusting.xml
+--- /home/jp/a/BOOK/final-system/mips64-64/adjusting.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/mips64-64/adjusting.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -11,7 +11,7 @@
+   <title>Adjusting the Toolchain</title>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../mips/adjusting.xml"
++  href="../ppc/adjusting.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="c"><userinput>gcc -dumpspecs | \
+@@ -22,14 +22,9 @@
+      $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../mips/adjusting.xml"
++  href="../ppc/adjusting.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+-  <para>Note that <filename class="directory">/lib</filename>,
+-  <filename class="directory">/lib32</filename>, or
+-  <filename class="directory">/lib64</filename> is now the prefix
+-  of our dynamic linker.</para>
+-
+   <caution>
+ 
+     <para>It is imperative at this point to stop and ensure that
+@@ -39,31 +34,31 @@
+     check:</para>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='j'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='k'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../mips/adjusting.xml"
++    href="../ppc/adjusting.xml"
+     xpointer="xpointer(//*[@os='m'])"/>
+ 
+   </caution>
+Seulement dans /home/jp/a/BOOK/final-system/mips64-64: eglibc.xml
+Seulement dans /home/jp/a/BOOK/final-system/mips64-64: gcc.xml
+Seulement dans BOOK/final-system/mips64-64: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/mips64-64-chapter.xml BOOK/final-system/mips64-64-chapter.xml
+--- /home/jp/a/BOOK/final-system/mips64-64-chapter.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips64-64-chapter.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/dvhtool.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/mips64-chapter.xml BOOK/final-system/mips64-chapter.xml
+--- /home/jp/a/BOOK/final-system/mips64-chapter.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/mips64-chapter.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -17,10 +17,11 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gmp-64bit.xml"/>
+@@ -38,51 +39,62 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/cloog-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-n32.xml"/>
+@@ -92,35 +104,41 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-n32.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-n32.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/dvhtool.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/mips-chapter.xml BOOK/final-system/mips-chapter.xml
+--- /home/jp/a/BOOK/final-system/mips-chapter.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/mips-chapter.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/dvhtool.xml"/>
+Seulement dans BOOK/final-system/multilib: acl-64bit.xml
+Seulement dans BOOK/final-system/multilib: acl-n32.xml
+Seulement dans BOOK/final-system/multilib: acl.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/adjusting.xml BOOK/final-system/multilib/adjusting.xml
+--- /home/jp/a/BOOK/final-system/multilib/adjusting.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/adjusting.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -24,10 +24,6 @@
+   href="../common/adjusting.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+-  <para os="m1">Note that <filename class="directory">/lib</filename> or
+-  <filename class="directory">/lib64</filename> is now the prefix
+-  of our dynamic linker.</para>
+-
+   <caution>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+Seulement dans BOOK/final-system/multilib: attr-64bit.xml
+Seulement dans BOOK/final-system/multilib: attr-n32.xml
+Seulement dans BOOK/final-system/multilib: attr.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/automake.xml BOOK/final-system/multilib/automake.xml
+--- /home/jp/a/BOOK/final-system/multilib/automake.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/multilib/automake.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -25,7 +25,8 @@
+     href="../common/automake.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
++    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/autoconf.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/bash.xml BOOK/final-system/multilib/bash.xml
+--- /home/jp/a/BOOK/final-system/multilib/bash.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bash.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -40,7 +40,8 @@
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+     ./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>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bash.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/bc.xml BOOK/final-system/multilib/bc.xml
+--- /home/jp/a/BOOK/final-system/multilib/bc.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bc.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -25,7 +25,8 @@
+     href="../common/bc.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
++    --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bc.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/binutils.xml BOOK/final-system/multilib/binutils.xml
+--- /home/jp/a/BOOK/final-system/multilib/binutils.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/binutils.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -75,13 +75,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"
+@@ -107,14 +103,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/multilib/bison-64bit.xml BOOK/final-system/multilib/bison-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/bison-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bison-64bit.xml	2014-10-03 20:44:43.916339261 +0200
+@@ -23,18 +23,10 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
+-    xpointer="xpointer(//*[@os='t3'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/bison.xml"
+-    xpointer="xpointer(//*[@os='t4'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/bison.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
+-    --prefix=/usr --libdir=/usr/lib64  --cache-file=config.cache</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
++    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/bison-n32.xml BOOK/final-system/multilib/bison-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/bison-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bison-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -24,18 +24,10 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
+-    xpointer="xpointer(//*[@os='t3'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/bison.xml"
+-    xpointer="xpointer(//*[@os='t4'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/bison.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+-    ./configure --prefix=/usr --libdir=/usr/lib32  --cache-file=config.cache</userinput></screen>
++    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/bison.xml BOOK/final-system/multilib/bison.xml
+--- /home/jp/a/BOOK/final-system/multilib/bison.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bison.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -24,18 +24,10 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
+-    xpointer="xpointer(//*[@os='t3'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/bison.xml"
+-    xpointer="xpointer(//*[@os='t4'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/bison.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure \
+-    --prefix=/usr  --cache-file=config.cache</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
++    ./configure --prefix=/usr</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/bzip2-64bit.xml BOOK/final-system/multilib/bzip2-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/bzip2-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bzip2-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -29,6 +29,14 @@
+     href="bzip2.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bzip2.xml"
++    xpointer="xpointer(//*[@os='s3'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bzip2.xml"
++    xpointer="xpointer(//*[@os='s4'])"/>
++
+     <para os="m1">We need to change the default lib path
+     to <filename class="directory">lib64</filename>:</para>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/bzip2-n32.xml BOOK/final-system/multilib/bzip2-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/bzip2-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bzip2-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -30,6 +30,14 @@
+     href="bzip2.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bzip2.xml"
++    xpointer="xpointer(//*[@os='s3'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bzip2.xml"
++    xpointer="xpointer(//*[@os='s4'])"/>
++
+     <para os="m1">We need to change the default lib path
+     to <filename class="directory">lib32</filename>:</para>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/bzip2.xml BOOK/final-system/multilib/bzip2.xml
+--- /home/jp/a/BOOK/final-system/multilib/bzip2.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/bzip2.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -32,6 +32,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bzip2.xml"
++    xpointer="xpointer(//*[@os='s3'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bzip2.xml"
++    xpointer="xpointer(//*[@os='s4'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bzip2.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
+diff -ru /home/jp/a/BOOK/final-system/multilib/cloog-64bit.xml BOOK/final-system/multilib/cloog-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/cloog-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/cloog-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -27,8 +27,7 @@
+ 
+ <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+-  ./configure --prefix=/usr \
+-    --libdir=/usr/lib64 --enable-shared --with-isl=system</userinput></screen>
++  ./configure --prefix=/usr --libdir=/usr/lib64 --with-isl=system</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/cloog.xml"
+@@ -62,10 +61,6 @@
+     href="../common/cloog.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/cloog.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/cloog-n32.xml BOOK/final-system/multilib/cloog-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/cloog-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/cloog-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -28,8 +28,7 @@
+ 
+ <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
+ LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+-  ./configure --prefix=/usr \
+-    --libdir=/usr/lib32 --enable-shared --with-isl=system</userinput></screen>
++  ./configure --prefix=/usr --libdir=/usr/lib32 --with-isl=system</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/cloog.xml"
+@@ -63,10 +62,6 @@
+     href="../common/cloog.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/cloog.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/cloog.xml BOOK/final-system/multilib/cloog.xml
+--- /home/jp/a/BOOK/final-system/multilib/cloog.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/cloog.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -28,8 +28,7 @@
+ 
+ <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
+ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+-  ./configure --prefix=/usr \
+-    --host=${CLFS_TARGET32} --enable-shared --with-isl=system</userinput></screen>
++  ./configure --prefix=/usr --host=${CLFS_TARGET32} --with-isl=system</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/cloog.xml"
+@@ -63,10 +62,6 @@
+     href="../common/cloog.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/cloog.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/coreutils.xml BOOK/final-system/multilib/coreutils.xml
+--- /home/jp/a/BOOK/final-system/multilib/coreutils.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/coreutils.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -37,7 +37,7 @@
+    ./configure --prefix=/usr \
+     --enable-no-install-program=kill,uptime \
+     --enable-install-program=hostname</userinput></screen>
+-    
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/coreutils.xml"
+     xpointer="xpointer(//*[@os='d1'])"/>
+@@ -106,10 +106,6 @@
+     href="../common/coreutils.xml"
+     xpointer="xpointer(//*[@os='t'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/coreutils.xml"
+-    xpointer="xpointer(//*[@os='u'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+Seulement dans BOOK/final-system/multilib: dbus-64bit.xml
+Seulement dans BOOK/final-system/multilib: dbus-n32.xml
+Seulement dans BOOK/final-system/multilib: dbus.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/diffutils.xml BOOK/final-system/multilib/diffutils.xml
+--- /home/jp/a/BOOK/final-system/multilib/diffutils.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/diffutils.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -23,17 +23,25 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/diffutils.xml"
++    xpointer="xpointer(//*[@os='s1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/diffutils.xml"
++    xpointer="xpointer(//*[@os='s2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/diffutils.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/diffutils.xml"
+-    xpointer="xpointer(//*[@os='s1'])"/>
++    xpointer="xpointer(//*[@os='s3'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/diffutils.xml"
+-    xpointer="xpointer(//*[@os='s2'])"/>
++    xpointer="xpointer(//*[@os='s4'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/diffutils.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/e2fsprogs-64bit.xml BOOK/final-system/multilib/e2fsprogs-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/e2fsprogs-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -38,8 +38,9 @@
+     href="e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+-  ../configure --prefix=/usr --with-root-prefix="" \
++<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
++CC="gcc ${BUILD64}"  \
++../configure --prefix=/usr --with-root-prefix="" \
+     --enable-elf-shlibs --disable-libblkid \
+     --disable-libuuid --disable-fsck \
+     --disable-uuidd</userinput></screen>
+diff -ru /home/jp/a/BOOK/final-system/multilib/e2fsprogs-n32.xml BOOK/final-system/multilib/e2fsprogs-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/e2fsprogs-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/e2fsprogs-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -39,8 +39,9 @@
+     href="e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+-  ../configure --prefix=/usr --with-root-prefix="" \
++<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
++CC="gcc ${BUILDN32}" \
++../configure --prefix=/usr --with-root-prefix="" \
+     --enable-elf-shlibs --disable-libblkid \
+     --disable-libuuid --disable-fsck \
+     --disable-uuidd</userinput></screen>
+diff -ru /home/jp/a/BOOK/final-system/multilib/e2fsprogs.xml BOOK/final-system/multilib/e2fsprogs.xml
+--- /home/jp/a/BOOK/final-system/multilib/e2fsprogs.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/e2fsprogs.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -34,8 +34,9 @@
+     href="../common/e2fsprogs.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+-  ../configure --prefix=/usr --with-root-prefix="" \
++<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
++CC="gcc ${BUILD32}" \
++../configure --prefix=/usr --with-root-prefix="" \
+     --enable-elf-shlibs --disable-libblkid \
+     --disable-libuuid --disable-fsck \
+     --disable-uuidd</userinput></screen>
+Seulement dans /home/jp/a/BOOK/final-system/multilib: eglibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: eglibc.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: eudev-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: eudev-n32.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: eudev.xml
+Seulement dans BOOK/final-system/multilib: expat-64bit.xml
+Seulement dans BOOK/final-system/multilib: expat-n32.xml
+Seulement dans BOOK/final-system/multilib: expat.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/findutils.xml BOOK/final-system/multilib/findutils.xml
+--- /home/jp/a/BOOK/final-system/multilib/findutils.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/findutils.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -66,22 +66,6 @@
+     href="../common/findutils.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/findutils.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/findutils.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/findutils.xml"
+-    xpointer="xpointer(//*[@os='k'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/findutils.xml"
+-    xpointer="xpointer(//*[@os='l'])"/>
+-
+   </sect2>
+ 
+   <sect2 id="contents-findutils" role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/flex-64bit.xml BOOK/final-system/multilib/flex-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/flex-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/flex-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -26,7 +26,7 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+-    --libdir=/usr/lib64</userinput></screen>
++    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="flex.xml"
+@@ -45,6 +45,10 @@
+     xpointer="xpointer(//*[@os='e2'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/flex.xml"
++    xpointer="xpointer(//*[@os='e3'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="flex.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+@@ -52,20 +56,13 @@
+     href="../common/flex.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+-    <para os="h">There are some packages that expect to find the
+-    <filename class="libraryfile">lex</filename> library in <filename
+-    class="directory">/usr/lib64</filename>. Create a symlink to account for
+-    this:</para>
+-
+-<screen os="i"><userinput>ln -sv libfl.a /usr/lib64/libl.a</userinput></screen>
+-
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/flex.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
++    xpointer="xpointer(//*[@os='h'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/flex.xml"
+-    xpointer="xpointer(//*[@os='k'])"/>
++    xpointer="xpointer(//*[@os='i'])"/>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/flex-n32.xml BOOK/final-system/multilib/flex-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/flex-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/flex-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -26,7 +26,7 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+-   --libdir=/usr/lib32</userinput></screen>
++   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="flex.xml"
+@@ -44,13 +44,6 @@
+     href="flex.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+-    <para os="h">There are some packages that expect to find the
+-    <filename class="libraryfile">lex</filename> library in <filename
+-    class="directory">/usr/lib32</filename>. Create a symlink to account for
+-    this:</para>
+-
+-<screen os="i"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/flex.xml BOOK/final-system/multilib/flex.xml
+--- /home/jp/a/BOOK/final-system/multilib/flex.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/flex.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -26,27 +26,20 @@
+     href="../common/flex.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
++    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/flex.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="d"><userinput>make libfl.a libfl_pic.a</userinput></screen>
++<screen os="d"><userinput>make</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/flex.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+-<screen os="g"><userinput>make install-libLIBRARIES</userinput></screen>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/flex.xml"
+-    xpointer="xpointer(//*[@os='h'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/flex.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
++<screen os="g"><userinput>make install</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/gawk.xml BOOK/final-system/multilib/gawk.xml
+--- /home/jp/a/BOOK/final-system/multilib/gawk.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gawk.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -52,6 +52,14 @@
+     href="../common/gawk.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/gawk.xml"
++    xpointer="xpointer(//*[@os='h'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/gawk.xml"
++    xpointer="xpointer(//*[@os='i'])"/>
++
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/gcc.xml BOOK/final-system/multilib/gcc.xml
+--- /home/jp/a/BOOK/final-system/multilib/gcc.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gcc.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -39,14 +39,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"
+@@ -57,16 +49,17 @@
+     href="../common/gcc.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-<screen os="i"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
++<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include ${BUILD64}" \
+ CXX="g++ -isystem /usr/include ${BUILD64}" \
+ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \
+   ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
+-    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
+-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
++    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit \ 
+     --enable-clocale=gnu --enable-languages=c,c++ --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>
++
++   <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"
+@@ -139,8 +132,8 @@
+     <para os="y">Finally, move some misplaced files:</para>
+ 
+ 
+-<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
+-mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
++<screen os="z"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib
++mv -v /usr/lib64/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
+ 
+   </sect2>
+ 
+Seulement dans BOOK/final-system/multilib: gdbm-64bit.xml
+Seulement dans BOOK/final-system/multilib: gdbm-n32.xml
+Seulement dans BOOK/final-system/multilib: gdbm.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/gettext-64bit.xml BOOK/final-system/multilib/gettext-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/gettext-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gettext-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -26,7 +26,8 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+-   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
++   ./configure --prefix=/usr --libdir=/usr/lib64 \
++   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+ 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gettext.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/gettext-n32.xml BOOK/final-system/multilib/gettext-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/gettext-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gettext-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -27,7 +27,8 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+-   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
++   ./configure --prefix=/usr --libdir=/usr/lib32 \
++   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+ 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gettext.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/gettext.xml BOOK/final-system/multilib/gettext.xml
+--- /home/jp/a/BOOK/final-system/multilib/gettext.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gettext.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -27,7 +27,8 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+-   ./configure --prefix=/usr</userinput></screen>
++   ./configure --prefix=/usr \
++   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gettext.xml"
+Seulement dans BOOK/final-system/multilib: glibc-64bit.xml
+Seulement dans BOOK/final-system/multilib: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/gmp-64bit.xml BOOK/final-system/multilib/gmp-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/gmp-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gmp-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -43,7 +43,8 @@
+ CXX="g++ -isystem /usr/include ${BUILD64}" \
+ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+   ./configure --prefix=/usr \
+-    --libdir=/usr/lib64 --enable-cxx</userinput></screen>
++    --libdir=/usr/lib64 --enable-cxx \
++    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gmp.xml"
+@@ -73,13 +74,25 @@
+     href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+-    <para os="j">Create the 64bit header file:</para>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/gmp.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/gmp.xml"
++    xpointer="xpointer(//*[@os='k'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/gmp.xml"
++    xpointer="xpointer(//*[@os='l'])"/>
++
++    <para os="m">Create the 64bit header file:</para>
+ 
+-<screen os="k"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
++<screen os="n"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+ 
+-    <para os="l">Finally, create a stub header in the place of the originals:</para>
++    <para os="o">Finally, create a stub header in the place of the originals:</para>
+ 
+-<screen os="m"><userinput>cat > /usr/include/gmp.h << "EOF"
++<screen os="p"><userinput>cat > /usr/include/gmp.h << "EOF"
+ /* gmp.h - Stub Header  */
+ #ifndef __STUB__GMP_H__
+ #define __STUB__GMP_H__
+diff -ru /home/jp/a/BOOK/final-system/multilib/gmp-n32.xml BOOK/final-system/multilib/gmp-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/gmp-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gmp-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -57,14 +57,6 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gmp.xml"
+-    xpointer="xpointer(//*[@os='e'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/gmp.xml"
+-    xpointer="xpointer(//*[@os='f'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -75,9 +67,13 @@
+     href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+-    <para os="j">Create the N32 header file:</para>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/gmp.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
++    <para os="k">Create the N32 header file:</para>
+ 
+-<screen os="k"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
++<screen os="l"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/gmp.xml BOOK/final-system/multilib/gmp.xml
+--- /home/jp/a/BOOK/final-system/multilib/gmp.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gmp.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -55,14 +55,6 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gmp.xml"
+-    xpointer="xpointer(//*[@os='e'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/gmp.xml"
+-    xpointer="xpointer(//*[@os='f'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -73,9 +65,13 @@
+     href="../common/gmp.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+-    <para os="j">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/gmp.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
++    <para os="k">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
+ 
+-<screen os="k"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
++<screen os="l"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
+ 
+   </sect2>
+ 
+Seulement dans BOOK/final-system/multilib: gperf.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/groff.xml BOOK/final-system/multilib/groff.xml
+--- /home/jp/a/BOOK/final-system/multilib/groff.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/groff.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -53,14 +53,6 @@
+     href="../common/groff.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/groff.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/groff.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/gzip.xml BOOK/final-system/multilib/gzip.xml
+--- /home/jp/a/BOOK/final-system/multilib/gzip.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/gzip.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -39,9 +39,7 @@
+     href="../common/gzip.xml"
+     xpointer="xpointer(//*[@os='e'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/gzip.xml"
+-    xpointer="xpointer(//*[@os='e2'])"/>
++<screen><userinput remap="test">make PERL=perl-64 check</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/gzip.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/iproute2.xml BOOK/final-system/multilib/iproute2.xml
+--- /home/jp/a/BOOK/final-system/multilib/iproute2.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/iproute2.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -28,14 +28,6 @@
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/iproute2.xml"
+     xpointer="xpointer(//*[@os='s2'])"/>
+-    
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/iproute2.xml"
+-    xpointer="xpointer(//*[@os='f1'])"/>
+-    
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/iproute2.xml"
+-    xpointer="xpointer(//*[@os='f2'])"/>
+ 
+     <para os="p1">This patch adds the ability to update the LIBDIR path:</para>
+ 
+@@ -45,8 +37,7 @@
+     href="../common/iproute2.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
+-    DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
++<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/iproute2.xml"
+@@ -56,13 +47,8 @@
+     href="../common/iproute2.xml"
+     xpointer="xpointer(//*[@os='d'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/iproute2.xml"
+-    xpointer="xpointer(//*[@os='e'])"/>
+-
+-<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
+-    DOCDIR=/usr/share/doc/iproute2 \
+-    MANDIR=/usr/share/man install</userinput></screen>
++<screen os="e"><userinput>make LIBDIR=/usr/lib64 \
++    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/iputils.xml BOOK/final-system/multilib/iputils.xml
+--- /home/jp/a/BOOK/final-system/multilib/iputils.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/iputils.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -33,7 +33,7 @@
+     href="../common/iputils.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
++<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
+     IPV4_TARGETS="tracepath ping clockdiff rdisc" \
+     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/isl-64bit.xml BOOK/final-system/multilib/isl-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/isl-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/isl-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -57,11 +57,7 @@
+     href="../common/isl.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/isl.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+-<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
++<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
+ mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/isl-n32.xml BOOK/final-system/multilib/isl-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/isl-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/isl-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -58,11 +58,7 @@
+     href="../common/isl.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/isl.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+-<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
++<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
+ mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32</userinput></screen>
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/isl.xml BOOK/final-system/multilib/isl.xml
+--- /home/jp/a/BOOK/final-system/multilib/isl.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/isl.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -62,10 +62,6 @@
+     href="../common/isl.xml"
+     xpointer="xpointer(//*[@os='j'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/isl.xml"
+-    xpointer="xpointer(//*[@os='k'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/kbd.xml BOOK/final-system/multilib/kbd.xml
+--- /home/jp/a/BOOK/final-system/multilib/kbd.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/kbd.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -32,7 +32,9 @@
+     href="../common/kbd.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+-<screen os="d"><userinput>make</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kbd.xml"
++    xpointer="xpointer(//*[@os='d'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kbd.xml"
+@@ -54,6 +56,22 @@
+     href="../common/kbd.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kbd.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kbd.xml"
++    xpointer="xpointer(//*[@os='k'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kbd.xml"
++    xpointer="xpointer(//*[@os='l'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/kbd.xml"
++    xpointer="xpointer(//*[@os='m'])"/>
++
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/kmod-64bit.xml BOOK/final-system/multilib/kmod-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/kmod-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/kmod-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -26,10 +26,10 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
+-        ./configure --prefix=/usr \
+-        --bindir=/bin --sysconfdir=/etc \
+-        --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
+-        --with-zlib --with-xz --disable-manpages</userinput></screen>
++  ./configure --prefix=/usr \
++    --bindir=/bin --sysconfdir=/etc \
++    --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
++    --with-zlib --with-xz</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kmod.xml"
+@@ -58,11 +58,11 @@
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kmod.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+-    
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kmod.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+-    
++
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kmod.xml"
+     xpointer="xpointer(//*[@os='j'])"/>
+diff -ru /home/jp/a/BOOK/final-system/multilib/kmod-n32.xml BOOK/final-system/multilib/kmod-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/kmod-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/kmod-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -26,11 +26,11 @@
+     href="../common/kmod.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-    <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
+-            ./configure --prefix=/usr \
+-            --bindir=/bin --sysconfdir=/etc \
+-            --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
+-            --with-zlib --with-xz --disable-manpages</userinput></screen>
++<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
++  ./configure --prefix=/usr \
++    --bindir=/bin --sysconfdir=/etc \
++    --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
++    --with-zlib --with-xz</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kmod.xml"
+@@ -59,7 +59,7 @@
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kmod.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+-    
++
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/kmod.xml BOOK/final-system/multilib/kmod.xml
+--- /home/jp/a/BOOK/final-system/multilib/kmod.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/kmod.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -27,10 +27,10 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
+-        ./configure --prefix=/usr \
+-        --bindir=/bin --sysconfdir=/etc \
+-        --with-rootlibdir=/lib --libdir=/usr/lib \
+-        --with-zlib --with-xz --disable-manpages</userinput></screen>
++  ./configure --prefix=/usr \
++    --bindir=/bin --sysconfdir=/etc \
++    --with-rootlibdir=/lib --libdir=/usr/lib \
++    --with-zlib --with-xz</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/kmod.xml"
+@@ -61,7 +61,7 @@
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+   </sect2>
+-  
++
+   <sect2 role="content">
+     <title/>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/less.xml BOOK/final-system/multilib/less.xml
+--- /home/jp/a/BOOK/final-system/multilib/less.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/less.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -56,10 +56,6 @@
+     href="../common/less.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/less.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+Seulement dans BOOK/final-system/multilib: libcap-64bit.xml
+Seulement dans BOOK/final-system/multilib: libcap-n32.xml
+Seulement dans BOOK/final-system/multilib: libcap.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: libee-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: libee-n32.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: libee.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: libestr-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: libestr-n32.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: libestr.xml
+Seulement dans BOOK/final-system/multilib: libpipeline-64bit.xml
+Seulement dans BOOK/final-system/multilib: libpipeline-n32.xml
+Seulement dans BOOK/final-system/multilib: libpipeline.xml
+Seulement dans BOOK/final-system/multilib: man-db.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: man.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/mpc-64bit.xml BOOK/final-system/multilib/mpc-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/mpc-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/mpc-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -27,7 +27,8 @@
+ 
+ <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
++  ./configure --prefix=/usr --libdir=/usr/lib64 \
++  --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/mpc.xml"
+@@ -57,6 +58,18 @@
+     href="../common/mpc.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/mpc.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/mpc.xml"
++    xpointer="xpointer(//*[@os='k'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/mpc.xml"
++    xpointer="xpointer(//*[@os='l'])"/>
++
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/mpc-n32.xml BOOK/final-system/multilib/mpc-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/mpc-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/mpc-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -40,14 +40,6 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/mpc.xml"
+-    xpointer="xpointer(//*[@os='e'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/mpc.xml"
+-    xpointer="xpointer(//*[@os='f'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/mpc.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -58,6 +50,10 @@
+     href="../common/mpc.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/mpc.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/mpc.xml BOOK/final-system/multilib/mpc.xml
+--- /home/jp/a/BOOK/final-system/multilib/mpc.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/mpc.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -40,14 +40,6 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/mpc.xml"
+-    xpointer="xpointer(//*[@os='e'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/mpc.xml"
+-    xpointer="xpointer(//*[@os='f'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/mpc.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -58,6 +50,10 @@
+     href="../common/mpc.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/mpc.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/mpfr-64bit.xml BOOK/final-system/multilib/mpfr-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/mpfr-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/mpfr-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -34,8 +34,9 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+-  ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
++    LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
++    ./configure --prefix=/usr --libdir=/usr/lib64 \
++    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/mpfr.xml"
+@@ -61,10 +62,6 @@
+     href="../common/mpfr.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/mpfr.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/mpfr-n32.xml BOOK/final-system/multilib/mpfr-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/mpfr-n32.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/multilib/mpfr-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -35,8 +35,9 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
+-LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+-  ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
++    LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
++    ./configure --prefix=/usr --libdir=/usr/lib32 \
++    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/mpfr.xml"
+@@ -62,10 +63,6 @@
+     href="../common/mpfr.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/mpfr.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/mpfr.xml BOOK/final-system/multilib/mpfr.xml
+--- /home/jp/a/BOOK/final-system/multilib/mpfr.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/mpfr.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -35,8 +35,9 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
+-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+-  ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
++    LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
++    ./configure --prefix=/usr --host=${CLFS_TARGET32} \
++    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/mpfr.xml"
+@@ -62,10 +63,6 @@
+     href="../common/mpfr.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/mpfr.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/ncurses-64bit.xml BOOK/final-system/multilib/ncurses-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/ncurses-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/ncurses-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -36,7 +36,7 @@
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+    ./configure --prefix=/usr --libdir=/lib64 \
+    --with-shared --without-debug --enable-widec \
+-   --with-manpage-format=normal \
++   --with-manpage-format=normal --enable-pc-files \
+    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -73,18 +73,18 @@
+ 
+     <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
+ 
+-<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
+-ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
+-ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
+-ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
+-ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
++<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
++ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
++ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
++ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
++rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="ncurses.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+ <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+-        echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
++        echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
+         ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a
+ done
+ ln -sfv libcurses.so /usr/lib64/libcursesw.so
+@@ -95,11 +95,6 @@
+ ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
+ 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/lib64</filename> for compatibility:</para>
+-
+-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib64/terminfo</userinput></screen>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/ncurses-n32.xml BOOK/final-system/multilib/ncurses-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/ncurses-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/ncurses-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -37,7 +37,7 @@
+ <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+    ./configure --prefix=/usr --libdir=/lib32 \
+    --with-shared --without-debug --enable-widec \
+-   --with-manpage-format=normal \
++   --with-manpage-format=normal --enable-pc-files \
+    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -73,18 +73,18 @@
+ 
+     <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
+ 
+-<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
+-ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
+-ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
+-ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
+-ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
++<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
++ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
++ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
++ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
++rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="ncurses.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+ <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+-        echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
++        echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
+         ln -sfv lib${lib}w.a /usr/lib32/lib${lib}.a
+ done
+ ln -sfv libcurses.so /usr/lib32/libcursesw.so
+@@ -94,11 +94,6 @@
+ ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
+ ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ 
+-    <para os="n">Now we will create a symlink for /usr/share/terminfo in
+-    <filename class="directory">/usr/lib32</filename> for compatibility:</para>
+-
+-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib32/terminfo</userinput></screen>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/ncurses.xml BOOK/final-system/multilib/ncurses.xml
+--- /home/jp/a/BOOK/final-system/multilib/ncurses.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/ncurses.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -37,11 +37,15 @@
+ <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+    ./configure --prefix=/usr --libdir=/lib \
+    --with-shared --without-debug --enable-widec \
+-   --with-manpage-format=normal \
++   --with-manpage-format=normal --enable-pc-files \
+    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/ncurses.xml"
++    xpointer="xpointer(//*[@os='b1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/ncurses.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -86,7 +90,7 @@
+     xpointer="xpointer(//*[@os='l'])"/>
+ 
+ <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 libcurses.so /usr/lib/libcursesw.so
+@@ -96,14 +100,6 @@
+ ln -sfv libncurses++w.a /usr/lib/libncurses++.a
+ ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/ncurses.xml"
+-    xpointer="xpointer(//*[@os='n'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/ncurses.xml"
+-    xpointer="xpointer(//*[@os='o'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/perl-64bit.xml BOOK/final-system/multilib/perl-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/perl-64bit.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/multilib/perl-64bit.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -30,21 +30,16 @@
+        -e '/^LIB/s,\./zlib-src,/usr/lib64,' \
+        cpan/Compress-Raw-Zlib/config.in</userinput></screen>
+ 
+-    <para os="mp1">Perl does not, by default, know about library directories with names other
+-    than lib, The following patch will allow it to install to other directories:</para>
++    <para os="mp1">Perl does not, by default, know about library directories
++    with names other than <filename class="directory">lib</filename>. The
++    following patch will allow it to install to other directories:</para>
+ 
+ <screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
+ 
+-    <para os="s1">There is a further (possibly cosmetic) anomaly - if we install perl and
+-    then run <command>perl -V</command> it will claim that libc is in /lib.  The
+-    following sed fixes this, but only takes effect when <command>make install
+-    </command> is run:</para>
++    <para os="m2">We still need to tell Perl to actually use
++    <filename class="directory">lib64</filename>:</para>
+ 
+-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib64@" hints/linux.sh</userinput></screen>
+-
+-    <para os="m2">We still need to tell perl to actually use lib64:</para>
+-
+-<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
++<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >> hints/linux.sh</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/perl.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/perl-n32.xml BOOK/final-system/multilib/perl-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/perl-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/perl-n32.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -39,15 +39,10 @@
+     href="perl-64bit.xml"
+     xpointer="xpointer(//*[@os='mp2'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="perl-64bit.xml"
+-    xpointer="xpointer(//*[@os='s1'])"/>
+-
+-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib32@" hints/linux.sh</userinput></screen>
+-
+-    <para os="m2">We still need to tell perl to actually use lib32:</para>
++    <para os="m2">We still need to tell perl to actually use
++    <filename class="directory">lib32</filename>:</para>
+ 
+-<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >>hints/linux.sh</userinput></screen>
++<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >> hints/linux.sh</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/perl.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/pkg-config-lite.xml BOOK/final-system/multilib/pkg-config-lite.xml
+--- /home/jp/a/BOOK/final-system/multilib/pkg-config-lite.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/pkg-config-lite.xml	2014-10-03 20:44:43.920339262 +0200
+@@ -26,7 +26,7 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+-    --with-pc-path=/usr/share/pkgconfig</userinput></screen>
++    --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version; --with-pc-path=/usr/share/pkgconfig</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/pkg-config-lite.xml"
+Seulement dans /home/jp/a/BOOK/final-system/multilib: procps-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: procps-n32.xml
+Seulement dans BOOK/final-system/multilib: procps-ng-64bit.xml
+Seulement dans BOOK/final-system/multilib: procps-ng-n32.xml
+Seulement dans BOOK/final-system/multilib: procps-ng.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: procps.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/psmisc.xml BOOK/final-system/multilib/psmisc.xml
+--- /home/jp/a/BOOK/final-system/multilib/psmisc.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/psmisc.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -25,8 +25,7 @@
+     href="../common/psmisc.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+-   --exec-prefix=""</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/psmisc.xml"
+@@ -48,26 +47,6 @@
+     href="../common/psmisc.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/psmisc.xml"
+-    xpointer="xpointer(//*[@os='h'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/psmisc.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/psmisc.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/psmisc.xml"
+-    xpointer="xpointer(//*[@os='k'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/psmisc.xml"
+-    xpointer="xpointer(//*[@os='l'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/readline-64bit.xml BOOK/final-system/multilib/readline-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/readline-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/readline-64bit.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -34,7 +34,8 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+-   ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
++   ./configure --prefix=/usr --libdir=/lib64 \
++    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="readline.xml"
+@@ -60,23 +61,13 @@
+     href="readline.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="readline.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="readline.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+-<screen os="k"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
++<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
+ 
+-    <para os="l">Next, remove the <filename class="extension">.so</filename>
+-    files in <filename class="directory">/lib64</filename> and relink them into
+-    <filename class="directory">/usr/lib64</filename>.</para>
++    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
+ 
+-<screen os="m"><userinput>rm -v /lib64/lib{readline,history}.so
+-ln -svf ../../lib64/libreadline.so.&readline-version2; /usr/lib64/libreadline.so
+-ln -svf ../../lib64/libhistory.so.&readline-version2; /usr/lib64/libhistory.so</userinput></screen>
++<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libreadline.so) /usr/lib64/libreadline.so
++ln -svf ../../lib64/$(readlink /lib64/libhistory.so) /usr/lib64/libhistory.so
++rm -v /lib64/lib{readline,history}.so</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/readline-n32.xml BOOK/final-system/multilib/readline-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/readline-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/readline-n32.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -35,7 +35,8 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+-   ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
++   ./configure --prefix=/usr --libdir=/lib32 \
++    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="readline.xml"
+@@ -61,23 +62,13 @@
+     href="readline.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="readline.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="readline.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+-<screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
++<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
+ 
+-    <para os="l">Next, remove the <filename class="extension">.so</filename>
+-    files in <filename class="directory">/lib32</filename> and relink them into
+-    <filename class="directory">/usr/lib32</filename>.</para>
++    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
+ 
+-<screen os="m"><userinput>rm -v /lib32/lib{readline,history}.so
+-ln -svf ../../lib32/libreadline.so.&readline-version2; /usr/lib32/libreadline.so
+-ln -svf ../../lib32/libhistory.so.&readline-version2; /usr/lib32/libhistory.so</userinput></screen>
++<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
++ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
++rm -v /lib32/lib{readline,history}.so</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/readline.xml BOOK/final-system/multilib/readline.xml
+--- /home/jp/a/BOOK/final-system/multilib/readline.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/readline.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -35,7 +35,8 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+-   ./configure --prefix=/usr --libdir=/lib</userinput></screen>
++   ./configure --prefix=/usr --libdir=/lib \
++    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/readline.xml"
+@@ -73,14 +74,6 @@
+     href="../common/readline.xml"
+     xpointer="xpointer(//*[@os='k'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/readline.xml"
+-    xpointer="xpointer(//*[@os='l'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/readline.xml"
+-    xpointer="xpointer(//*[@os='m'])"/>
+-
+   </sect2>
+ 
+  <sect2 role="content">
+Seulement dans /home/jp/a/BOOK/final-system/multilib: rsyslog.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/sed.xml BOOK/final-system/multilib/sed.xml
+--- /home/jp/a/BOOK/final-system/multilib/sed.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/multilib/sed.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -26,7 +26,7 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+-   --bindir=/bin</userinput></screen>
++   --bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/sed.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/shadow.xml BOOK/final-system/multilib/shadow.xml
+--- /home/jp/a/BOOK/final-system/multilib/shadow.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/shadow.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -91,6 +91,10 @@
+     href="../common/shadow.xml"
+     xpointer="xpointer(//*[@os='v'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/shadow.xml"
++    xpointer="xpointer(//*[@os='w'])"/>
++
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+Seulement dans BOOK/final-system/multilib: systemd-64bit.xml
+Seulement dans BOOK/final-system/multilib: systemd-n32.xml
+Seulement dans BOOK/final-system/multilib: systemd.xml
+Seulement dans /home/jp/a/BOOK/final-system/multilib: sysvinit.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/tar.xml BOOK/final-system/multilib/tar.xml
+--- /home/jp/a/BOOK/final-system/multilib/tar.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/tar.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -69,6 +69,14 @@
+     href="../common/tar.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/tar.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/tar.xml"
++    xpointer="xpointer(//*[@os='k'])"/>
++
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/temp-perl.xml BOOK/final-system/multilib/temp-perl.xml
+--- /home/jp/a/BOOK/final-system/multilib/temp-perl.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/temp-perl.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -28,10 +28,6 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/temp-perl.xml"
+-    xpointer="xpointer(//*[@os='b'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/temp-perl.xml"
+     xpointer="xpointer(//*[@os='s1'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/texinfo.xml BOOK/final-system/multilib/texinfo.xml
+--- /home/jp/a/BOOK/final-system/multilib/texinfo.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/texinfo.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -51,14 +51,6 @@
+     href="../common/texinfo.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/texinfo.xml"
+-    xpointer="xpointer(//*[@os='h'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/texinfo.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/util-linux-64bit.xml BOOK/final-system/multilib/util-linux-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/util-linux-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/util-linux-64bit.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -27,10 +27,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/util-linux.xml"
++    xpointer="xpointer(//*[@os='n'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/util-linux.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
+-    --enable-write</userinput></screen>
++    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/util-linux.xml"
+@@ -60,14 +64,6 @@
+     href="../common/util-linux.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/util-linux.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/util-linux.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+   </sect2>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/util-linux-n32.xml BOOK/final-system/multilib/util-linux-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/util-linux-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/util-linux-n32.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -27,7 +27,7 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
+-    --enable-write</userinput></screen>
++    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/util-linux.xml"
+@@ -57,14 +57,6 @@
+     href="../common/util-linux.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
+ 
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/util-linux.xml"
+-    xpointer="xpointer(//*[@os='i'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/util-linux.xml"
+-    xpointer="xpointer(//*[@os='j'])"/>
+-
+   </sect2>
+ 
+   <sect2 role="content">
+diff -ru /home/jp/a/BOOK/final-system/multilib/util-linux.xml BOOK/final-system/multilib/util-linux.xml
+--- /home/jp/a/BOOK/final-system/multilib/util-linux.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/util-linux.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -27,7 +27,7 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
+-    --enable-write</userinput></screen>
++    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/util-linux.xml"
+@@ -43,14 +43,6 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/util-linux.xml"
+-    xpointer="xpointer(//*[@os='dummy1'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/util-linux.xml"
+-    xpointer="xpointer(//*[@os='dummy2'])"/>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/util-linux.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/multilib/vim.xml BOOK/final-system/multilib/vim.xml
+--- /home/jp/a/BOOK/final-system/multilib/vim.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/vim.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -46,12 +46,7 @@
+     xpointer="xpointer(//*[@os='d'])"/>
+ 
+ <screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+-  ./configure --prefix=/usr \
+-    --enable-multibyte</userinput></screen>
+-
+-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-    href="../common/vim.xml"
+-    xpointer="xpointer(//*[@os='f'])"/>
++  ./configure --prefix=/usr</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/vim.xml"
+Seulement dans BOOK/final-system/multilib: xml-parser-64bit.xml
+Seulement dans BOOK/final-system/multilib: xml-parser-n32.xml
+Seulement dans BOOK/final-system/multilib: xml-parser.xml
+diff -ru /home/jp/a/BOOK/final-system/multilib/xz-64bit.xml BOOK/final-system/multilib/xz-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/xz-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/xz-64bit.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -11,7 +11,7 @@
+   <title>XZ Utils-&xz-version; 64 Bit</title>
+ 
+   <indexterm zone="ch-system-xz">
+-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
++    <primary sortas="a-XZ Utils">XZ Utils</primary>
+   </indexterm>
+ 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+@@ -19,13 +19,14 @@
+   xpointer="xpointer(//*[@role='package'])"/>
+ 
+   <sect2 role="installation">
+-    <title>Installation of XZ-Utils</title>
++    <title>Installation of XZ Utils</title>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="xz.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
++    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="xz.xml"
+@@ -64,7 +65,7 @@
+     xpointer="xpointer(//*[@os='j'])"/>
+ 
+ <screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
+-ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
++ln -sfv ../../lib64/$(readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/xz-n32.xml BOOK/final-system/multilib/xz-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/xz-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/xz-n32.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -11,7 +11,7 @@
+   <title>XZ Utils-&xz-version; N32 Libraries</title>
+ 
+   <indexterm zone="ch-system-xz-n32">
+-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
++    <primary sortas="a-XZ Utils">XZ Utils</primary>
+     <secondary>N32</secondary>
+   </indexterm>
+ 
+@@ -26,7 +26,8 @@
+     href="xz.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
++    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="xz.xml"
+@@ -55,7 +56,7 @@
+     xpointer="xpointer(//*[@os='j'])"/>
+ 
+ <screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
+-ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
++ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/xz.xml BOOK/final-system/multilib/xz.xml
+--- /home/jp/a/BOOK/final-system/multilib/xz.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/xz.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -11,7 +11,7 @@
+   <title>XZ Utils-&xz-version; 32 Bit Libraries</title>
+ 
+   <indexterm zone="ch-system-xz-32">
+-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
++    <primary sortas="a-XZ Utils">XZ Utils</primary>
+     <secondary>32 Bit</secondary>
+   </indexterm>
+ 
+@@ -26,7 +26,8 @@
+     href="../common/xz.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
++<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
++    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/xz.xml"
+diff -ru /home/jp/a/BOOK/final-system/multilib/zlib-64bit.xml BOOK/final-system/multilib/zlib-64bit.xml
+--- /home/jp/a/BOOK/final-system/multilib/zlib-64bit.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/zlib-64bit.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -56,12 +56,20 @@
+ 
+     <para os="h">The previous command installed two <filename
+     class="extension">.so</filename> files into <filename
+-    class="directory">/usr/lib64</filename>. We will move it into
+-    <filename class="directory">/lib64</filename> and then relink it
+-    to <filename class="directory">/usr/lib64</filename>:</para>
++    class="directory">/usr/lib64</filename>. We will move them into
++    <filename class="directory">/lib64</filename> and then recreate a link
++    in <filename class="directory">/usr/lib64</filename>:</para>
+ 
+ <screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
+-ln -svf ../../lib64/libz.so.1 /usr/lib64/libz.so</userinput></screen>
++ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/zlib.xml"
++    xpointer="xpointer(//*[@os='j'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/zlib.xml"
++    xpointer="xpointer(//*[@os='k'])"/>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/multilib/zlib-n32.xml BOOK/final-system/multilib/zlib-n32.xml
+--- /home/jp/a/BOOK/final-system/multilib/zlib-n32.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/multilib/zlib-n32.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -57,12 +57,12 @@
+ 
+     <para os="h">The previous command installed two <filename
+     class="extension">.so</filename> files into <filename
+-    class="directory">/usr/lib32</filename>. We will remove itinto
+-    <filename class="directory">/lib32</filename> and then relink it
+-    to <filename class="directory">/usr/lib32</filename>:</para>
++    class="directory">/usr/lib32</filename>. We will move them into
++    <filename class="directory">/lib32</filename> and then recreate a link
++    in <filename class="directory">/usr/lib32</filename>:</para>
+ 
+ <screen os="i"><userinput>mv -v /usr/lib32/libz.so.* /lib32
+-ln -svf ../../lib32/libz.so.1 /usr/lib32/libz.so</userinput></screen>
++ln -sfv ../../lib32/$(readlink /usr/lib32/libz.so) /usr/lib32/libz.so</userinput></screen>
+ 
+   </sect2>
+ 
+diff -ru /home/jp/a/BOOK/final-system/ppc/adjusting.xml BOOK/final-system/ppc/adjusting.xml
+--- /home/jp/a/BOOK/final-system/ppc/adjusting.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/ppc/adjusting.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -4,6 +4,7 @@
+   <!ENTITY % general-entities SYSTEM "../../general.ent">
+   %general-entities;
+ ]>
++
+ <sect1 id="ch-system-adjusting">
+   <?dbhtml filename="adjusting.html"?>
+ 
+@@ -21,10 +22,6 @@
+   href="../common/adjusting.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../common/adjusting.xml"
+-  xpointer="xpointer(//*[@os='e'])"/>
+-
+   <caution>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+Seulement dans /home/jp/a/BOOK/final-system/ppc: eglibc.xml
+diff -ru /home/jp/a/BOOK/final-system/ppc/gcc.xml BOOK/final-system/ppc/gcc.xml
+--- /home/jp/a/BOOK/final-system/ppc/gcc.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/ppc/gcc.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -39,14 +39,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"
+@@ -61,6 +53,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'])"/>
+Seulement dans BOOK/final-system/ppc: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/ppc/hfsutils.xml BOOK/final-system/ppc/hfsutils.xml
+--- /home/jp/a/BOOK/final-system/ppc/hfsutils.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/ppc/hfsutils.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -18,21 +18,23 @@
+     <title/>
+ 
+     <para>The Hfsutils package contains a number of utilities for accessing
+-    files on hfs filesystems. It is needed to run <command>ybin</command>.</para>
++    files on <systemitem class="filesystem">hfs</systemitem> filesystems.
++    It is needed to run <command>ybin</command>.</para>
+ 
+   </sect2>
+ 
+   <sect2 role="installation">
+     <title>Installation of Hfsutils</title>
+ 
+-    <para os="p1">The following patch contains fixes. One that fixes a missing errno.h, the other
+-    that allows HFSutils to recognize beyond 2gb devices:</para>
++    <para os="p1">Apply the following patch to add a missing
++    <filename>errno.h</filename> include and allow HFSutils to recognize
++    devices larger than 2GB:</para>
+ 
+ <screen os="p2"><userinput>patch -Np1 -i ../&hfsutils-fixes-patch;</userinput></screen>
+ 
+     <para os="a">Prepare Hfsutils for compilation:</para>
+ 
+-<screen><userinput>./configure --prefix=/usr</userinput></screen>
++<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
+ 
+     <para os="c">Compile the package:</para>
+ 
+diff -ru /home/jp/a/BOOK/final-system/ppc64/adjusting.xml BOOK/final-system/ppc64/adjusting.xml
+--- /home/jp/a/BOOK/final-system/ppc64/adjusting.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64/adjusting.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -22,10 +22,6 @@
+   href="../common/adjusting.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../multilib/adjusting.xml"
+-  xpointer="xpointer(//*[@os='m1'])"/>
+-
+   <caution>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+Seulement dans /home/jp/a/BOOK/final-system/ppc64: eglibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/ppc64: eglibc.xml
+diff -ru /home/jp/a/BOOK/final-system/ppc64/gcc.xml BOOK/final-system/ppc64/gcc.xml
+--- /home/jp/a/BOOK/final-system/ppc64/gcc.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64/gcc.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -39,14 +39,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"
+@@ -61,6 +53,10 @@
+     href="../multilib/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'])"/>
+@@ -137,6 +133,14 @@
+     href="../multilib/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"
+Seulement dans BOOK/final-system/ppc64: glibc-64bit.xml
+Seulement dans BOOK/final-system/ppc64: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/ppc64/hfsutils.xml BOOK/final-system/ppc64/hfsutils.xml
+--- /home/jp/a/BOOK/final-system/ppc64/hfsutils.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64/hfsutils.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -33,7 +33,7 @@
+     href="../ppc/hfsutils.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
++<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/hfsutils.xml"
+diff -ru /home/jp/a/BOOK/final-system/ppc64/parted.xml BOOK/final-system/ppc64/parted.xml
+--- /home/jp/a/BOOK/final-system/ppc64/parted.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64/parted.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -26,7 +26,7 @@
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64 \
+-  --disable-device-mapper</userinput></screen>
++    --disable-device-mapper</userinput></screen>
+ 
+     <variablelist os="b">
+       <title>The meaning of the configure options:</title>
+diff -ru /home/jp/a/BOOK/final-system/ppc64/powerpc-utils.xml BOOK/final-system/ppc64/powerpc-utils.xml
+--- /home/jp/a/BOOK/final-system/ppc64/powerpc-utils.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64/powerpc-utils.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -25,7 +25,9 @@
+     href="../ppc/powerpc-utils.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+-<screen><userinput>patch -Np1 -i ../&powerpcutils-patch;</userinput></screen>
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../ppc/powerpc-utils.xml"
++    xpointer="xpointer(//*[@os='b'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/powerpc-utils.xml"
+diff -ru /home/jp/a/BOOK/final-system/ppc64/yaboot.xml BOOK/final-system/ppc64/yaboot.xml
+--- /home/jp/a/BOOK/final-system/ppc64/yaboot.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64/yaboot.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -24,9 +24,9 @@
+     <para>Existing multilib distributions alter gcc to default to 32-bit
+     output.  Because our gcc defaults to 64-bit, we need to pass appropriate
+     options to both the compiler and the linker.  To prevent the build from
+-    failing due to compiler warnings, the -Werror flag is removed.  The 
+-    Makefile already overrides any CC and ignores LDFLAGS in favour of 
+-    its own variables, so we need to use the following seds for a 
++    failing due to compiler warnings, the -Werror flag is removed.  The
++    Makefile already overrides any CC and ignores LDFLAGS in favour of
++    its own variables, so we need to use the following seds for a
+     successful compile and install.</para>
+ 
+ <screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
+Seulement dans /home/jp/a/BOOK/final-system/ppc64-64: eglibc.xml
+Seulement dans BOOK/final-system/ppc64-64: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/ppc64-64/yaboot.xml BOOK/final-system/ppc64-64/yaboot.xml
+--- /home/jp/a/BOOK/final-system/ppc64-64/yaboot.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64-64/yaboot.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -23,9 +23,9 @@
+ 
+     <para>Yaboot defaults to build as 32bit, so we need to pass appropriate
+     options to both the compiler and the linker.  To prevent the build from
+-    failing due to compiler warnings, the -Werror flag is removed.  The 
+-    Makefile already overrides any CC and ignores LDFLAGS in favour of 
+-    its own variables, so we need to use the following seds for a 
++    failing due to compiler warnings, the -Werror flag is removed.  The
++    Makefile already overrides any CC and ignores LDFLAGS in favour of
++    its own variables, so we need to use the following seds for a
+     successful compile and install.</para>
+ 
+ <screen><userinput>sed -i -e "s/m32/m64/g" \
+diff -ru /home/jp/a/BOOK/final-system/ppc64-64-chapter.xml BOOK/final-system/ppc64-64-chapter.xml
+--- /home/jp/a/BOOK/final-system/ppc64-64-chapter.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64-64-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/parted.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/ppc64-chapter.xml BOOK/final-system/ppc64-chapter.xml
+--- /home/jp/a/BOOK/final-system/ppc64-chapter.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/ppc64-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,9 +17,10 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
+@@ -32,30 +33,39 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/cloog-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/libtool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
+@@ -64,8 +74,6 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
+@@ -73,30 +81,34 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/parted.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/ppc-chapter.xml BOOK/final-system/ppc-chapter.xml
+--- /home/jp/a/BOOK/final-system/ppc-chapter.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/ppc-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/parted.xml"/>
+Seulement dans /home/jp/a/BOOK/final-system/sparc64: eglibc-64bit.xml
+Seulement dans BOOK/final-system/sparc64: glibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/sparc64-64: eglibc.xml
+Seulement dans BOOK/final-system/sparc64-64: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/sparc64-64-chapter.xml BOOK/final-system/sparc64-64-chapter.xml
+--- /home/jp/a/BOOK/final-system/sparc64-64-chapter.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/sparc64-64-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/silo.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/sparc64-chapter.xml BOOK/final-system/sparc64-chapter.xml
+--- /home/jp/a/BOOK/final-system/sparc64-chapter.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/sparc64-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,9 +17,10 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/eglibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/glibc-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
+@@ -32,30 +33,39 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/cloog-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/libtool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
+@@ -64,8 +74,6 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
+@@ -73,30 +81,34 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/silo.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/sparc-chapter.xml BOOK/final-system/sparc-chapter.xml
+--- /home/jp/a/BOOK/final-system/sparc-chapter.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/sparc-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
+Seulement dans /home/jp/a/BOOK/final-system/x86: eglibc.xml
+Seulement dans BOOK/final-system/x86: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/x86/grub.xml BOOK/final-system/x86/grub.xml
+--- /home/jp/a/BOOK/final-system/x86/grub.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/x86/grub.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -25,8 +25,8 @@
+ 
+     <note os="n1">
+       <para>If you would like use a different bootloader than this
+-      one you can go to the following link for alterative bootloaders
+-      and the instructions to use them. 
++      one you can go to the following link for alternative bootloaders
++      and the instructions to use them.
+       <ulink url="http://trac.cross-lfs.org/wiki/bootloaders"/></para>
+     </note>
+ 
+@@ -38,7 +38,7 @@
+       <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
+     </note>
+ 
+-    <para os="s1">EGLIBC-&eglibc-version; does not declare gets():</para>
++    <para os="s1">Glibc-&glibc-version; does not declare gets():</para>
+ 
+ <screen os="s2"><userinput>sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen>
+ 
+diff -ru /home/jp/a/BOOK/final-system/x86_64/adjusting.xml BOOK/final-system/x86_64/adjusting.xml
+--- /home/jp/a/BOOK/final-system/x86_64/adjusting.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/x86_64/adjusting.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -22,10 +22,6 @@
+   href="../common/adjusting.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../multilib/adjusting.xml"
+-  xpointer="xpointer(//*[@os='m1'])"/>
+-
+   <caution>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+Seulement dans /home/jp/a/BOOK/final-system/x86_64: eglibc-64bit.xml
+Seulement dans /home/jp/a/BOOK/final-system/x86_64: eglibc.xml
+Seulement dans BOOK/final-system/x86_64: glibc-64bit.xml
+diff -ru /home/jp/a/BOOK/final-system/x86_64-64/adjusting.xml BOOK/final-system/x86_64-64/adjusting.xml
+--- /home/jp/a/BOOK/final-system/x86_64-64/adjusting.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/x86_64-64/adjusting.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -22,10 +22,6 @@
+   href="../common/adjusting.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
+ 
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+-  href="../common/adjusting.xml"
+-  xpointer="xpointer(//*[@os='e'])"/>
+-
+   <caution>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff -ru /home/jp/a/BOOK/final-system/x86_64-64/binutils.xml BOOK/final-system/x86_64-64/binutils.xml
+--- /home/jp/a/BOOK/final-system/x86_64-64/binutils.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/x86_64-64/binutils.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -74,13 +74,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"
+@@ -124,14 +120,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"
+Seulement dans /home/jp/a/BOOK/final-system/x86_64-64: eglibc.xml
+Seulement dans BOOK/final-system/x86_64-64: glibc.xml
+diff -ru /home/jp/a/BOOK/final-system/x86_64-64-chapter.xml BOOK/final-system/x86_64-64-chapter.xml
+--- /home/jp/a/BOOK/final-system/x86_64-64-chapter.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/x86_64-64-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/x86_64-chapter.xml BOOK/final-system/x86_64-chapter.xml
+--- /home/jp/a/BOOK/final-system/x86_64-chapter.xml	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/final-system/x86_64-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,9 +17,10 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/glibc-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
+@@ -32,30 +33,39 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/cloog-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/libtool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
+@@ -64,8 +74,6 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
+@@ -73,30 +81,34 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/aboutdebug.xml"/>
+diff -ru /home/jp/a/BOOK/final-system/x86-chapter.xml BOOK/final-system/x86-chapter.xml
+--- /home/jp/a/BOOK/final-system/x86-chapter.xml	2014-05-11 16:24:52.650516678 +0200
++++ BOOK/final-system/x86-chapter.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -17,61 +17,67 @@
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/eglibc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/glibc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.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/procps.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
++  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
+diff -ru /home/jp/a/BOOK/general.ent BOOK/general.ent
+--- /home/jp/a/BOOK/general.ent	2014-05-11 16:24:52.646516678 +0200
++++ BOOK/general.ent	2014-10-03 20:44:43.924339262 +0200
+@@ -1,17 +1,18 @@
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+ 
+-<!ENTITY month "03"> <!-- Use two digits -->
+-<!ENTITY month_name "March">
+-<!ENTITY day "14"> <!-- Use two digits -->
++<!ENTITY month "09"> <!-- Use two digits -->
++<!ENTITY month_name "September">
++<!ENTITY day "26"> <!-- Use two digits -->
+ <!ENTITY year "2014"> <!-- Use four digits -->
+ 
+ <!ENTITY releasedate "&month_name; &day;, &year;">
+ 
+-<!ENTITY major-version "2">
+-<!ENTITY minor-version "2">
++<!ENTITY major-version "3">
++<!ENTITY minor-version "0">
+ <!ENTITY extra-version "0">
+ <!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
+ 
++<!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
+ <!ENTITY version "GIT-&year;&month;&day;">
+ 
+ <!ENTITY version-x86 "&version;-x86">
+@@ -27,13 +28,13 @@
+ <!ENTITY version-mips "&version;-MIPS">
+ <!ENTITY version-mips64 "&version;-MIPS64-Multilib">
+ <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
+-<!ENTITY version-alpha "&version;-ALPHA">
+ <!ENTITY version-native "&version;-Native">
+ <!ENTITY version-native64 "&version;-Native-Multilib">
+ 
+ <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
+ <!ENTITY clfs-root "http://cross-lfs.org/">
+ <!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
++<!ENTITY clfs-ticket-root "&clfs-wiki;ticket/">
+ <!ENTITY cblfs-root "http://cblfs.cross-lfs.org/">
+ <!ENTITY faq-root "&clfs-wiki;wiki/faq">
+ <!ENTITY hints-root "http://hints.cross-lfs.org/index.php/">
+@@ -46,6 +47,7 @@
+ <!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
+ <!ENTITY redhat "ftp://sources.redhat.com/pub/">
+ <!ENTITY kernel "http://www.kernel.org/pub/">
++<!ENTITY savannah "http://download.savannah.gnu.org">
+ <!ENTITY sourceforge "http://downloads.sourceforge.net/">
+ 
+ <!ENTITY dependencies "Installation depends on">
+Seulement dans /home/jp/a/BOOK/introduction: alpha
+Seulement dans /home/jp/a/BOOK/introduction: alpha-chapter.xml
+diff -ru /home/jp/a/BOOK/introduction/common/acknowledgements.xml BOOK/introduction/common/acknowledgements.xml
+--- /home/jp/a/BOOK/introduction/common/acknowledgements.xml	2014-05-11 16:24:52.626516679 +0200
++++ BOOK/introduction/common/acknowledgements.xml	2014-10-03 20:44:43.924339262 +0200
+@@ -16,16 +16,14 @@
+ 
+   <itemizedlist>
+     <listitem>
+-      <para>Ryan Oliver - Build Process Developer.</para>
+-    </listitem>
+-    <listitem>
+-      <para>Jim Gifford - Lead Developer.</para>
++      <para>William Harrington - Lead Developer.</para>
+     </listitem>
+     <listitem>
+-      <para>Joe Ciccone - Lead Developer.</para>
++      <para>Jonathan Norman - x86, x86_64, PowerPC & UltraSPARC builds,
++      Release Manager 2.x Series</para>
+     </listitem>
+     <listitem>
+-      <para>Jeremy Utley - Release Manager 1.x Series.</para>
++      <para>Chris Staub - x86 and x86_64 builds. Leader of Quality Control.</para>
+     </listitem>
+   </itemizedlist>
+ 
+@@ -33,41 +31,17 @@
+ 
+   <itemizedlist>
+     <listitem>
+-      <para>Nathan Coulson - Bootscripts.</para>
+-    </listitem>
+-    <listitem>
+       <para>Matt Darcy - x86, X86_64, and Sparc builds.</para>
+     </listitem>
+     <listitem>
+       <para>Manuel Canales Esparcia - Book XML.</para>
+     </listitem>
+     <listitem>
+-      <para>Karen McGuiness - Proofreader.</para>
+-    </listitem>
+-    <listitem>
+-      <para>Jonathan Norman - x86, x86_64, PowerPC & UltraSPARC.</para>
+-    </listitem>
+-    <listitem>
+-      <para>Jeremy Huntwork - PowerPC, x86, Sparc builds.</para>
+-    </listitem>
+-    <listitem>
+       <para>Justin Knierim - Website Architect.</para>
+     </listitem>
+     <listitem>
+       <para>Ken Moffat - PowerPC and X86_64 builds. Developer of Pure 64 Hint.</para>
+     </listitem>
+-    <listitem>
+-      <para>Alexander E. Patrakov - Udev/Hotplug Integration</para>
+-    </listitem>
+-    <listitem>
+-      <para>Chris Staub - x86 builds. Leader of Quality Control.</para>
+-    </listitem>
+-    <listitem>
+-      <para>Zack Winkles - Unstable book work.</para>
+-    </listitem>
+-    <listitem>
+-      <para>William Harrington - x86, x86_64, PowerPC, Sparc, Mips builds.</para>
+-    </listitem>
+   </itemizedlist>
+ 
+   <para>Outside the Development Team</para>
+@@ -102,10 +76,45 @@
+       <para>Doug Ronne - Various x86_64 fixes.</para>
+     </listitem>
+     <listitem>
++      <para>Theo Schneider - Testing of the Linux Headers Package</para>
++    </listitem>
++    <listitem>
++      <para>Martin Ward - Recommendations for Systemd and the Boot method,
++      among other contributions</para>
++    </listitem>
++    <listitem>
+       <para>William Zhou - Text updates and Typos</para>
+     </listitem>
++  </itemizedlist>
++
++  <para>Former Team Members</para>
++  <itemizedlist>
++    <listitem>
++      <para>Joe Ciccone - Lead Developer.</para>
++    </listitem>
+     <listitem>
+-      <para>Theo Schneider - Testing of the Linux Headers Package</para>
++      <para>Nathan Coulson - Bootscripts.</para>
++    </listitem>
++    <listitem>
++      <para>Jim Gifford - Lead Developer.</para>
++    </listitem>
++    <listitem>
++      <para>Jeremy Huntwork - PowerPC, x86, Sparc builds.</para>
++    </listitem>
++    <listitem>
++      <para>Karen McGuiness - Proofreader.</para>
++    </listitem>
++    <listitem>
++      <para>Ryan Oliver - Build Process Developer.</para>
++    </listitem>
++    <listitem>
++      <para>Alexander E. Patrakov - Udev/Hotplug Integration</para>
++    </listitem>
++    <listitem>
++      <para>Jeremy Utley - Release Manager 1.x Series.</para>
++    </listitem>
++    <listitem>
++      <para>Zack Winkles - Unstable book work.</para>
+     </listitem>
+   </itemizedlist>
+ 
+diff -ru /home/jp/a/BOOK/introduction/common/askforhelp.xml BOOK/introduction/common/askforhelp.xml
+--- /home/jp/a/BOOK/introduction/common/askforhelp.xml	2014-05-11 16:24:52.626516679 +0200
++++ BOOK/introduction/common/askforhelp.xml	2014-10-03 20:44:43.928339262 +0200
+@@ -46,8 +46,9 @@
+         <para>The architecture of the host and target.</para>
+       </listitem>
+       <listitem>
+-        <para>The value of the $CLFS_HOST, $CLFS_TARGET, $BUILD32, and $BUILD64
+-        environment variables.</para>
++        <para>The value of the ${CLFS_HOST} and ${CLFS_TARGET} environment
++        variables, and if applicable, ${BUILD32}, ${BUILD64}, ${BUILDN32},
++        and ${GCCTARGET}.</para>
+       </listitem>
+       <listitem>
+         <para>The package or section in which the problem was encountered.</para>
+diff -ru /home/jp/a/BOOK/introduction/common/changelog.xml BOOK/introduction/common/changelog.xml
+--- /home/jp/a/BOOK/introduction/common/changelog.xml	2014-05-11 16:24:52.626516679 +0200
++++ BOOK/introduction/common/changelog.xml	2014-10-03 20:44:43.928339262 +0200
+@@ -30,12 +30,1099 @@
+           <para>[name] - Changelog entry.</para>
+         </listitem>
+         <listitem>
+-          <para>[name] - Another changelog entry.</para>
++          <para>[name] - Previous changelog entry.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++-->
++
++    <listitem>
++      <para>26 September 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harriongton] - Update Bash 4.3 branch update
++          to patch level 26.</para>
++        </listitem>
++        <listitem>
++          <para>[William Harriongton] - Update Readline 6.3 branch update
++          to patch level 8.</para>
++        </listitem>
++        <listitem>
++          <para>[William Harriongton] - Update Linux sublevel patch to 
++          3.14.19.</para>
++        </listitem>
++        <listitem>
++          <para>[William Harriongton] - Update Vim 7.4 branch update patch
++          to level 460.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>18 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Removed obsolete --with-tls and --with-__thread
++          options from Cross-Tools Glibc builds - those options have long since
++          been removed from Glibc.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>17 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Combined Makefile modification commands in
++          Boot section Shadow install into one command.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Removed redundant command explanation from
++          Less installation page.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>14 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Disabled LTO for systemd build so it doesn't link
++          to libgcc_s. Thanks to Armin K. for the solution.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Removed obsolete command to disable test lib
++          in Glibc instructions.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>10 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Removed several switches from GCC builds for options
++          that are enabled by default.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Removed --enable-multibyte switch from Vim pages,
++          since multibyte support is enabled by default.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Removed --enable-shared switch from CLooG pages;
++          shared libraries are built by default.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>09 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Redo top index to list by arch, then 32/64/multilib
++          within each arch.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Removed "M4=m4" from final-system Bison and Flex
++          pages, since m4 is now installed before them.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>07 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Updated Linux sublevel patch to 3.14.16.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>05 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Reversed change to Vim's docs location, so that
++          Vim can find its help files.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>01 August 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Updated Linux sublevel to 3.14.15.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Build Pkg-config-lite before Ncurses in the final
++          system, so that Ncurses will install .pc files.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Move Bzip2 before Perl and modify Perl instructions
++          to use system-install Bzip2. Solution borrowed from LFS.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>28 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Removed unneeded notes about the importance of the
++          testuites for GMP, MPFR, MPC, ISL, and CLooG.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>24 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Added config flag descriptions to kernel config
++          pages. Thanks to Hazel Russman for the idea.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Removed commands to recreate /usr/share/info
++          to reduce possible user confusion.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>21 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Update MPFR 3.1.2 fixes patch for patch
++          level 10 update.</para>
++        </listitem>
++        <listitem>
++          <para>[William Harrington] - Update VIM 7.4 Branch Update patch to
++          patch level 373.</para>
++        </listitem>
++        <listitem>
++          <para>[William Harrington] - Update Linux to 3.14.13.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>18 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Changed title on Linux Headers installation pages
++          to reduce potential confusion with previous Linux-Headers package.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>17 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Updated D-Bus to 1.8.6 for security fixes.
++          Closes ticket <ulink url="&clfs-ticket-root;974">#974</ulink>.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>14 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Modified instructions for mounting file systems
++          for chroot so that they are all mounted before entering chroot, and
++          added a tmpfs on /run. Took solution for /dev/shm symlink from LFS.
++          Fixes ticket <ulink url="&clfs-ticket-root;971">#971</ulink>.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Updated Linux sublevel to 3.14.12.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>10 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Add back instruction to create /var/log/lastlog,
++          so that it can actually be used.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>02 July 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Update Linux subelevel patch to 3.14.10.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>30 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Added documentation installation instructions
++          for Zlib.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>27 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Updated KMOD to 18. Fixes ticket
++          <ulink url="&clfs-ticket-root;965">#965</ulink>.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>24 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Remove reference to a non-existent man page
++          from <filename>timesyncd.conf</filename>.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Prevent systemd from running
++          <command>setcap</command> during installation.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Prevent <command>systemd-fsck</command> from using
++          <command>fsck -l</command>, to avoid boot errors. Fixes ticket
++          <ulink url="&clfs-ticket-root;968">#968</ulink>.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>23 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Added info about systemd-timesyncd to network
++          configuration section. Fixes ticket
++          <ulink url="&clfs-ticket-root;958">#958</ulink>.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>20 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Remove <command>make -C man install
++          </command> from final-system KMOD as man pages are installed during
++          <command>make install</command>.</para>
++        </listitem>
++        <listitem>
++          <para>[William Harrington] - Add Linux sublevel patch.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Changed GMP documentation installation instructions
++          to use the Makefile to install docs instead of doing so manually.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>17 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Use --with-isl=system for temp-system
++          CLooG.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>17 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Move Man-DB right after Libpipeline.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>15 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Added commands to create and install HTML
++          documentation for MPC.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>13 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Update D-Bus to 1.8.4.</para>
++        </listitem>
++        <listitem>
++          <para>[William Harrington] - Update File to 5.19.</para>
++        </listitem>
++        <listitem>
++          <para>[Chris] - Text updates to kernel installation page.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>11 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Placed file before findutils in temp-system.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>10 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Upgraded Gettext to 0.19.1.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>04 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Added Introduction page to final-preps.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>03 June 2014</para>
++      <itemizedlist>
++        <listitem>
++          <para>[Chris] - Moved installation of /tools/i