[lfs-fr] r1195 - in trunk/clfs: . boot boot/x86 boot/x86_64 boot/x86_64-64 bootable/alpha bootable/x86 cross-tools/64 cross-tools/common cross-tools/mips64-64 cross-tools/multilib cross-tools/ppc cross-tools/ppc64 cross-tools/sparc64-64 final-system final-system/64 final-system/alpha final-system/common final-system/mips final-system/mips64 final-system/mips64-64 final-system/multilib final-system/ppc final-system/ppc64 final-system/sparc64 final-system/sparc64-64 final-system/x86 final-system/x86_64 final-system/x86_64-64 introduction/common materials/common materials/sparc materials/x86 materials/x86_64 network/common temp-system/64 temp-system/common temp-system/mips64 temp-system/multilib temp-system/ppc temp-system/ppc64

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 8 Aou 16:22:28 PDT 2010


Author: jmengual
Date: 2010-08-09 01:22:28 +0200 (Mon, 09 Aug 2010)
New Revision: 1195

Modified:
   trunk/clfs/boot/x86-chapter.xml
   trunk/clfs/boot/x86/kernel.xml
   trunk/clfs/boot/x86_64-64/lilo.xml
   trunk/clfs/boot/x86_64-chapter.xml
   trunk/clfs/boot/x86_64/kernel.xml
   trunk/clfs/bootable/alpha/kernel.xml
   trunk/clfs/bootable/x86/grub.xml
   trunk/clfs/cross-tools/64/gcc-final.xml
   trunk/clfs/cross-tools/64/gcc-static.xml
   trunk/clfs/cross-tools/common/gcc-final.xml
   trunk/clfs/cross-tools/common/gcc-static.xml
   trunk/clfs/cross-tools/mips64-64/gcc-final.xml
   trunk/clfs/cross-tools/mips64-64/gcc-static.xml
   trunk/clfs/cross-tools/multilib/gcc-final.xml
   trunk/clfs/cross-tools/multilib/gcc-static.xml
   trunk/clfs/cross-tools/ppc/gcc-final.xml
   trunk/clfs/cross-tools/ppc/gcc-static.xml
   trunk/clfs/cross-tools/ppc64/gcc-final.xml
   trunk/clfs/cross-tools/ppc64/gcc-static.xml
   trunk/clfs/cross-tools/sparc64-64/gcc-static.xml
   trunk/clfs/final-system/64/gcc.xml
   trunk/clfs/final-system/alpha-chapter.xml
   trunk/clfs/final-system/alpha/aboot.xml
   trunk/clfs/final-system/alpha/eglibc.xml
   trunk/clfs/final-system/common/eglibc.xml
   trunk/clfs/final-system/common/gcc.xml
   trunk/clfs/final-system/common/iputils.xml
   trunk/clfs/final-system/common/module-init-tools.xml
   trunk/clfs/final-system/common/tar.xml
   trunk/clfs/final-system/common/texinfo.xml
   trunk/clfs/final-system/common/vim.xml
   trunk/clfs/final-system/mips-chapter.xml
   trunk/clfs/final-system/mips/eglibc.xml
   trunk/clfs/final-system/mips64-64-chapter.xml
   trunk/clfs/final-system/mips64-64/eglibc.xml
   trunk/clfs/final-system/mips64-chapter.xml
   trunk/clfs/final-system/mips64/eglibc-64bit.xml
   trunk/clfs/final-system/mips64/eglibc-n32.xml
   trunk/clfs/final-system/mips64/eglibc.xml
   trunk/clfs/final-system/mips64/gcc.xml
   trunk/clfs/final-system/multilib/eglibc-64bit.xml
   trunk/clfs/final-system/multilib/eglibc.xml
   trunk/clfs/final-system/multilib/gcc.xml
   trunk/clfs/final-system/multilib/iputils.xml
   trunk/clfs/final-system/multilib/module-init-tools.xml
   trunk/clfs/final-system/multilib/tar.xml
   trunk/clfs/final-system/ppc-chapter.xml
   trunk/clfs/final-system/ppc/eglibc.xml
   trunk/clfs/final-system/ppc/gcc.xml
   trunk/clfs/final-system/ppc64-chapter.xml
   trunk/clfs/final-system/ppc64/eglibc-64bit.xml
   trunk/clfs/final-system/ppc64/eglibc.xml
   trunk/clfs/final-system/ppc64/gcc.xml
   trunk/clfs/final-system/sparc-chapter.xml
   trunk/clfs/final-system/sparc64-64-chapter.xml
   trunk/clfs/final-system/sparc64-64/eglibc.xml
   trunk/clfs/final-system/sparc64-chapter.xml
   trunk/clfs/final-system/sparc64/eglibc-64bit.xml
   trunk/clfs/final-system/x86-chapter.xml
   trunk/clfs/final-system/x86/eglibc.xml
   trunk/clfs/final-system/x86/grub.xml
   trunk/clfs/final-system/x86_64-64-chapter.xml
   trunk/clfs/final-system/x86_64-64/eglibc.xml
   trunk/clfs/final-system/x86_64-64/lilo.xml
   trunk/clfs/final-system/x86_64-chapter.xml
   trunk/clfs/final-system/x86_64/eglibc-64bit.xml
   trunk/clfs/final-system/x86_64/eglibc.xml
   trunk/clfs/general.ent
   trunk/clfs/introduction/common/changelog.xml
   trunk/clfs/materials/common/patches.xml
   trunk/clfs/materials/sparc/patches.xml
   trunk/clfs/materials/x86/patches.xml
   trunk/clfs/materials/x86_64/patches.xml
   trunk/clfs/network/common/dhcp.xml
   trunk/clfs/packages.ent
   trunk/clfs/patches.ent
   trunk/clfs/temp-system/64/gcc.xml
   trunk/clfs/temp-system/common/gcc.xml
   trunk/clfs/temp-system/mips64/gcc.xml
   trunk/clfs/temp-system/multilib/gcc.xml
   trunk/clfs/temp-system/ppc/gcc.xml
   trunk/clfs/temp-system/ppc64/gcc.xml
Log:
Mises a jour importantes par clfs


Modified: trunk/clfs/boot/x86/kernel.xml
===================================================================
--- trunk/clfs/boot/x86/kernel.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/boot/x86/kernel.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -89,7 +89,7 @@
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"

Modified: trunk/clfs/boot/x86-chapter.xml
===================================================================
--- trunk/clfs/boot/x86-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/boot/x86-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -21,13 +21,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Modified: trunk/clfs/boot/x86_64/kernel.xml
===================================================================
--- trunk/clfs/boot/x86_64/kernel.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/boot/x86_64/kernel.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -85,7 +85,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/clfs/boot/x86_64-64/lilo.xml
===================================================================
--- trunk/clfs/boot/x86_64-64/lilo.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/boot/x86_64-64/lilo.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -15,9 +15,11 @@
     <secondary>configuration</secondary>
   </indexterm>
 
+<!--
      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
      href="../../final-system/x86/grub.xml"
      xpointer="xpointer(//*[@os='n1'])"/>
+-->
 
   <para os="a">Vous êtes presque prêt à démarrer votre nouveau système temporaire. Une des dernières choses à faire est
   de s'assurer que le système puisse démarrer. Les instructions ci-dessous ne s'appliquent qu'à des machines x86_64 sur
@@ -27,9 +29,11 @@
   référer aux commandes <command>lilo</command> et <command>keytab-lilo.pl</command> que vous avez installées sur le système
   hôte.</para>
 
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/grub.xml"
   xpointer="xpointer(//*[@os='b'])"/>
+-->
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/x86_64-64/lilo.xml"

Modified: trunk/clfs/boot/x86_64-chapter.xml
===================================================================
--- trunk/clfs/boot/x86_64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/boot/x86_64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -21,14 +21,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub-build.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub-build.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Modified: trunk/clfs/bootable/alpha/kernel.xml
===================================================================
--- trunk/clfs/bootable/alpha/kernel.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/bootable/alpha/kernel.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -19,7 +19,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de the kernel</title>
+    <title>Installation of the kernel</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/clfs/bootable/x86/grub.xml
===================================================================
--- trunk/clfs/bootable/x86/grub.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/bootable/x86/grub.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -8,19 +8,19 @@
 <sect1 id="ch-bootable-grub">
   <?dbhtml filename="grub.html"?>
 
-  <title>Making the CLFS System Bootable</title>
+  <title>Rendre le système CLFS amorçable</title>
 
   <indexterm zone="ch-bootable-grub">
     <primary sortas="a-GRUB">GRUB</primary>
     <secondary>configuration</secondary>
   </indexterm>
 
-  <para os="a">Your shiny new CLFS system is almost complete. One of the last
-  things to do is to ensure that the system can be properly booted. The
-  instructions below apply only to computers of IA-32 architecture,
-  meaning mainstream PCs. Information on <quote>boot loading</quote> for
-  other architectures should be available in the usual resource-specific
-  locations for those architectures.</para>
+  <para os="a">Votre système CLFS flambant neuf est presque terminé. Une des
+  dernières choses à faire est de vous assurer que le système peut démarrer correctement.
+  Les instructions ci-dessous s'appliquent aux architectures x86 et x86_64,
+  c'est-à-dire la plupart des PCs. Des informations sur le <quote>chargement de
+  l'amorce</quote> pour d'autres architectures devraient être disponibles aux
+  endroits habituels des ressources spécifiques à ces architectures.</para>
 
   <para os="b">Le chargement au démarrage peut être un sujet complexe, donc quelques mots
   de prudence sont utiles. Familiarisez-vous avec le chargeur de démarrage actuel et
@@ -28,113 +28,28 @@
   qui doit/doivent être amorcé(s). Assurez-vous d'avoir un disque de démarrage d'urgence
   disponible pour <quote>secourir</quote> l'ordinateur s'il devient inutilisable (inamorçable).</para>
 
-  <para os="c">Earlier, we compiled and installed the GRUB boot loader software
-  in preparation for this step. The procedure involves writing some special
-  GRUB files to specific locations on the hard drive. We highly recommend
-  creating a GRUB boot floppy diskette as a backup. Insert a blank floppy
-  diskette and run the following commands:</para>
+  <para os="c">La première chose que nous avons besoin de faire est de générer
+  une configuration pour GRUB. Dans les précédentes versions de grub, nous pouvions
+  créer la configuration à la main, mais avec GRUB2, nous pouvons générer
+  <filename>grub.cfg</filename> automatiquement. Vous pouvez faire cela avec la
+  commande suivante :</para>
 
-<screen os="d"><userinput>dd if=/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
+<screen os="d"><userinput>grub-mkconfig -o /boot/grub/grub.cfg</userinput></screen>
 
-  <para os="e">Remove the diskette and store it somewhere safe. Now, run the
-  <command>grub</command> shell:</para>
+  <warning os="w1">
+     <para>La commande suivante écrasera le chargeur de démarrage actuel. Ne lancez pas
+     la commande si vous ne désirez pas cela, par exemple si vous utilisez d'un
+     chargeur de démarrage tiers pour gérer le Master Boot Record (MBR). Dans ce
+     cas, il serait plus logique d'installer GRUB dans le
+     <quote>boot sector</quote> de la partition CLFS. Dans ce cas, la
+     commande suivante deviendrait 
+     <userinput>grub-install /dev/sda2</userinput>
+    .</para>
+   </warning>
 
-<screen os="f"><userinput>grub</userinput></screen>
+  <para os="e">Demandez à GRUB de s'installer dans la MBR de 
+  <filename class="partition">sda</filename> :</para>
 
-  <para os="g">GRUB uses its own naming structure for drives and partitions in
-  the form of <emphasis>(hdn,m)</emphasis>, where <emphasis>n</emphasis>
-  is the hard drive number and <emphasis>m</emphasis> is the partition
-  number, both starting from zero. For example, partition <filename
-  class="partition">hda1</filename> is <emphasis>(hd0,0)</emphasis> to
-  GRUB and <filename class="partition">hdb3</filename> is
-  <emphasis>(hd1,2)</emphasis>. In contrast to Linux, GRUB does not
-  consider CD-ROM drives to be hard drives. For example, if using a CD
-  on <filename class="partition">hdb</filename> and a second hard drive
-  on <filename class="partition">hdc</filename>, that second hard drive
-  would still be <emphasis>(hd1)</emphasis>.</para>
+<screen os="f"><userinput>grub-install /dev/sda</userinput></screen>
 
-  <para os="h">Using the above information, determine the appropriate designator
-  for the root partition (or boot partition, if a separate one is used).
-  For the following example, it is assumed that the root (or separate boot)
-  partition is <filename class="partition">hda4</filename>.</para>
-
-  <para os="i">Tell GRUB where to search for its <filename>stage{1,2}</filename>
-  files. The Tab key can be used everywhere to make GRUB show the
-  alternatives:</para>
-
-<screen os="j"><userinput>root (hd0,3)</userinput></screen>
-
-  <warning os="k">
-    <para>The following command will overwrite the current boot loader.
-    Do not run the command if this is not desired, for example, if using
-    a third party boot manager to manage the Master Boot Record (MBR).
-    In this scenario, it would make more sense to install GRUB into the
-    <quote>boot sector</quote> of the CLFS partition. In this case, this
-    next command would become <userinput>setup (hd0,3)</userinput>.</para>
-  </warning>
-
-  <para os="l">Tell GRUB to install itself into the MBR of
-  <filename class="partition">hda</filename>:</para>
-
-<screen os="m"><userinput>setup (hd0)</userinput></screen>
-
-  <para os="n">If all went well, GRUB will have reported finding its files in
-  <filename class="directory">/boot/grub</filename>. That's all there is
-  to it. Quit the <command>grub</command> shell:</para>
-
-<screen os="o"><userinput>quit</userinput></screen>
-
-  <para os="p">Create a <quote>menu list</quote> file defining GRUB's boot
-  menu:</para>
-
-<screen><userinput>cat > /boot/grub/menu.lst << "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for CLFS.
-title CLFS &version;
-root (hd0,3)
-kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-
-  <para os="q">Add an entry for the host distribution if desired. It might look
-  like this:</para>
-
-<screen os="r"><userinput>cat >> /boot/grub/menu.lst << "EOF"
-<literal>title Red Hat
-root (hd0,2)
-kernel /boot/kernel-2.6.5 root=/dev/hda3
-initrd /boot/initrd-2.6.5</literal>
-EOF</userinput></screen>
-
-  <para os="s">If dual-booting Windows, the following entry will allow
-  booting it:</para>
-
-<screen os="t"><userinput>cat >> /boot/grub/menu.lst << "EOF"
-<literal>title Windows
-rootnoverify (hd0,0)
-chainloader +1</literal>
-EOF</userinput></screen>
-
-  <para os="u">If <command>info grub</command> does not provide all necessary
-  material, additional information regarding GRUB is located on its
-  website at: <ulink url="http://www.gnu.org/software/grub/"/>.</para>
-
-  <para os="v">The FHS stipulates that the bootloader's configuration file should
-  be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
-  To satisfy this requirement for GRUB, issue the following command:</para>
-
-<screen os="w"><userinput>mkdir -v /etc/grub &&
-ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen>
-
 </sect1>

Modified: trunk/clfs/cross-tools/64/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/64/gcc-final.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/64/gcc-final.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -24,14 +24,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/cross-tools/64/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/64/gcc-static.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/64/gcc-static.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -24,15 +24,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-    
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>

Modified: trunk/clfs/cross-tools/common/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/common/gcc-final.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/common/gcc-final.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -22,17 +22,8 @@
   <sect2 role="installation">
     <title>Installation du compilateur croisé GCC</title>
 
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/cross-tools/common/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/common/gcc-static.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/common/gcc-static.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -22,14 +22,6 @@
   <sect2 role="installation">
     <title>Installation du compilateur GCC croisé avec libgcc statique et sans Threads</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
     <para os="aa">Faites deux ajustements essentiels pour le fichier <filename>specs</filename>
     de GCC pour vous assurer que GCC utilise notre environnement de construction :</para>
 

Modified: trunk/clfs/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/mips64-64/gcc-final.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/mips64-64/gcc-final.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-final">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, final</secondary>
+    <secondary>cross tools, final</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,18 +20,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC Cross Compiler</title>
+    <title>Installation of GCC Cross Compiler</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -128,7 +120,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/mips64-64/gcc-static.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/mips64-64/gcc-static.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-static">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, static</secondary>
+    <secondary>cross tools, static</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,19 +20,11 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Cross GCC Compiler with Static libgcc
+    <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -110,7 +102,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/multilib/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/multilib/gcc-final.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/multilib/gcc-final.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -24,14 +24,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/cross-tools/multilib/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/multilib/gcc-static.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/multilib/gcc-static.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -25,14 +25,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/cross-tools/ppc/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/ppc/gcc-final.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/ppc/gcc-final.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-final">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, final</secondary>
+    <secondary>cross tools, final</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,18 +20,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC Cross Compiler</title>
+    <title>Installation of GCC Cross Compiler</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -95,7 +87,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/ppc/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/ppc/gcc-static.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/ppc/gcc-static.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-static">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, static</secondary>
+    <secondary>cross tools, static</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,19 +20,11 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Cross GCC Compiler with Static libgcc
+    <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -104,7 +96,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/ppc64/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/ppc64/gcc-final.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/ppc64/gcc-final.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-final">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, final</secondary>
+    <secondary>cross tools, final</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,18 +20,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC Cross Compiler</title>
+    <title>Installation of GCC Cross Compiler</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -95,7 +87,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/ppc64/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/ppc64/gcc-static.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/ppc64/gcc-static.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-static">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, static</secondary>
+    <secondary>cross tools, static</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,19 +20,11 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Cross GCC Compiler with Static libgcc
+    <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -104,7 +96,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/sparc64-64/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/sparc64-64/gcc-static.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/cross-tools/sparc64-64/gcc-static.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-static">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, static</secondary>
+    <secondary>cross tools, static</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,19 +20,11 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Cross GCC Compiler with Static libgcc
+    <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -96,7 +88,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/final-system/64/gcc.xml
===================================================================
--- trunk/clfs/final-system/64/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/64/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -21,23 +21,6 @@
   <sect2 role="installation">
     <title>Installation de GCC</title>
 
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
     <para os="p5">Appliquez le correctif suivant pour que GCC se lie à /lib au lieu de /lib64:</para>
 
 <screen os="p6"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>

Modified: trunk/clfs/final-system/alpha/aboot.xml
===================================================================
--- trunk/clfs/final-system/alpha/aboot.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/alpha/aboot.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -22,7 +22,7 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation de aboot</title>
+    <title>Installation of aboot</title>
 
     <para os="aa">The following patch addresses build issues with GCC &gcc-version;:</para>
 

Modified: trunk/clfs/final-system/alpha/eglibc.xml
===================================================================
--- trunk/clfs/final-system/alpha/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/alpha/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -19,7 +19,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
@@ -27,14 +27,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/alpha-chapter.xml
===================================================================
--- trunk/clfs/final-system/alpha-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/alpha-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -57,6 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -68,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/aboot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>

Modified: trunk/clfs/final-system/common/eglibc.xml
===================================================================
--- trunk/clfs/final-system/common/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/common/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -39,13 +39,6 @@
       l'Unicode, du coup libiconv n'est pas requis sur un système CLFS.</para>
     </note>
 
-    <para os="p1">Le correctif suivant contient un certain nombre de corrections liées
-    à l'architecture et à notre &eglibc-version; construit. Ce correctif a été
-    développé par les développeurs de CLFS. Pour des détails sur son contenu,
-    rendez-vous sur http://trac.cross-lfs.org/browser/scripts/fetch/eglibc/&eglibc-version; :</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&eglibc-fixes-patch;</userinput></screen>
-
     <para os="l3">Le sed suivant s'assure que l'EGLIBC construit sera testé pendant le make install et non celui qu'on a
     préalablement construit :</para>
 

Modified: trunk/clfs/final-system/common/gcc.xml
===================================================================
--- trunk/clfs/final-system/common/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/common/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -25,19 +25,6 @@
   <sect2 role="installation">
     <title>Installation de GCC</title>
 
-    <para os="p1">Le correctif suivant contient un certain nombre de mises à jour de la branche &gcc-version; par les développeurs de 
-    GCC :</para>
-    
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
-
-
-    <para os="p3">Le correctif suivant contient un certain nombre de corrections liées
-    à l'architecture et à notre &gcc-version; construit. Ce correctif a été
-    développé par les développeurs de CLFS. Pour des détails sur son contenu,
-    rendez-vous sur http://trac.cross-lfs.org/browser/scripts/patch/gcc/&gcc-version; :</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&gcc-fixes-patch;</userinput></screen>
-
     <para os="d">Appliquez une substitution <command>sed</command> qui va supprimer l'installation de
     <filename class="libraryfile">libiberty.a</filename>. La
     version of <filename class="libraryfile">libiberty.a</filename> fournie par Binutils sera utilisée à la 

Modified: trunk/clfs/final-system/common/iputils.xml
===================================================================
--- trunk/clfs/final-system/common/iputils.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/common/iputils.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -28,20 +28,21 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&iputils-fixes-patch;</userinput></screen>
 
-    <para os="p3">Le correctif suivant contient les pages de man pour IPutils :</para>
+    <para os="p3">Le correctif suivant contient la documentation prégénérée
+    pour IPutils :</para>
 
-<screen os="p4"><userinput>patch -Np0 -i ../&iputils-manpages-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&iputils-doc-patch;</userinput></screen>
 
     <para os="a">Compilez le paquet :</para>
 
-<screen os="b"><userinput>make</userinput></screen>
+<screen os="b"><userinput>make IPV4_TARGETS="tracepath ping clockdiff" \
+    IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
 
     <para os="c">Ce paquet est fourni sans suite de tests.</para>
 
     <para os="d">Installez le paquet :</para>
 
-<screen os="e"><userinput>install -v -m755 ping{,6} /bin
-install -v -m755 arping /usr/bin
+<screen os="e"><userinput>install -v -m755 ping /bin
 install -v -m755 clockdiff /usr/bin
 install -v -m755 rdisc /usr/bin
 install -v -m755 tracepath /usr/bin
@@ -66,6 +67,7 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
+<!--
       <varlistentry id="arping">
         <term><command>arping</command></term>
         <listitem>
@@ -75,7 +77,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="clockdiff">
         <term><command>clockdiff</command></term>
         <listitem>
@@ -96,6 +98,7 @@
         </listitem>
       </varlistentry>
 
+<!--
       <varlistentry id="ping6">
         <term><command>ping6</command></term>
         <listitem>
@@ -106,6 +109,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry id="rdisc">
         <term><command>rdisc</command></term>

Modified: trunk/clfs/final-system/common/module-init-tools.xml
===================================================================
--- trunk/clfs/final-system/common/module-init-tools.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/common/module-init-tools.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -28,17 +28,9 @@
 
     <para os="c">Lancez les commandes suivantes pour effectuer les tests</para>
 
-    <note os="cc">
-      <para>La commande <command>make clean</command> est nécessaire pour nettoyer l'arborescence source, sinon le
-      code pour le test sera installé et la version de test de <command>modprobe</command> ne fonctionne pas  ailleurs que  
-      dans l'environnement de test.</para>
-    </note>
+<screen os="d"><userinput>sed -i "s/\(make\)\( all\)/\1 DOCBOOKTOMAN=true\2/" tests/runtests &&
+./tests/runtests</userinput></screen>
 
-<screen os="d"><userinput>./configure &&
-make check &&
-./tests/runtests &&
-make clean</userinput></screen>
-
     <para os="e">Préparez la compilation de Modules-Init-Tools :</para>
     
 <screen os="f"><userinput>./configure --prefix=/usr \
@@ -59,25 +51,12 @@
 
     <para os="h">Compilez le paquet :</para>
 
-<screen os="i"><userinput>make DOCBOOKTOMAN=""</userinput></screen>
+<screen os="i"><userinput>make DOCBOOKTOMAN=true</userinput></screen>
 
     <para os="j">Installez le paquet :</para>
 
-<screen os="k"><userinput>make INSTALL=install install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
-    <variablelist os="l">
-      <title>Voici la signification du paramètre de make install :</title>
-      <varlistentry>
-        <term><parameter>INSTALL=install</parameter></term>
-        <listitem>
-          <para>Normalement, <command>make install</command> n'installera pas
-          les binaires s'ils existent déjà. Cette option outrepasse ce comportement
-          en exécutant <command>install</command> au lieu d'utiliser le script enveloppe
-          par défaut.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
   </sect2>
 
   <sect2 id="contents-module-init-tools" role="content">

Modified: trunk/clfs/final-system/common/tar.xml
===================================================================
--- trunk/clfs/final-system/common/tar.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/common/tar.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -26,12 +26,8 @@
 
     <para os="p1">Le correctif suivant ajoute une page de man pour <command>tar</command> :</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&tar-man_page-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&tar-man-patch;</userinput></screen>
 
-    <para os="p3">Le correctif suivant ajoute le support pour les nouveaux outils de compression comme LZIP :</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&tar-new_compressors-patch;</userinput></screen>
-
     <para os="a">Préparez la compilation de Tar :</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>

Modified: trunk/clfs/final-system/common/texinfo.xml
===================================================================
--- trunk/clfs/final-system/common/texinfo.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/common/texinfo.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -52,11 +52,12 @@
     <filename>/usr/share/info/dir</filename> a besoin d'être re-créé,
     les commandes suivantes accompliront cette tâche :</para>
 
-<screen os="i" role="nodump"><userinput>cd /usr/share/info
+<screen os="i" role="nodump"><userinput>pushd /usr/share/info
 rm dir
 for f in *
 do install-info $f dir 2>/dev/null
-done</userinput></screen>
+done
+popd</userinput></screen>
 
   </sect2>
 

Modified: trunk/clfs/final-system/common/vim.xml
===================================================================
--- trunk/clfs/final-system/common/vim.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/common/vim.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -128,6 +128,7 @@
 
 set nocompatible
 set backspace=2
+set ruler
 syntax on
 if (&term == "iterm") || (&term == "putty")
   set background=dark

Modified: trunk/clfs/final-system/mips/eglibc.xml
===================================================================
--- trunk/clfs/final-system/mips/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -19,7 +19,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
@@ -27,14 +27,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/mips-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -57,6 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -68,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/dvhtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/arcload.xml"/>

Modified: trunk/clfs/final-system/mips64/eglibc-64bit.xml
===================================================================
--- trunk/clfs/final-system/mips64/eglibc-64bit.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips64/eglibc-64bit.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -8,7 +8,7 @@
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="glibc-64bit.html"?>
 
-  <title>EGLIBC-&eglibc-version; 64 bit</title>
+  <title>EGLIBC-&eglibc-version; 64-Bit</title>
 
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
@@ -19,18 +19,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/mips64/eglibc-n32.xml
===================================================================
--- trunk/clfs/final-system/mips64/eglibc-n32.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips64/eglibc-n32.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -19,18 +19,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
 <screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
@@ -66,7 +58,7 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="m1">Tell EGLIBC to install its 32 bit libraries into
+    <para os="m1">Tell EGLIBC to install its 32-bit libraries into
     <filename class="directory">/lib32</filename>:</para>
 
 <screen os="m2"><userinput>echo "slibdir=/lib32" >> configparms</userinput></screen>
@@ -135,7 +127,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/final-system/mips64/eglibc.xml
===================================================================
--- trunk/clfs/final-system/mips64/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips64/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -8,11 +8,11 @@
 <sect1 id="ch-system-eglibc-32" role="wrap">
   <?dbhtml filename="eglibc.html"?>
 
-  <title>EGLIBC-&eglibc-version; 32 bit Libraries</title>
+  <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
 
   <indexterm zone="ch-system-eglibc-32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
-    <secondary>32 bit</secondary>
+    <secondary>32 Bit</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,7 +20,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Glibc</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
@@ -28,14 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -131,7 +123,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/final-system/mips64/gcc.xml
===================================================================
--- trunk/clfs/final-system/mips64/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips64/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -23,22 +23,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/mips64-64/eglibc.xml
===================================================================
--- trunk/clfs/final-system/mips64-64/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips64-64/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -19,7 +19,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
@@ -27,14 +27,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -77,7 +69,7 @@
     href="../x86_64-64/eglibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
 
-    <para>Now we will force EGLIBC to build as 64 bit instead of the default
+    <para>Now we will force EGLIBC to build as 64-bit instead of the default
     n32 with the following sed:</para>
 
     <screen><userinput>sed -i '/default) machine=/s/n32/64/g' \

Modified: trunk/clfs/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips64-64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips64-64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -57,6 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -68,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/arcload.xml"/>

Modified: trunk/clfs/final-system/mips64-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/mips64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -96,6 +96,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
@@ -109,9 +112,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/arcload.xml"/>

Modified: trunk/clfs/final-system/multilib/eglibc-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/eglibc-64bit.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/multilib/eglibc-64bit.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -23,14 +23,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
 <screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')

Modified: trunk/clfs/final-system/multilib/eglibc.xml
===================================================================
--- trunk/clfs/final-system/multilib/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/multilib/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -28,14 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/gcc.xml
===================================================================
--- trunk/clfs/final-system/multilib/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/multilib/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -23,22 +23,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/iputils.xml
===================================================================
--- trunk/clfs/final-system/multilib/iputils.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/multilib/iputils.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -41,7 +41,8 @@
     href="../common/iputils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" IPV4_TARGETS="tracepath ping clockdiff" \
+    IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iputils.xml"

Modified: trunk/clfs/final-system/multilib/module-init-tools.xml
===================================================================
--- trunk/clfs/final-system/multilib/module-init-tools.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/multilib/module-init-tools.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -27,13 +27,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure &&
-make check &&
-./tests/runtests &&
-make clean</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -62,10 +57,6 @@
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/tar.xml
===================================================================
--- trunk/clfs/final-system/multilib/tar.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/multilib/tar.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -31,14 +31,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \

Modified: trunk/clfs/final-system/ppc/eglibc.xml
===================================================================
--- trunk/clfs/final-system/ppc/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/ppc/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -19,7 +19,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
@@ -27,14 +27,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/ppc/gcc.xml
===================================================================
--- trunk/clfs/final-system/ppc/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/ppc/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -23,22 +23,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/ppc-chapter.xml
===================================================================
--- trunk/clfs/final-system/ppc-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/ppc-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -57,6 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -68,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/parted.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/powerpc-utils.xml"/>

Modified: trunk/clfs/final-system/ppc64/eglibc-64bit.xml
===================================================================
--- trunk/clfs/final-system/ppc64/eglibc-64bit.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/ppc64/eglibc-64bit.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -8,7 +8,7 @@
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc-64bit.html"?>
 
-  <title>EGLIBC-&eglibc-version; 64 bit</title>
+  <title>EGLIBC-&eglibc-version; 64-Bit</title>
 
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
@@ -19,18 +19,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,7 +41,7 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="m1">Tell EGLIBC to install its 64 bit libraries into
+    <para os="m1">Tell EGLIBC to install its 64-bit libraries into
     <filename class="directory">/lib64</filename>:</para>
 
 <screen os="m2"><userinput>echo "slibdir=/lib64" >> configparms</userinput></screen>

Modified: trunk/clfs/final-system/ppc64/eglibc.xml
===================================================================
--- trunk/clfs/final-system/ppc64/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/ppc64/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -8,11 +8,11 @@
 <sect1 id="ch-system-eglibc-32" role="wrap">
   <?dbhtml filename="eglibc.html"?>
 
-  <title>EGLIBC-&eglibc-version; 32 bit Libraries</title>
+  <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
 
   <indexterm zone="ch-system-eglibc-32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
-    <secondary>32 bit</secondary>
+    <secondary>32 Bit</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,7 +20,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
@@ -28,14 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,15 +41,15 @@
     <para os="u1">The powerpc (32) architecture is expected to fail the
     check-textrel tests because it cannot protect some elf segments in
     shared libraries from being executable and writable. Using the default
-    64 bit compiler means the test runs as <literal>__powerpc64__</literal>
+    64-bit compiler means the test runs as <literal>__powerpc64__</literal>
     which is <emphasis>not</emphasis> expected to fail. The problem only exists
-    in 32 bit, the 64 bit ABI allows the segments to be protected.</para>
+    in 32-bit, the 64-bit ABI allows the segments to be protected.</para>
 
-    <para os="u2">Other distributions alter gcc to default to 32 bits and
-    so do not see this failure.  Whether they then test correctly on 64 bit
+    <para os="u2">Other distributions alter gcc to default to 32-bits and
+    so do not see this failure.  Whether they then test correctly on 64-bit
     libraries is not our problem.</para>
 
-    <para os="u3">Force the test to use the 32 bit compiler with the following
+    <para os="u3">Force the test to use the 32-bit compiler with the following
     <command>sed</command> :</para>
 
 <screen os="u4"><userinput>sed -i "s/\(^check-textrel-CFLAGS = \)/\1 ${BUILD32} /" elf/Makefile</userinput></screen>
@@ -140,7 +132,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/final-system/ppc64/gcc.xml
===================================================================
--- trunk/clfs/final-system/ppc64/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/ppc64/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -23,22 +23,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/ppc64-chapter.xml
===================================================================
--- trunk/clfs/final-system/ppc64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/ppc64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -77,6 +77,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
@@ -89,8 +91,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/parted.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/powerpc-utils.xml"/>

Modified: trunk/clfs/final-system/sparc-chapter.xml
===================================================================
--- trunk/clfs/final-system/sparc-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/sparc-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -54,9 +54,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -67,7 +68,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>

Modified: trunk/clfs/final-system/sparc64/eglibc-64bit.xml
===================================================================
--- trunk/clfs/final-system/sparc64/eglibc-64bit.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/sparc64/eglibc-64bit.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -8,7 +8,7 @@
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc-64bit.html"?>
 
-  <title>EGLIBC-&eglibc-version; 64 bit</title>
+  <title>EGLIBC-&eglibc-version; 64-Bit</title>
 
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
@@ -19,18 +19,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/sparc64-64/eglibc.xml
===================================================================
--- trunk/clfs/final-system/sparc64-64/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/sparc64-64/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -19,7 +19,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de EGLIBC</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
@@ -27,14 +27,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/sparc64-64-chapter.xml
===================================================================
--- trunk/clfs/final-system/sparc64-64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/sparc64-64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -54,9 +54,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -68,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>

Modified: trunk/clfs/final-system/sparc64-chapter.xml
===================================================================
--- trunk/clfs/final-system/sparc64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/sparc64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -74,9 +74,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
@@ -89,8 +91,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>

Modified: trunk/clfs/final-system/x86/eglibc.xml
===================================================================
--- trunk/clfs/final-system/x86/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -27,14 +27,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/x86/grub.xml
===================================================================
--- trunk/clfs/final-system/x86/grub.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86/grub.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -30,61 +30,185 @@
       <ulink url="http://trac.cross-lfs.org/wiki/bootloaders"/></para>
     </note>
 
-    <para os="p1">GRUB has an issue that can cause it to segfault when you
-    try to configure a drive to utilize GRUB on x86_64 and building machines. The following
-    patch fixes this problem:</para>
+    <note os="n2">
+      <para>This package is known to have issues when its default optimization
+      flags (including the <option>-march</option> and <option>-mcpu</option>
+      options) are changed. If any environment variables that override default
+      optimizations have been defined, such as <envar>CFLAGS</envar> and
+      <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
+    </note>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&grub-use_mmap-patch;</userinput></screen>
+    <para os="a">Prepare GRUB for compilation:</para>
 
-    <para os="p3">GRUB has an issue where it sometimes doesn't detect
-    the disk geometry correctly when used with Linux 2.6, resulting
-    in the error message <literal>Error 24: Attempt to access block outside
-    partition</literal>. The following patch contains a fix for this issue
-    as well as various fixes for raid controllers and support for the
-    new Intel Mac:</para>
+<screen os="b"><userinput>./configure --prefix=/usr \
+    --sysconfdir=/etc</userinput></screen>
 
-<screen os="p4"><userinput>patch -Np1 -i ../&grub-fixes-patch;</userinput></screen>
+    <para os="c">Compile the package:</para>
 
-    <para os="p5">By default, GRUB doesn't support ext2 filesystems with 256-byte inodes. Fix this by applying the following patch:</para>
+<screen os="d"><userinput>make</userinput></screen>
 
-<screen os="p6"><userinput>patch -Np1 -i ../&grub-256byte_inode-patch;</userinput></screen>
+    <para os="e">To test GRUB you must have QEMU installed and then, issue:
+    <userinput>make check</userinput>.</para>
 
-    <para os="p7">By default, GRUB doesn't support ext4 filesystems. Fix this by applying the following patch:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="p8"><userinput>patch -Np1 -i ../&grub-ext4-patch;</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="a">This package is known to have issues when its default optimization
-    flags (including the <option>-march</option> and <option>-mcpu</option>
-    options) are changed. If any environment variables that override default
-    optimizations have been defined, such as <envar>CFLAGS</envar> and
-    <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
+  </sect2>
 
-    <para os="b">Prepare GRUB for compilation:</para>
+  <sect2 id="conf-grub" role="configuration">
+    <title>Configuring GRUB</title>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+    <indexterm zone="conf-grub">
+      <primary sortas="a-GRUB">GRUB</primary>
+    <secondary>configuring</secondary></indexterm>
 
-    <para os="c">Compile the package:</para>
+    <indexterm zone="conf-grub">
+      <primary sortas="e-/etc/default/grub">/etc/default/grub</primary>
+    </indexterm>
 
-<screen os="d"><userinput>make</userinput></screen>
+    <para>Now that grub is installed, we need to configure the defaults that
+    will be used to generate the configuration after we install the kernel.
+    Create this file with the following:</para>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+<screen><userinput>install -m755 -dv /etc/default
+cat > /etc/default/grub << "EOF"
+<literal># Begin /etc/default/grub
 
-    <para os="f">Install the package:</para>
+GRUB_DEFAULT=0
+#GRUB_SAVEDEFAULT=true
+GRUB_HIDDEN_TIMEOUT=
+GRUB_HIDDEN_TIMEOUT_QUIET=false
+GRUB_TIMEOUT=10
+GRUB_DISTRIBUTOR=Cross-LFS
 
-<screen os="g"><userinput>make install
-mkdir -pv /boot/grub
-cp -v /usr/lib/grub/*/stage{1,2} /boot/grub</userinput></screen>
+GRUB_CMDLINE_LINUX=""
+GRUB_CMDLINE_LINUX_DEFAULT=""
 
-    <para os="h">The directory in
-    <filename class="directory">/usr/lib/grub</filename> (its name depends
-    on your arch) contains a number of <filename>*stage1_5</filename> files,
-    different ones for different file systems. Review the files available and
-    copy the appropriate ones to the <filename
-    class="directory">/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
+#GRUB_TERMINAL=console
+#GRUB_GFXMODE=640x480
 
+#GRUB_DISABLE_LINUX_UUID=true
+#GRUB_DISABLE_LINUX_RECOVERY=true
+
+#GRUB_INIT_TUNE="480 440 1"
+
+#GRUB_DISABLE_OS_PROBER=true
+
+# End /etc/default/grub</literal>
+EOF</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the above options and possible alternate
+      values:</title>
+
+    <varlistentry>
+      <term><parameter>GRUB_DEFAULT=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_SAVEDEFAULT=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_HIDDEN_TIMEOUT=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_HIDDEN_TIMEOUT_QUIET=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_TIMEOUT=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_DISTRIBUTOR=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_CMDLINE_LINUX=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_CMDLINE_LINUX_DEFAULT=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_TERMINAL=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_GFXMODE=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_DEFAULT=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_DISABLE_LINUX_UUID=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_DISABLE_LINUX_RECOVERY=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_INIT_TUNE=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>GRUB_DISABLE_OS_PROBER=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    </variablelist>
+
   </sect2>
 
   <sect2 id="contents-grub" role="content">

Modified: trunk/clfs/final-system/x86-chapter.xml
===================================================================
--- trunk/clfs/final-system/x86-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -57,6 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -68,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>

Modified: trunk/clfs/final-system/x86_64/eglibc-64bit.xml
===================================================================
--- trunk/clfs/final-system/x86_64/eglibc-64bit.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86_64/eglibc-64bit.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -22,14 +22,6 @@
     <title>Installation d'EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 

Modified: trunk/clfs/final-system/x86_64/eglibc.xml
===================================================================
--- trunk/clfs/final-system/x86_64/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86_64/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -28,14 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/x86_64-64/eglibc.xml
===================================================================
--- trunk/clfs/final-system/x86_64-64/eglibc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86_64-64/eglibc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -28,14 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/x86_64-64/lilo.xml
===================================================================
--- trunk/clfs/final-system/x86_64-64/lilo.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86_64-64/lilo.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -29,9 +29,11 @@
   <sect2 role="installation">
     <title>Installation de Lilo</title>
 
+<!--
      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
      href="../../final-system/x86/grub.xml"
      xpointer="xpointer(//*[@os='n1'])"/>
+-->
 
     <para os="c">Compilez le paquet :</para>
 

Modified: trunk/clfs/final-system/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/final-system/x86_64-64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86_64-64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -9,7 +9,7 @@
   <?dbhtml dir="final-system"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Installer les logiciels du système de base</title>
+  <title>Installing Basic System Software</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
@@ -57,6 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
@@ -68,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>

Modified: trunk/clfs/final-system/x86_64-chapter.xml
===================================================================
--- trunk/clfs/final-system/x86_64-chapter.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/final-system/x86_64-chapter.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -9,7 +9,7 @@
   <?dbhtml dir="final-system"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Installer les logiciels du système de base</title>
+  <title>Installing Basic System Software</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
@@ -37,7 +37,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/multiarch_wrapper.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
@@ -77,6 +77,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
@@ -89,9 +91,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/stripping.xml"/>
 

Modified: trunk/clfs/general.ent
===================================================================
--- trunk/clfs/general.ent	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/general.ent	2010-08-08 23:22:28 UTC (rev 1195)
@@ -2,7 +2,7 @@
 
 <!ENTITY month "08"> <!-- Use two digits -->
 <!ENTITY month_name "août">
-<!ENTITY day "3"> <!-- Use two digits -->
+<!ENTITY day "8"> <!-- Use two digits -->
 <!ENTITY year "2010"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

Modified: trunk/clfs/introduction/common/changelog.xml
===================================================================
--- trunk/clfs/introduction/common/changelog.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/introduction/common/changelog.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -22,6 +22,58 @@
   <itemizedlist>
     <title>Liste des modifications :</title>
 
+    <listitem>
+      <para>8 août 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Make vers 3.82.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de GCC vers 4.5.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de GRUB vers 1.98.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour du noyau vers 2.6.35.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de DHCPCD vers 5.2.7.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Installation de XZutils avant Man. Le script
+          configure de man cherchait unxz dans /tools.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Ajout de set ruler au vimrc du système par défaut.
+          Cela peut être une option très utile lorsqu'on fait de l'édition de texte.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour d'Udev vers 160.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Utilisation de pushd et de popd lors de la 
+          régénération de la base de données info après l'installation de
+          texinfo.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Suppression du correctif des nouveaux compresseurs
+          de Tar et ajout d'un correctif de pages de man mises à jour.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Psmisc vers 22.12.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Module-Init-Tools vers 3.12.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Kbd vers 1.15.2.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de IPUtils vers s20100418.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2 août 2010</para>

Modified: trunk/clfs/materials/common/patches.xml
===================================================================
--- trunk/clfs/materials/common/patches.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/materials/common/patches.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -39,15 +39,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>EGLIBC correctif - <token>&eglibc-fixes-patch-size;</token> :</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&eglibc-fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&eglibc-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Expect correctif NoTk - <token>&expect-notk-patch-size;</token> :</term>
       <listitem>
         <para>Téléchargement : <ulink
@@ -66,24 +57,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC Correctif de la branche Mise à jour - <token>&gcc-branch_update-patch-size;</token> :</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&gcc-branch_update-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&gcc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC correctif - <token>&gcc-fixes-patch-size;</token> :</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&gcc-fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&gcc-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Grep correctif - <token>&grep-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Téléchargement : <ulink
@@ -102,11 +75,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>IPUtils correctif pages de man manquantes - <token>&iputils-manpages-patch-size;</token> :</term>
+      <term>IPUtils correctif documentation prégénérée - <token>&iputils-doc-patch-size;</token> :</term>
       <listitem>
         <para>Téléchargement : <ulink
-        url="&patches-root;&iputils-manpages-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&iputils-manpages-patch-md5;</literal></para>
+        url="&patches-root;&iputils-doc-patch;"/></para>
+        <para>Somme de contrôle MD5 : <literal>&iputils-doc-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -174,24 +147,15 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Tar correctif page de man - <token>&tar-man_page-patch-size;</token> :</term>
+      <term>Tar correctif pages de man - <token>&tar-man-patch-size;</token> :</term>
       <listitem>
         <para>Téléchargement : <ulink
-        url="&patches-root;&tar-man_page-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&tar-man_page-patch-md5;</literal></para>
+        url="&patches-root;&tar-man-patch;"/></para>
+        <para>Somme de contrôle MD5 : <literal>&tar-man-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Tar correctif nouveaux outils de Compression - <token>&tar-new_compressors-patch-size;</token> :</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&tar-new_compressors-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&tar-new_compressors-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Texinfo correctif nouveaux outils de compression - <token>&texinfo-new_compressors-patch-size;</token> :</term>
       <listitem>
         <para>Téléchargement : <ulink

Modified: trunk/clfs/materials/sparc/patches.xml
===================================================================
--- trunk/clfs/materials/sparc/patches.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/materials/sparc/patches.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -15,9 +15,9 @@
     <varlistentry os="elftoaout-fixes-patch">
       <term>Elftoaout Fixes Patch - <token>&elftoaout-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Téléchargement : <ulink
+        <para>Download: <ulink
         url="&patches-root;&elftoaout-fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&elftoaout-fixes-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&elftoaout-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -25,21 +25,12 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="kbd-kbio-patch">
-      <term>KBD kbio Patch - <token>&kbd-kbio-patch-size;</token>:</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&kbd-kbio-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&kbd-kbio-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="silo-fixes-patch">
       <term>Silo Fixes Patch - <token>&silo-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Téléchargement : <ulink
+        <para>Download: <ulink
         url="&patches-root;&silo-fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&silo-fixes-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&silo-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: trunk/clfs/materials/x86/patches.xml
===================================================================
--- trunk/clfs/materials/x86/patches.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/materials/x86/patches.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -21,41 +21,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="grub-256byte_inode-patch">
-      <term>Grub 256-Byte Inode Patch - <token>&grub-256byte_inode-patch-size;</token>:</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&grub-256byte_inode-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&grub-256byte_inode-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="grub-ext4-patch">
-      <term>Grub EXT4 Update - <token>&grub-ext4-patch-size;</token>:</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&grub-ext4-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&grub-ext4-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="grub-fixes-patch">
-      <term>Grub Various Fixes - <token>&grub-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&grub-fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&grub-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="grub-use_mmap-patch">
-      <term>Grub Use MMAP Patch - <token>&grub-use_mmap-patch-size;</token>:</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&grub-use_mmap-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&grub-use_mmap-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
   </variablelist>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/materials/x86_64/patches.xml
===================================================================
--- trunk/clfs/materials/x86_64/patches.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/materials/x86_64/patches.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -16,22 +16,6 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='grub-256byte_inode-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='grub-ext4-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='grub-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='grub-use_mmap-patch'])"/>
-
     <varlistentry os="iproute2-libdir-patch">
       <term>IPRoute2 correctif Lib64 - <token>&iproute2-libdir-patch-size;</token> :</term>
       <listitem>

Modified: trunk/clfs/network/common/dhcp.xml
===================================================================
--- trunk/clfs/network/common/dhcp.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/network/common/dhcp.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -15,8 +15,8 @@
 
     <para>D'abord, installez le service à partr du paquet CLFS Bootscripts :</para>
 
-<screen><userinput>tar -jxvf bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.bz2
-cd -v bootscripts-cross-lfs-&bootscripts-clfs-version;
+<screen><userinput>tar -xvf bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.bz2
+cd bootscripts-cross-lfs-&bootscripts-clfs-version;
 make install-service-dhcpcd</userinput></screen>
 
     <para>Enfin, créez le fichier de configuration
@@ -34,8 +34,7 @@
 
 # Commande d'arrêt pour DHCPCD
 DHCP_STOP="-k"</literal>
-EOF
-</userinput></screen>
+EOF</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="static.xml"

Modified: trunk/clfs/packages.ent
===================================================================
--- trunk/clfs/packages.ent	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/packages.ent	2010-08-08 23:22:28 UTC (rev 1195)
@@ -91,10 +91,10 @@
 <!ENTITY dejagnu-md5 "053f18fd5d00873de365413cab17a666">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu">
 
-<!ENTITY dhcpcd-version "5.1.4">
-<!ENTITY dhcpcd-size "64 Kio">
+<!ENTITY dhcpcd-version "5.2.7">
+<!ENTITY dhcpcd-size "68 Kio">
 <!ENTITY dhcpcd-url "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
-<!ENTITY dhcpcd-md5 "d18afc66efbea9a28e541e9b10fd284f">
+<!ENTITY dhcpcd-md5 "1dcf377270a13cc774c9a26fc50453b5">
 <!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
 
 <!ENTITY diffutils-version "3.0">
@@ -168,10 +168,10 @@
 <!ENTITY gawk-md5 "52b41c6c4418b3226dfb8f82076193bb">
 <!ENTITY gawk-home "&gnu-software;gawk">
 
-<!ENTITY gcc-version "4.5.0">
-<!ENTITY gcc-size "64,400 Kio">
+<!ENTITY gcc-version "4.5.1">
+<!ENTITY gcc-size "64,576 Kio">
 <!ENTITY gcc-url "ftp://gcc.gnu.org/pub/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "ff27b7c4a5d5060c8a8543a44abca31f">
+<!ENTITY gcc-md5 "48231a8e33ed6e058a341c53b819de1a">
 <!ENTITY gcc-home "http://gcc.gnu.org">
 
 <!ENTITY gettext-version "0.18.1.1">
@@ -198,10 +198,10 @@
 <!ENTITY groff-md5 "48fa768dd6fdeb7968041dd5ae8e2b02">
 <!ENTITY groff-home "&gnu-software;groff">
 
-<!ENTITY grub-version "0.97">
-<!ENTITY grub-size "949 Kio">
+<!ENTITY grub-version "1.98">
+<!ENTITY grub-size "2,392 Mio">
 <!ENTITY grub-url "&alpha-gnu;grub/grub-&grub-version;.tar.gz">
-<!ENTITY grub-md5 "cd3f3eb54446be6003156158d51f4884">
+<!ENTITY grub-md5 "c0bcf60e524739bb64e3a2d4e3732a59">
 <!ENTITY grub-home "&gnu-software;grub">
 
 <!ENTITY gzip-version "1.4">
@@ -228,16 +228,16 @@
 <!ENTITY iproute2-md5 "5c5742bdac05a1688f266512e685b83c">
 <!ENTITY iproute2-home "http://www.linuxfoundation.org/en/Net:Iproute2">
 
-<!ENTITY iputils-version "s20071127">
-<!ENTITY iputils-size "86 Kio">
+<!ENTITY iputils-version "s20100418">
+<!ENTITY iputils-size "96 Kio">
 <!ENTITY iputils-url "http://www.skbuff.net/iputils/iputils-&iputils-version;.tar.bz2">
-<!ENTITY iputils-md5 "12245e9927d60ff5cf4a99d265bcb7d3">
+<!ENTITY iputils-md5 "df6b0062118cdc5c62e3c810f831e976">
 <!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
 
-<!ENTITY kbd-version "1.15">
-<!ENTITY kbd-size "1,288 Kio">
+<!ENTITY kbd-version "1.15.2">
+<!ENTITY kbd-size "1,524 Mio">
 <!ENTITY kbd-url "ftp://devel.altlinux.org/legion/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "ba3fd20e6c79e58422c3cc6b28718939">
+<!ENTITY kbd-md5 "77d0b51454522bc6c170bbdc6e31202a">
 <!ENTITY kbd-home " ">
 
 <!ENTITY less-version "436">
@@ -261,10 +261,10 @@
 
 <!ENTITY linux-dl-version "2.6">
 
-<!ENTITY linux-version "2.6.34.1">
-<!ENTITY linux-size "66,076 Kio">
+<!ENTITY linux-version "2.6.35">
+<!ENTITY linux-size "67,684 Kio">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "d31d241dc2058698a45fe41359cafb45">
+<!ENTITY linux-md5 "091abeb4684ce03d1d936851618687b6">
 <!ENTITY linux-home "http://www.kernel.org">
 
 <!ENTITY m4-version "1.4.14">
@@ -273,10 +273,10 @@
 <!ENTITY m4-md5 "e6fb7d08d50d87e796069cff12a52a93">
 <!ENTITY m4-home "&gnu-software;m4">
 
-<!ENTITY make-version "3.81">
-<!ENTITY make-size "1,124 Kio">
+<!ENTITY make-version "3.82">
+<!ENTITY make-size "1,216 Kio">
 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
-<!ENTITY make-md5 "354853e0b2da90c527e35aabb8d6f1e6">
+<!ENTITY make-md5 "1a11100f3c63fcf5753818e59d63088f">
 <!ENTITY make-home "&gnu-software;make">
 
 <!ENTITY man-version "1.6f">
@@ -291,10 +291,10 @@
 <!ENTITY man-pages-md5 "98ec2324abea77d7a992470dd44d140c">
 <!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
 
-<!ENTITY module-init-tools-version "3.11.1">
-<!ENTITY module-init-tools-size "200 Kio">
+<!ENTITY module-init-tools-version "3.12">
+<!ENTITY module-init-tools-size "920 Kio">
 <!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
-<!ENTITY module-init-tools-md5 "28dfcb9e24cdbeb12b99ac1eb8af7dea">
+<!ENTITY module-init-tools-md5 "8b2257ce9abef74c4a44d825d23140f3">
 <!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
 
 <!ENTITY mpc-version "0.8.2">
@@ -351,10 +351,10 @@
 <!ENTITY procps-md5 "9532714b6846013ca9898984ba4cd7e0">
 <!ENTITY procps-home "http://procps.sourceforge.net">
 
-<!ENTITY psmisc-version "22.9">
-<!ENTITY psmisc-size "312 Kio">
+<!ENTITY psmisc-version "22.12">
+<!ENTITY psmisc-size "368 Kio">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "c242530de46b951ab10a2237a6048a9c">
+<!ENTITY psmisc-md5 "16c83a351c292cfc845b27d6395e05fb">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net">
 
 <!ENTITY readline-version2 "6">
@@ -413,10 +413,10 @@
 <!ENTITY texinfo-md5 "71ba711519209b5fb583fed2b3d86fcb">
 <!ENTITY texinfo-home "&gnu-software;texinfo">
 
-<!ENTITY udev-version "149">
+<!ENTITY udev-version "160">
 <!ENTITY udev-size "532 Kio">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "b218bd15939e8afc6368e1907a48bb26">
+<!ENTITY udev-md5 "65459a1f090082c0471bf4e5112208d7">
 <!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
 
 <!ENTITY uname_hack-version "20080713">

Modified: trunk/clfs/patches.ent
===================================================================
--- trunk/clfs/patches.ent	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/patches.ent	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,10 +12,6 @@
 <!ENTITY coreutils-uname-patch-md5 "b2e0649d3f22a631fff96667baeab971">
 <!ENTITY coreutils-uname-patch-size "8 Kio">
 
-<!ENTITY eglibc-fixes-patch "eglibc-&eglibc-version;-&eglibc-date;-r&eglibc-revision;-fixes-1.patch">
-<!ENTITY eglibc-fixes-patch-md5 "36593dc2394852253ff0ff1afa7f2009">
-<!ENTITY eglibc-fixes-patch-size "2 Kio">
-
 <!ENTITY expect-notk-patch "expect-&expect-version;-notk-2.patch">
 <!ENTITY expect-notk-patch-md5 "4fd526f61dfe4a1f01195c02ad114e17">
 <!ENTITY expect-notk-patch-size "20 Kio">
@@ -24,14 +20,6 @@
 <!ENTITY flex-gcc44-patch-md5 "a6ffbba93d034380e12110bb6d399113">
 <!ENTITY flex-gcc44-patch-size "12 Kio">
 
-<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-4.patch">
-<!ENTITY gcc-branch_update-patch-md5 "aca21cc253204489a850b0f7a64f885e">
-<!ENTITY gcc-branch_update-patch-size "240 Kio">
-
-<!ENTITY gcc-fixes-patch "gcc-&gcc-version;-fixes-3.patch">
-<!ENTITY gcc-fixes-patch-md5 "615aa46ee6873b92647cd93210a8fc1d">
-<!ENTITY gcc-fixes-patch-size "25 Kio">
-
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
 <!ENTITY gcc-specs-patch-md5 "9ba70e5765be93577166d824064e675a">
 <!ENTITY gcc-specs-patch-size "16 Kio">
@@ -39,15 +27,15 @@
 <!ENTITY grep-fixes-patch "grep-&grep-version;-fixes-1.patch">
 <!ENTITY grep-fixes-patch-md5 "0cb36684847842adb17a1b3fb96f733d">
 <!ENTITY grep-fixes-patch-size "12 Kio">
- 
-<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-2.patch">
-<!ENTITY iputils-fixes-patch-md5 "31a39902b0d343233d48ef0f3c038559">
-<!ENTITY iputils-fixes-patch-size "6 Kio">
 
-<!ENTITY iputils-manpages-patch "iputils-&iputils-version;-manpages-2.patch">
-<!ENTITY iputils-manpages-patch-md5 "fc3ceca15794cc0f9d84a43a21692aeb">
-<!ENTITY iputils-manpages-patch-size "29 Kio">
+<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-1.patch">
+<!ENTITY iputils-fixes-patch-md5 "138913183f50dba3ed096bb55a8e5d08">
+<!ENTITY iputils-fixes-patch-size "8 Kio">
 
+<!ENTITY iputils-doc-patch "iputils-&iputils-version;-doc-1.patch">
+<!ENTITY iputils-doc-patch-md5 "ca2642c8c92df6f8257f925daaadce6b">
+<!ENTITY iputils-doc-patch-size "136 Kio">
+
 <!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">
 <!ENTITY man-i18n-patch-md5 "8b189d6500461797250ae9f3e5638dd5">
 <!ENTITY man-i18n-patch-size "10 Kio">
@@ -76,14 +64,10 @@
 <!ENTITY sysvinit-fixes-patch-md5 "405d23896b54ca61afd53003a62592fd">
 <!ENTITY sysvinit-fixes-patch-size "20 Kio">
 
-<!ENTITY tar-man_page-patch "tar-&tar-version;-man_page-1.patch">
-<!ENTITY tar-man_page-patch-md5 "a8d01d18a3e550230302a5a52c686d25">
-<!ENTITY tar-man_page-patch-size "16 Kio">
+<!ENTITY tar-man-patch "tar-&tar-version;-man-1.patch">
+<!ENTITY tar-man-patch-md5 "6a1a1d8bdc00fc149c28aa1f8405fc93">
+<!ENTITY tar-man-patch-size "20 Kio">
 
-<!ENTITY tar-new_compressors-patch "tar-&tar-version;-new_compressors-1.patch">
-<!ENTITY tar-new_compressors-patch-md5 "95a38ca73a39105a5aee528471c7fcc9">
-<!ENTITY tar-new_compressors-patch-size "2 Kio">
-
 <!ENTITY texinfo-new_compressors-patch "texinfo-&texinfo-version;-new_compressors-1.patch">
 <!ENTITY texinfo-new_compressors-patch-md5 "4ae2d3c132e21cb83b825bc691056d07">
 <!ENTITY texinfo-new_compressors-patch-size "2 Kio">
@@ -174,10 +158,6 @@
 <!ENTITY elftoaout-fixes-patch-md5 "485e77cf2ed082d3d0ea99c703f1f14b">
 <!ENTITY elftoaout-fixes-patch-size "6 Kio">
 
-<!ENTITY kbd-kbio-patch "kbd-&kbd-version;-sparc_kbio-1.patch">
-<!ENTITY kbd-kbio-patch-md5 "01e9b5ca65b76d8ad79701a8ed5bdece">
-<!ENTITY kbd-kbio-patch-size "2 Kio">
-
 <!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-1.patch">
 <!ENTITY silo-fixes-patch-md5 "03e8897c5d33d0e6ee81e8e8aeeb772f">
 <!ENTITY silo-fixes-patch-size "696 Kio">
@@ -188,22 +168,6 @@
 <!ENTITY bin86-x86_64-patch-md5 "92bdce7b0655cd2e9f83c83fc56d128e">
 <!ENTITY bin86-x86_64-patch-size "1 Kio">
 
-<!ENTITY grub-256byte_inode-patch "grub-&grub-version;-256byte_inode-1.patch">
-<!ENTITY grub-256byte_inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
-<!ENTITY grub-256byte_inode-patch-size "4 Kio">
-
-<!ENTITY grub-ext4-patch "grub-&grub-version;-ext4-1.patch">
-<!ENTITY grub-ext4-patch-md5 "4e15738421a4e769cafd324befb8be5d">
-<!ENTITY grub-ext4-patch-size "9 Kio">
-
-<!ENTITY grub-fixes-patch "grub-&grub-version;-fixes-2.patch">
-<!ENTITY grub-fixes-patch-md5 "3f7b50a6274063c1e8a8e57131045f5a">
-<!ENTITY grub-fixes-patch-size "132 Kio">
-
-<!ENTITY grub-use_mmap-patch "grub-&grub-version;-use_mmap-1.patch">
-<!ENTITY grub-use_mmap-patch-md5 "700257168164d6df67b5c73ba02cca75">
-<!ENTITY grub-use_mmap-patch-size "20 Kio">
-
 <!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-2.patch">
 <!ENTITY lilo-cross-x86_64-patch-md5 "a7440e18ef7fa6c5d1c6181dc0cc4d10">
 <!ENTITY lilo-cross-x86_64-patch-size "2 Kio">

Modified: trunk/clfs/temp-system/64/gcc.xml
===================================================================
--- trunk/clfs/temp-system/64/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/temp-system/64/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -24,15 +24,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/temp-system/common/gcc.xml
===================================================================
--- trunk/clfs/temp-system/common/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/temp-system/common/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -22,26 +22,8 @@
   <sect2 role="installation">
     <title>Installation de GCC</title>
 
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/temp-system/mips64/gcc.xml
===================================================================
--- trunk/clfs/temp-system/mips64/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/temp-system/mips64/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-temp-system-gcc">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>système temporaire</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,18 +20,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC</title>
+    <title>Installation of GCC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -111,7 +103,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/temp-system/multilib/gcc.xml
===================================================================
--- trunk/clfs/temp-system/multilib/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/temp-system/multilib/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -22,16 +22,9 @@
   <sect2 role="installation">
     <title>Installation de GCC</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/temp-system/ppc/gcc.xml
===================================================================
--- trunk/clfs/temp-system/ppc/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/temp-system/ppc/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-temp-system-gcc">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>système temporaire</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,18 +20,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC</title>
+    <title>Installation of GCC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -107,7 +99,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/temp-system/ppc64/gcc.xml
===================================================================
--- trunk/clfs/temp-system/ppc64/gcc.xml	2010-08-04 09:51:54 UTC (rev 1194)
+++ trunk/clfs/temp-system/ppc64/gcc.xml	2010-08-08 23:22:28 UTC (rev 1195)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-temp-system-gcc">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>système temporaire</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -20,18 +20,10 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC</title>
+    <title>Installation of GCC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -107,7 +99,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>




More information about the lfs-traducfr mailing list