[lfs-fr] r6604 - in trunk/clfs: . cross-tools/multilib introduction/common introduction/x86_64 introduction/x86_64-64 materials/common network network/common network/multilib partitioning partitioning/common prologue/common stylesheets stylesheets/lfs-xsl/xhtml temp-system/64 temp-system/common

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Mar 21 Oct 18:55:25 PDT 2014


Author: jmengual
Date: 2014-10-22 03:55:25 +0200 (Wed, 22 Oct 2014)
New Revision: 6604

Modified:
   trunk/clfs/README
   trunk/clfs/cross-tools/multilib/binutils.xml
   trunk/clfs/cross-tools/multilib/gcc-final.xml
   trunk/clfs/cross-tools/multilib/gcc-static.xml
   trunk/clfs/introduction/common/askforhelp.xml
   trunk/clfs/introduction/x86_64-64/changelog.xml
   trunk/clfs/introduction/x86_64/changelog.xml
   trunk/clfs/maj
   trunk/clfs/materials/common/introduction.xml
   trunk/clfs/network/common/choose.xml
   trunk/clfs/network/common/dhcpcd.xml
   trunk/clfs/network/common/hostname.xml
   trunk/clfs/network/common/hosts.xml
   trunk/clfs/network/common/resolv.xml
   trunk/clfs/network/multilib/dhcpcd.xml
   trunk/clfs/network/x86-chapter.xml
   trunk/clfs/network/x86_64-64-chapter.xml
   trunk/clfs/network/x86_64-chapter.xml
   trunk/clfs/partitioning/common/creatingfilesystem.xml
   trunk/clfs/partitioning/common/creatingpartition.xml
   trunk/clfs/partitioning/common/mounting.xml
   trunk/clfs/partitioning/x86-chapter.xml
   trunk/clfs/prologue/common/foreword.xml
   trunk/clfs/prologue/common/hostreqs.xml
   trunk/clfs/prologue/common/prerequisites.xml
   trunk/clfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
   trunk/clfs/stylesheets/top-index.xsl
   trunk/clfs/stylesheets/wget.xsl
   trunk/clfs/temp-system/64/binutils.xml
   trunk/clfs/temp-system/64/gcc.xml
   trunk/clfs/temp-system/common/bash.xml
   trunk/clfs/temp-system/common/binutils.xml
   trunk/clfs/temp-system/common/bison.xml
Log:
Avancement de la maj


Modified: trunk/clfs/README
===================================================================
--- trunk/clfs/README	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/README	2014-10-22 01:55:25 UTC (rev 6604)
@@ -13,12 +13,12 @@
 
 XML to XHTML:
 -------------
-make RENDERDIR=/path/to/output/location
+make BASEDIR=/path/to/output/location
 
 
 XML to single file XHTML (nochunks):
 ------------------------------------
-make RENDERDIR=/path/to/output/location nochunks
+make BASEDIR=/path/to/output/location nochunks
 
 
 XML to TXT
@@ -29,4 +29,4 @@
 
 XML to PDF:
 -----------
-make RENDERDIR=/path/to/output/location pdf
+make BASEDIR=/path/to/output/location pdf

Modified: trunk/clfs/cross-tools/multilib/binutils.xml
===================================================================
--- trunk/clfs/cross-tools/multilib/binutils.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/cross-tools/multilib/binutils.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -49,10 +49,10 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \
-  --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
-  --disable-nls --disable-static --enable-64-bit-bfd</userinput></screen>
- 
+    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
+    --disable-nls --disable-static --enable-64-bit-bfd --disable-werror</userinput></screen>
+
     <variablelist os="bd">
       <title>Voici la signification des options de configure  :</title>
 
@@ -81,9 +81,13 @@
       xpointer="xpointer(//*[@os='bd6'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd7'])"/>
+      href="../64/binutils.xml"
+      xpointer="xpointer(//*[@os='bd8'])"/>
 
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../64/binutils.xml"
+      xpointer="xpointer(//*[@os='bd9'])"/>
+
     </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -96,24 +100,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='bi'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/cross-tools/multilib/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/multilib/gcc-final.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/cross-tools/multilib/gcc-final.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -59,17 +59,15 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
-  --with-native-system-header-dir=/tools/include \
-  --disable-nls --enable-shared --disable-static \
-  --enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 \
-  --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \
-  --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
-  --enable-cloog-backend=isl --with-isl=/cross-tools \
-  --disable-isl-version-check --with-system-zlib --enable-checking=release \
-  --enable-libstdcxx-time</userinput></screen>
+    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+    --with-sysroot=${CLFS} --with-local-prefix=/tools \
+    --with-native-system-header-dir=/tools/include \
+    --disable-nls --disable-static --enable-languages=c,c++ \
+    --enable-__cxa_atexit --enable-threads=posix --with-mpc=/cross-tools \
+    --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
+    --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
+    --enable-libstdcxx-time</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-final.xml"

Modified: trunk/clfs/cross-tools/multilib/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/multilib/gcc-static.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/cross-tools/multilib/gcc-static.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -24,6 +24,10 @@
     et sans gestion des « Threads »</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
@@ -68,18 +72,18 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
-  --with-native-system-header-dir=/tools/include --disable-nls \
-  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-  --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
-  --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
-  --disable-libssp --disable-threads --disable-libatomic --disable-libitm \
-  --disable-libsanitizer --disable-libquadmath --disable-target-libiberty \
-  --disable-target-zlib --with-system-zlib --enable-cloog-backend=isl \
-  --with-isl=/cross-tools --disable-isl-version-check --enable-languages=c \
-  --enable-checking=release</userinput></screen>
+    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+    --with-sysroot=${CLFS} --with-local-prefix=/tools \
+    --with-native-system-header-dir=/tools/include --disable-nls \
+    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+    --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
+    --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
+    --disable-libssp --disable-libatomic --disable-libitm \
+    --disable-libsanitizer --disable-libquadmath --disable-threads \
+    --disable-target-zlib --with-system-zlib --with-isl=/cross-tools \
+    --enable-languages=c --enable-checking=release</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='am'])"/>

Modified: trunk/clfs/introduction/common/askforhelp.xml
===================================================================
--- trunk/clfs/introduction/common/askforhelp.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/introduction/common/askforhelp.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -50,7 +50,8 @@
         <para>L'architecture de l'hĂ´te et de la cible.</para>
       </listitem>
       <listitem>
-        <para>La valeur des variables d'environnement $CLFS_HOST, $CLFS_TARGET, $BUILD32 et $BUILD64.</para>
+        <para>La valeur des variables d'environnement ${CLFS_HOST} et ${CLFS_TARGET}
+        et, si cela s'applique, ${BUILD32}, ${BUILD64}, ${BUILDN32} et ${GCCTARGET}.</para>
       </listitem>
       <listitem>
         <para>Le paquet ou la section où le problème a été

Modified: trunk/clfs/introduction/x86_64/changelog.xml
===================================================================
--- trunk/clfs/introduction/x86_64/changelog.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/introduction/x86_64/changelog.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -33,6 +33,27 @@
 
 -->
     <listitem>
+      <para>25 Mai 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Ajout de ${BUILD64} Ă  variables.xml dans temp-system,
+          et suppression de CC="${CC} ${BUILD64}" des paquets du système temporaire
+          et du redémarrage.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>27 Avril 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Suppression d'un CFLAGS obsolète des commandes de
+          configuration de Glibc pour x86.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>08 novembre 2013</para>
       <itemizedlist>
         <listitem>

Modified: trunk/clfs/introduction/x86_64-64/changelog.xml
===================================================================
--- trunk/clfs/introduction/x86_64-64/changelog.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/introduction/x86_64-64/changelog.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -33,6 +33,28 @@
 
 -->
     <listitem>
+      <para>25 Mai 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Ajout de ${BUILD64} Ă  variables.xml dans temp-system,
+          et suppression de CC="${CC} ${BUILD64}" des paquets du système temporaire
+          et du redémarrage.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>27 Avril 2014</para>
+      <itemizedlist>
+        <listitem>
+        <listitem>
+          <para>[Chris] - Suppression d'un CFLAGS obsolète des commandes de
+          configuration de Glibc pour x86.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>24 octobre 2013</para>
       <itemizedlist>
         <listitem>

Modified: trunk/clfs/maj
===================================================================
--- trunk/clfs/maj	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/maj	2014-10-22 01:55:25 UTC (rev 6604)
@@ -1,1414 +1,3 @@
-diff -ru /home/jp/a/BOOK/introduction/common/askforhelp.xml BOOK/introduction/common/askforhelp.xml
---- /home/jp/a/BOOK/introduction/common/askforhelp.xml	2014-05-11 16:24:52.626516679 +0200
-+++ BOOK/introduction/common/askforhelp.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -46,8 +46,9 @@
-         <para>The architecture of the host and target.</para>
-       </listitem>
-       <listitem>
--        <para>The value of the $CLFS_HOST, $CLFS_TARGET, $BUILD32, and $BUILD64
--        environment variables.</para>
-+        <para>The value of the ${CLFS_HOST} and ${CLFS_TARGET} environment
-+        variables, and if applicable, ${BUILD32}, ${BUILD64}, ${BUILDN32},
-+        and ${GCCTARGET}.</para>
-       </listitem>
-       <listitem>
-         <para>The package or section in which the problem was encountered.</para>
-     </listitem>
-
-diff -ru /home/jp/a/BOOK/introduction/common/how.xml BOOK/introduction/common/how.xml
---- /home/jp/a/BOOK/introduction/common/how.xml	2014-05-11 16:24:52.626516679 +0200
-+++ BOOK/introduction/common/how.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -11,7 +11,7 @@
-   <title>How to Build a CLFS System</title>
- 
-   <para>The CLFS system will be built by using a previously installed
--  Unix system or Linux distribution (such as Debian, Fedora, Mandriva, SUSE,
-+  Unix system or Linux distribution (such as Debian, Fedora, openSUSE,
-   or Ubuntu). This existing system (the host) will be used as a starting
-   point to provide necessary programs, including a compiler, linker, and shell,
-   to build the new system. Select the <quote>development</quote> option
-@@ -21,10 +21,9 @@
-   <para>As an alternative to installing an entire separate distribution onto
-   your machine, you may wish to use a livecd. Most distributions provide
-   a livecd, which provides an environment to which you can add the required
--  tools onto, allowing you to
--  successfully follow the instructions in this book. Remember that if you
--  reboot the livecd you will need to reconfigure the host environment before
--  continuing with your build.</para>
-+  tools onto, allowing you to successfully follow the instructions in this
-+  book. Remember that if you reboot the livecd you will need to reconfigure
-+  the host environment before continuing with your build.</para>
- 
-   <para><xref linkend="chapter-partitioning"/> of this book describes how
-   to create a new Linux native partition and file system, the place
-@@ -47,38 +46,27 @@
-   compiler.</para>
- 
-   <para>The process of building cross-compile tools first involves building and
--  installing all the necessary tools to create a build system for the target 
-+  installing all the necessary tools to create a build system for the target
-   machine. With these cross-compiled tools, we eliminate any
-   dependencies on the toolchain from our host distro.</para>
- 
-   <para>After we build our <quote>Cross-Tools</quote>, we start building
--  a very minimal working system in /tools. This minimal system will be built
--  using the cross-toolchain in /cross-tools.</para>
--
--  <para>In <xref linkend="chapter-building-system"/>, the full CLFS system is
--  built. Depending on the system you are cross-compiling for, you will either
--  boot the minimal temp-system on the target machine, or chroot into it.</para>
--
--  <para>The <command>chroot</command> (change root) program is used to enter
--  a virtual environment and start a new shell whose root directory will be set
--  to the CLFS partition. This is very similar to rebooting and instructing the
--  kernel to mount the CLFS partition as the root partition.
--  The major advantage is that <quote>chrooting</quote> allows the builder to
--  continue using the host while CLFS is being built. While waiting for package
--  compilation to complete, a user can switch to a different virtual console
--  (VC) or X desktop and continue using the computer as normal.</para>
--
--  <para>Some systems cannot be built by chrooting so they must be
--  booted instead. Generally, if you building for a different arch than
--  the host system, you must reboot because the kernel will likely not
--  support the target machine. Booting involves installing a few
--  additional packages that are needed for bootup, installing
--  bootscripts, and building a miminal kernel. We also describe some
--  alternative booting methods in <xref linkend="ch-boot-whatnext"/></para>
--
--  <para>To finish the installation, the CLFS-Bootscripts are set up in <xref
--  linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
--  up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
-+  a very minimal working system in
-+  <filename class="directory">/tools</filename>, using the cross-toolchain in
-+  <filename class="directory">/cross-tools</filename>. Once the temporary
-+  system is finished, we perform a few additional tasks to prepare to
-+  enter this temporary build environment, either by booting or chrooting into
-+  it. For more details about the difference between these methods, see
-+  <xref linkend="ch-temp-system-choose"/>.</para>
-+
-+  <para>In <xref linkend="chapter-building-system"/>, after having booted
-+  or chrooted into the temporary build environment, the full CLFS system is
-+  built.</para>
-+
-+  <para>To finish the installation, several configuration files are created in
-+  <xref linkend="chapter-system-config"/>, and the kernel and boot loader are
-+  set up in <xref linkend="chapter-bootable"/>.
-+  <xref linkend="chapter-finalizing"/>
-   contains information on furthering the CLFS experience beyond this book.
-   After the steps in this book have been implemented, the computer will be
-   ready to reboot into the new CLFS system.</para>
-diff -ru /home/jp/a/BOOK/introduction/common/resources.xml BOOK/introduction/common/resources.xml
---- /home/jp/a/BOOK/introduction/common/resources.xml	2014-05-11 16:24:52.626516679 +0200
-+++ BOOK/introduction/common/resources.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -31,7 +31,7 @@
-     find the mail lists with the following link:</para>
- 
-     <para><ulink url="http://www.mail-archive.com/index.php?hunt=clfs"/></para>
--   
-+
-     <para>For information on the different lists, how to subscribe, archive
-     locations, and additional information, visit <ulink url="&clfs-wiki;wiki/lists"/>.</para>
- 
-@@ -58,7 +58,8 @@
-     FAQ or the mailing list archives. You can find the IRC network at
-     <uri>chat.freenode.net</uri>. The support channel for cross-lfs is
-     named #cross-lfs. If you need to show people the output of your
--    problems, please use http://pastebin.cross-lfs.org and reference
-+    problems, please use
-+    <ulink url="http://pastebin.cross-lfs.org"/> and reference
-     the pastebin URL when asking your questions.</para>
- 
-   </sect2>
-diff -ru /home/jp/a/BOOK/introduction/x86/changelog.xml BOOK/introduction/x86/changelog.xml
---- /home/jp/a/BOOK/introduction/x86/changelog.xml	2014-05-11 16:24:52.626516679 +0200
-+++ BOOK/introduction/x86/changelog.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -9,7 +9,7 @@
-   <title>Changelog for x86</title>
-   <?dbhtml filename="changelog-x86.html"?>
- 
--  <para>Below is a list of changes specifics for this architecture made
-+  <para>Below is a list of changes specific for this architecture made
-   since the previous release of the book. For general changes see
-   <xref linkend="ch-intro-changelog"/>,</para>
- 
-@@ -32,6 +32,26 @@
- 
- -->
-     <listitem>
-+      <para>27 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed obsolete CFLAGS from x86 Glibc configure
-+          commands.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>11 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Prevent GRUB from trying to build mkfont, to avoid
-+          linking to host system libraries.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-       <para>24 October 2013</para>
-       <itemizedlist>
-         <listitem>
-diff -ru /home/jp/a/BOOK/introduction/x86_64/changelog.xml BOOK/introduction/x86_64/changelog.xml
---- /home/jp/a/BOOK/introduction/x86_64/changelog.xml	2014-05-11 16:24:52.622516679 +0200
-+++ BOOK/introduction/x86_64/changelog.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -32,6 +32,28 @@
-     </listitem>
- 
- -->
-+
-+    <listitem>
-+      <para>25 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
-+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
-+          packages.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>27 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed obsolete CFLAGS from x86 Glibc configure
-+          commands.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-     <listitem>
-       <para>08 November 2013</para>
-       <itemizedlist>
-diff -ru /home/jp/a/BOOK/introduction/x86_64-64/changelog.xml BOOK/introduction/x86_64-64/changelog.xml
---- /home/jp/a/BOOK/introduction/x86_64-64/changelog.xml	2014-05-11 16:24:52.626516679 +0200
-+++ BOOK/introduction/x86_64-64/changelog.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -32,6 +32,28 @@
-     </listitem>
- 
- -->
-+
-+    <listitem>
-+      <para>25 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
-+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
-+          packages.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>27 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed obsolete CFLAGS from x86 Glibc configure
-+          commands.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-     <listitem>
-       <para>24 October 2013</para>
-       <itemizedlist>
-diff -ru /home/jp/a/BOOK/Makefile BOOK/Makefile
---- /home/jp/a/BOOK/Makefile	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/Makefile	2014-10-03 20:44:43.888339260 +0200
-@@ -20,8 +20,7 @@
- ARCHS		:= x86 x86_64 x86_64-64 \
- 		   sparc sparc64 sparc64-64 \
- 		   mips mips64 mips64-64 \
--		   ppc ppc64 ppc64-64 \
--		   alpha
-+		   ppc ppc64 ppc64-64
- 
- ifdef V
-   Q =
-@@ -238,5 +237,6 @@
- 	@echo
- 	@echo "Download-List Targets"
- 	@echo "  $(FG_GREEN)download-list $(FG_BLUE)$(ARCHS_DLLIST)$(FG_DEFAULT)"
-+	@echo
- 	@echo "md5-List Targets"
- 	@echo "  $(FG_GREEN)md5-list $(FG_BLUE)$(ARCHS_MD5LIST)$(FG_DEFAULT)"
-diff -ru /home/jp/a/BOOK/materials/common/introduction.xml BOOK/materials/common/introduction.xml
---- /home/jp/a/BOOK/materials/common/introduction.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/materials/common/introduction.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -40,13 +40,14 @@
-   <para>Make this directory writable and sticky. When a directory is
-   marked <quote>sticky</quote>, that means that even if multiple users have
-   write permission on that directory, any file within that directory can only be
--  deleted or modified by its owner. The following command will enable the
-+  deleted or modified by its owner. The following command, run as
-+  <systemitem class="username">root</systemitem>, will enable the
-   write and sticky modes:</para>
- 
- <screen><userinput>chmod -v a+wt ${CLFS}/sources</userinput></screen>
- 
-   <para>You can download all needed packages and patches into this directory
--either by using the links on the following pages in this section, or by passing 
-+either by using the links on the following pages in this section, or by passing
- the <ulink url="../dl.list">download list</ulink> to <command>wget</command>:</para>
- 
- <screen><userinput>wget -i dl.list -P ${CLFS}/sources</userinput></screen>
-@@ -54,16 +55,16 @@
-   <para>Verification of downloaded packages can be done by downloading the
- following MD5 or SHA1 checksum lists:</para>
- 
--  <para><ulink url="/files/packages/git/MD5SUMS">MD5SUMS</ulink>:</para>
-+  <para><ulink url="&packages-root;MD5SUMS">MD5SUMS</ulink>:</para>
- 
- <screen><userinput>pushd ${CLFS}/sources
- md5sum -c MD5SUMS
- popd</userinput></screen>
- 
--  <para><ulink url="/files/packages/git/SHA1SUMS">SHA1SUMS</ulink>:</para>
-+  <para><ulink url="&packages-root;SHA1SUMS">SHA1SUMS</ulink>:</para>
- 
- <screen><userinput>pushd ${CLFS}/sources
--sha1sum -c SHA1SUMS 
-+sha1sum -c SHA1SUMS
- popd</userinput></screen>
- 
- </sect1>
-
-diff -ru /home/jp/a/BOOK/network/common/choose.xml BOOK/network/common/choose.xml
---- /home/jp/a/BOOK/network/common/choose.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/common/choose.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -8,7 +8,7 @@
- <sect1 id="ch-network-choose">
-   <?dbhtml filename="choose.html"?>
- 
--  <title>DHCP or Static Networking?</title>
-+  <title>Systemd Networking?</title>
- 
-   <indexterm zone="ch-network-choose">
-     <primary sortas="d-network">network</primary>
-@@ -19,12 +19,11 @@
-   <xref linkend="chapter-bootable"/>.</para>
- 
-   <para> There are two different ways you can proceed from this point
--  to configure your network. Dynamic will allow you to take advantage of
--  a DHCP server to get all your configuration information. Static you become
--  responsible for setting up your options.</para>
-+  to configure your network. You can use systemd, or install the
-+  CLFS-Network-Scripts.</para>
- 
--  <para>To configure a Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
-+  <para>To use systemd to configure a Network Interface, Follow <xref linkend="ch-systemd-network"/>.</para>
- 
--  <para>To configure a DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
-+  <para>To use CLFS-network-scripts to configure a Network Interface, Follow <xref linkend="ch-network-network-scripts"/>.</para>
- 
- </sect1>
-diff -ru /home/jp/a/BOOK/network/common/dhcpcd.xml BOOK/network/common/dhcpcd.xml
---- /home/jp/a/BOOK/network/common/dhcpcd.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/common/dhcpcd.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -30,18 +30,70 @@
- 
-     <para os="b">Prepare DHCPCD for compilation:</para>
- 
--<screen os="c"><userinput>./configure --prefix=/usr --sbindir=/sbin \
-+<screen os="c" role="nodump"><userinput>./configure --prefix=/usr --sbindir=/sbin \
-     --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib/dhcpcd</userinput></screen>
- 
-     <para os="d">Compile the package:</para>
- 
--<screen os="e"><userinput>make</userinput></screen>
-+<screen os="e" role="nodump"><userinput>make</userinput></screen>
- 
-     <para os="f">This package does not come with a test suite.</para>
- 
-     <para os="g">Install the package:</para>
- 
--<screen os="h"><userinput>make install</userinput></screen>
-+<screen os="h" role="nodump"><userinput>make install</userinput></screen>
-+
-+  </sect2>
-+
-+  <sect2 id="conf-dhcpcd" role="configuration">
-+    <title>Creating the DHCP Network Interface Configuration File</title>
-+
-+    <para>The following is an example for the eth0 interface. Refer to the
-+    dhcpcd.conf man page for more information. This step may be skipped if
-+    default behavior of dhcpcd is required.</para>
-+
-+    <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
-+    using the following commands. Adjust appropriately for additional options:</para>
-+
-+<screen role="nodump"><userinput>cd /etc &&
-+cat > dhcpcd.conf << "EOF"
-+<literal># dhcpcd configuration eth0 interface
-+# See dhcpcd.conf(5) for details.
-+
-+interface eth0
-+# dhcpcd-run-hooks uses these options.
-+option subnet_mask, routers, domain_name_servers
-+
-+# The default timeout for waiting for a DHCP response is 30 seconds
-+# which may be too long or too short and can be changed here.
-+timeout 16</literal>
-+EOF</userinput></screen>
-+
-+    <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
-+
-+  </sect2>
-+
-+  <sect2>
-+    <title>Configuring the Network Interface at boot</title>
-+
-+    <para>Enabling of the Network Interface configuration is
-+    done per interface. To enable Network Interface
-+    configuration at boot, run:</para>
-+
-+<screen role="nodump"><userinput>systemctl enable dhcpcd at eth0</userinput></screen>
-+
-+    <para>To disable previously enabled Network Interface
-+    configuration at boot, run:</para>
-+
-+<screen role="nodump"><userinput>systemctl disable dhcpcd at eth0</userinput></screen>
-+
-+    <para>To manually start the Network Interface configuration,
-+    run:</para>
-+
-+<screen role="nodump"><userinput>systemctl start dhcpcd at eth0</userinput></screen>
-+
-+    <para>Replace eth0 with the correct Network Interface
-+    name as described on the beginning of this page.</para>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/network/common/hostname.xml BOOK/network/common/hostname.xml
---- /home/jp/a/BOOK/network/common/hostname.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/common/hostname.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -8,20 +8,19 @@
- <sect1 id="ch-network-hostname">
-   <?dbhtml filename="hostname.html"?>
- 
--  <title>Configuring the localnet Script</title>
-+  <title>Configuring the system hostname</title>
- 
-   <indexterm zone="ch-network-hostname">
--    <primary sortas="d-localnet">localnet</primary>
-+    <primary sortas="d-hostname">hostname</primary>
-   <secondary>configuring</secondary></indexterm>
- 
--  <para>Part of the job of the <command>localnet</command> script is
--  setting the system's hostname. This needs to be configured in the
--  <filename>/etc/sysconfig/network</filename> file.</para>
-+  <para>Systemd reads <filename>/etc/hostname</filename> to determine which
-+  hostname should be set.</para>
- 
--  <para>Create the <filename>/etc/sysconfig/network</filename> file
--  and enter a hostname by running:</para>
-+  <para>Create the <filename>/etc/hostname</filename> file and enter a hostname
-+  by running:</para>
- 
--  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" > /etc/sysconfig/network</userinput></screen>
-+  <screen role="nodump"><userinput>echo "<replaceable>[clfs]</replaceable>" > /etc/hostname</userinput></screen>
- 
-   <para><replaceable>[clfs]</replaceable> needs to be replaced with the
-   name given to the computer. Do not enter the Fully Qualified
-diff -ru /home/jp/a/BOOK/network/common/hosts.xml BOOK/network/common/hosts.xml
---- /home/jp/a/BOOK/network/common/hosts.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/common/hosts.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -23,7 +23,7 @@
-   <secondary>/etc/hosts</secondary></indexterm>
- 
-   <para>If a network card is to be configured, decide on the IP address,
--  FQDN, and possible aliases for use in the
-+  fully-qualified domain name (FQDN), and possible aliases for use in the
-   <filename>/etc/hosts</filename> file. The syntax is:</para>
- 
-   <screen><IP address> myhost.example.org aliases</screen>
-@@ -34,26 +34,29 @@
-   address is in the private network IP address range. Valid ranges
-   are:</para>
- 
--<screen><literal>  Class Networks
--  A     10.0.0.0
--  B     172.16.0.0 through 172.31.0.255
--  C     192.168.0.0 through 192.168.255.255</literal></screen>
-+<screen><literal>Private Network Address Range       Normal Prefix
-+10.0.0.1 - 10.255.255.254           8
-+172.x.0.1 - 172.x.255.254           16
-+192.168.y.1 - 192.168.y.254         24</literal></screen>
-+
-+  <para>x can be any number in the range 16-31. y can be any number in the
-+  range 0-255.</para>
- 
-   <para>A valid IP address could be 192.168.1.1. A valid FQDN for this
--  IP could be <uri>www.linuxfromscratch.org</uri> (not recommended
-+  IP could be <uri>www.cross-lfs.org</uri> (not recommended
-   because this is a valid registered domain address and could cause
-   domain name server issues).</para>
- 
--  <para>Even if not using a network card, an FQDN is still required.
-+  <para>Even if not using a network card, a valid FQDN is still required.
-   This is necessary for certain programs to operate correctly.</para>
- 
--  <para>Create the  <filename>/etc/hosts</filename> file by running:</para>
-+  <para>Create the <filename>/etc/hosts</filename> file by running:</para>
- 
--<screen><userinput>cat > /etc/hosts << "EOF"
-+<screen role="nodump"><userinput>cat > /etc/hosts << "EOF"
- <literal># Begin /etc/hosts (network card version)
- 
- 127.0.0.1 localhost
--<replaceable>[192.168.1.1]</replaceable> <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable>
-+<replaceable>[192.168.1.1]</replaceable> <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> <replaceable>[alias ...]</replaceable>
- 
- # End /etc/hosts (network card version)</literal>
- EOF</userinput></screen>
-@@ -62,13 +65,13 @@
-   <replaceable>[<HOSTNAME>.example.org]</replaceable>
-   values need to be changed for specific users or requirements (if
-   assigned an IP address by a network/system administrator and the
--  machine will be connected to an existing network).</para>
--
-+  machine will be connected to an existing network). The optional
-+  alias name(s) can be omitted.</para>
- 
-   <para>If a network card is not going to be configured, create the
-   <filename>/etc/hosts</filename> file by running:</para>
- 
--<screen><userinput>cat > /etc/hosts << "EOF"
-+<screen role="nodump"><userinput>cat > /etc/hosts << "EOF"
- <literal># Begin /etc/hosts (no network card version)
- 
- 127.0.0.1 <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost
-diff -ru /home/jp/a/BOOK/network/common/resolv.xml BOOK/network/common/resolv.xml
---- /home/jp/a/BOOK/network/common/resolv.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/common/resolv.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -10,10 +10,7 @@
- 
-   <title>Creating the /etc/resolv.conf File</title>
- 
--  <sect2 id="resolv.conf">
--    <title>Creating the /etc/resolv.conf File</title>
--
--    <indexterm zone="resolv.conf">
-+    <indexterm zone="ch-network-resolv">
-       <primary sortas="e-/etc/resolv.conf">/etc/resolv.conf</primary>
-     </indexterm>
- 
-@@ -29,7 +26,7 @@
-     network interfaces or manually set your DNS using DHCP then create the
-     file by running the following:</para>
- 
--<screen><userinput>cat > /etc/resolv.conf << "EOF"
-+<screen role="nodump"><userinput>cat > /etc/resolv.conf << "EOF"
- <literal># Begin /etc/resolv.conf
- 
- domain <replaceable>[Your Domain Name]</replaceable>
-@@ -39,6 +36,10 @@
- # End /etc/resolv.conf</literal>
- EOF</userinput></screen>
- 
-+    <para>The <replaceable>domain</replaceable> statement can be omitted or
-+    replaced with a <replaceable>search</replaceable> statement. See the man
-+    page for resolv.conf for more details.</para>
-+
-     <para>Replace <replaceable>[IP address of the nameserver]</replaceable>
-     with the IP address of the DNS most appropriate for the setup. There will
-     often be more than one entry (requirements demand secondary servers for
-@@ -46,6 +47,4 @@
-     second <emphasis>nameserver</emphasis> line from the file. The IP address
-     may also be a router on the local network.</para>
- 
--  </sect2>
--
- </sect1>
-diff -ru /home/jp/a/BOOK/network/multilib/dhcpcd.xml BOOK/network/multilib/dhcpcd.xml
---- /home/jp/a/BOOK/network/multilib/dhcpcd.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/multilib/dhcpcd.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -29,7 +29,7 @@
-     href="../common/dhcpcd.xml"
-     xpointer="xpointer(//*[@os='b'])"/>
- 
--<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
-+<screen os="c" role="nodump"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
-     --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib64/dhcpcd \
-     --libdir=/usr/lib64</userinput></screen>
- 
-@@ -57,6 +57,10 @@
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../common/dhcpcd.xml"
-+  xpointer="xpointer(id('conf-dhcpcd'))"/>
-+
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+  href="../common/dhcpcd.xml"
-   xpointer="xpointer(id('contents-dhcpcd'))"/>
- 
- </sect1>
-diff -ru /home/jp/a/BOOK/network/x86_64-64-chapter.xml BOOK/network/x86_64-64-chapter.xml
---- /home/jp/a/BOOK/network/x86_64-64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/x86_64-64-chapter.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -15,8 +15,9 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/network/x86_64-chapter.xml BOOK/network/x86_64-chapter.xml
---- /home/jp/a/BOOK/network/x86_64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/x86_64-chapter.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -15,8 +15,9 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/cross-tools/multilib/binutils.xml BOOK/cross-tools/multilib/binutils.xml
---- /home/jp/a/BOOK/cross-tools/multilib/binutils.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/multilib/binutils.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -48,9 +48,9 @@
-     xpointer="xpointer(//*[@os='i'])"/>
- 
- <screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \
--  --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
--  --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
--  --disable-nls --disable-static --enable-64-bit-bfd</userinput></screen>
-+    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-+    --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
-+    --disable-nls --disable-static --enable-64-bit-bfd --disable-werror</userinput></screen>
- 
-     <variablelist os="bd">
-       <title>The meaning of the configure options:</title>
-@@ -80,8 +80,12 @@
-       xpointer="xpointer(//*[@os='bd6'])"/>
- 
-       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--      href="../common/binutils.xml"
--      xpointer="xpointer(//*[@os='bd7'])"/>
-+      href="../64/binutils.xml"
-+      xpointer="xpointer(//*[@os='bd8'])"/>
-+
-+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+      href="../64/binutils.xml"
-+      xpointer="xpointer(//*[@os='bd9'])"/>
- 
-     </variablelist>
- 
-@@ -95,24 +99,12 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/binutils.xml"
--    xpointer="xpointer(//*[@os='bg'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/binutils.xml"
-     xpointer="xpointer(//*[@os='bh'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/binutils.xml"
-     xpointer="xpointer(//*[@os='bi'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/binutils.xml"
--    xpointer="xpointer(//*[@os='bj'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/binutils.xml"
--    xpointer="xpointer(//*[@os='bk'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/network/x86-chapter.xml BOOK/network/x86-chapter.xml
---- /home/jp/a/BOOK/network/x86-chapter.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/network/x86-chapter.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -15,8 +15,9 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/partitioning/common/creatingfilesystem.xml BOOK/partitioning/common/creatingfilesystem.xml
---- /home/jp/a/BOOK/partitioning/common/creatingfilesystem.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/partitioning/common/creatingfilesystem.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -19,12 +19,13 @@
-   <ulink url="&cblfs-root;index.php?section=6#File_System"/>.</para>
- 
-   <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
--  system on the CLFS partition, run the following:</para>
-+  system on the CLFS partition, run the following as
-+  <systemitem class="username">root</systemitem>:</para>
- 
- <screen os="c"><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
- 
-   <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the CLFS
--  partition (<filename class="devicefile">hda5</filename> in our previous
-+  partition (<filename class="devicefile">sda5</filename> in our previous
-   example).</para>
- 
-   <note os="e">
-@@ -40,9 +41,10 @@
- 
-     <para>If the output contains features other than: dir_index; filetype;
-     large_file; resize_inode or sparse_super then your host system may have custom
--    enhancements.  In that case, to avoid later problems, you should compile the
-+    enhancements. In that case, to avoid later problems, you should compile the
-     stock E2fsprogs package and use the resulting binaries to re-create the
--    filesystem on your CLFS partition:</para>
-+    filesystem on your CLFS partition. To do this, run the following commands
-+    as <systemitem class="username">root</systemitem>:</para>
- 
- <screen os="g"><userinput>cd /tmp
- tar xjf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.bz2
-@@ -57,13 +59,14 @@
- 
-   </note>
- 
--  <para os="h">If a swap partition was created, it will need to be initialized
--  for use by issuing the command below. If you are using an existing swap
--  partition, there is no need to format it.</para>
-+  <para os="h">If you created a swap partition, you will need to initialize it
-+  for use by issuing the command below as
-+  <systemitem class="username">root</systemitem>:</para>
- 
- <screen os="i"><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
- 
-   <para os="j">Replace <replaceable>[yyy]</replaceable> with the name of the
--  swap partition.</para>
-+  swap partition. If you are using an existing swap partition, there is no
-+  need to format it.</para>
- 
- </sect1>
-diff -ru /home/jp/a/BOOK/partitioning/common/creatingpartition.xml BOOK/partitioning/common/creatingpartition.xml
---- /home/jp/a/BOOK/partitioning/common/creatingpartition.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/partitioning/common/creatingpartition.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -13,9 +13,12 @@
-   <para os="a">Like most other operating systems, CLFS is usually installed
-   on a dedicated partition. The recommended approach to building a CLFS
-   system is to use an available empty partition or, if you have enough
--  unpartitioned space, to create one. However, if you're building for a different
--  architecture you can simply build everything in <quote>/mnt/clfs</quote>
--  and transfer it to your target machine.</para>
-+  unpartitioned space, to create one. However, if you're building for a
-+  different architecture you can simply build everything in
-+  <quote>/mnt/clfs</quote> (or whatever directory you want to use) and
-+  transfer it to your target machine. If you do not plan to use a separate
-+  partition for building CLFS, you can skip the rest of this chapter and
-+  continue on to <xref linkend="chapter-getting-materials"/>.</para>
- 
-   <para os="b">A minimal system requires around 6 gigabytes (GB).
-   This is enough to store all the source tarballs and compile the packages. The CLFS
-@@ -29,22 +32,28 @@
-   available for compilation processes, it is a good idea to use a small disk
-   partition as swap space. This is used by the kernel to store seldom-used
-   data and leave more memory available for active processes. The swap
--  partition for an CLFS system can be the same as the one used by the host
-+  partition for a CLFS system can be the same as the one used by the host
-   system, in which case it is not necessary to create another one.</para>
- 
--  <para os="d">Start a disk partitioning program such as <command>cfdisk</command>
-+  <para os="d">As the <systemitem class="username">root</systemitem> user,
-+  start a disk partitioning program such as <command>cfdisk</command>
-   or <command>fdisk</command> with a command line option naming the hard
-   disk on which the new partition will be created—for example
--  <filename class="devicefile">/dev/hda</filename> for the primary
--  Integrated Drive Electronics (IDE) disk. Create a Linux native partition
--  and a swap partition, if needed. Please refer to
-+  <filename class="devicefile">/dev/sda</filename> for the primary
-+  Integrated Drive Electronics (IDE) or Serial ATA (SATA) disk. Create a Linux
-+  native partition and a swap partition, if needed. Please refer to
-   <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if you
-   do not yet know how to use the programs.</para>
- 
-   <para os="e">Remember the designation of the new partition (e.g.,
--  <filename class="devicefile">hda5</filename>). This book will refer to
--  this as the CLFS partition. Also remember the designation of the swap
-+  <filename class="devicefile">sda5</filename>). This book will refer to
-+  this as the CLFS partition. Also, remember the designation of the swap
-   partition. These names will be needed later for the
-   <filename>/etc/fstab</filename> file.</para>
- 
-+  <note><para>SYSTEMD does not support a configuration with a separate
-+  <filename class="directory">/usr</filename> filesystem. An initramfs which
-+  mounts a separate <filename class="directory">/usr</filename> is required.
-+  </para></note>
-+
- </sect1>
-diff -ru /home/jp/a/BOOK/partitioning/common/mounting.xml BOOK/partitioning/common/mounting.xml
---- /home/jp/a/BOOK/partitioning/common/mounting.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/partitioning/common/mounting.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -12,18 +12,16 @@
- 
-   <para>Now that a file system has been created, the partition needs to
-   be made accessible. In order to do this, the partition needs to be
--  mounted at a chosen mount point. For the purposes of this book, it is
--  assumed that the file system is mounted under <filename
--  class="directory">/mnt/clfs</filename>, but the directory choice is up
--  to you.</para>
-+  mounted at a chosen mount point.</para>
- 
--  <para>Choose a mount point and assign it to the <envar>CLFS</envar>
--  environment variable by running:</para>
-+  <para>As the <systemitem class="username">root</systemitem> user, ensure the
-+  <envar>CLFS</envar> variable is set, if you haven't already:</para>
- 
--<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
-+<screen><userinput>export CLFS=<replaceable>[/mnt/clfs]</replaceable></userinput></screen>
- 
-   <para>Next, create the mount point and mount the CLFS file system by
--  running:</para>
-+  running the following commands as
-+  <systemitem class="username">root</systemitem>:</para>
- 
- <screen><userinput>mkdir -pv ${CLFS}
- mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}</userinput></screen>
-@@ -33,7 +31,8 @@
- 
-   <para>If using multiple partitions for CLFS (e.g., one for <filename
-   class="directory">/</filename> and another for <filename
--  class="directory">/usr</filename>), mount them using:</para>
-+  class="directory">/usr</filename>), mount them as
-+  <systemitem class="username">root</systemitem> using:</para>
- 
- <screen><userinput>mkdir -pv ${CLFS}
- mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}
-@@ -45,8 +44,9 @@
-   names.</para>
- 
-   <para>Ensure that this new partition is not mounted with permissions
--  that are too restrictive (such as the nosuid, nodev, or noatime options).
--  Run the <command>mount</command> command without any parameters to see
-+  that are too restrictive (such as the <option>nosuid</option>,
-+  <option>nodev</option>, or <option>noatime</option> options).
-+  Run <command>mount | grep ${CLFS}</command> to see
-   what options are set for the mounted CLFS partition. If
-   <option>nosuid</option>, <option>nodev</option>, and/or
-   <option>noatime</option> are set, the partition will need to be
-diff -ru /home/jp/a/BOOK/cross-tools/multilib/gcc-final.xml BOOK/cross-tools/multilib/gcc-final.xml
---- /home/jp/a/BOOK/cross-tools/multilib/gcc-final.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/multilib/gcc-final.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -59,17 +59,15 @@
-     xpointer="xpointer(//*[@os='h'])"/>
- 
- <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
--  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
--  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
--  --with-sysroot=${CLFS} --with-local-prefix=/tools \
--  --with-native-system-header-dir=/tools/include \
--  --disable-nls --enable-shared --disable-static \
--  --enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 \
--  --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \
--  --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
--  --enable-cloog-backend=isl --with-isl=/cross-tools \
--  --disable-isl-version-check --with-system-zlib --enable-checking=release \
--  --enable-libstdcxx-time</userinput></screen>
-+    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-+    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-+    --with-sysroot=${CLFS} --with-local-prefix=/tools \
-+    --with-native-system-header-dir=/tools/include \
-+    --disable-nls --disable-static --enable-languages=c,c++ \
-+    --enable-__cxa_atexit --enable-threads=posix --with-mpc=/cross-tools \
-+    --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
-+    --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
-+    --enable-libstdcxx-time</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc-final.xml"
-diff -ru /home/jp/a/BOOK/partitioning/x86-chapter.xml BOOK/partitioning/x86-chapter.xml
---- /home/jp/a/BOOK/partitioning/x86-chapter.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/partitioning/x86-chapter.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -12,6 +12,7 @@
-   <title>Preparing a New Partition</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingpartition.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-diff -ru /home/jp/a/BOOK/prologue/common/foreword.xml BOOK/prologue/common/foreword.xml
---- /home/jp/a/BOOK/prologue/common/foreword.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/prologue/common/foreword.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -37,7 +37,7 @@
-   of having built the system yourself.  Additionally, during a CLFS
-   build, you will learn advanced techniques such as cross-build toolchains,
-   multilib support (32 & 64-bit libraries side-by-side), alternative
--  architectures such as Sparc, MIPS, and Alpha, and much more.</para>
-+  architectures such as Sparc, MIPS, and much more.</para>
- 
-   <para>We hope you enjoy building your own CLFS system, and the benefits
-   that come from a system tailored to your needs.</para>
-diff -ru /home/jp/a/BOOK/prologue/common/hostreqs.xml BOOK/prologue/common/hostreqs.xml
---- /home/jp/a/BOOK/prologue/common/hostreqs.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/prologue/common/hostreqs.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -55,14 +55,14 @@
-     </listitem>
- 
-     <listitem>
--      <para><emphasis role="strong">GCC-4.1.2</emphasis> and the C++ compiler, 
-+      <para><emphasis role="strong">GCC-4.1.2</emphasis> and the C++ compiler,
-       <command>g++</command> (Versions greater than &gcc-version; are not
-       recommended as they have not been tested)</para>
-     </listitem>
- 
-     <listitem>
-       <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Versions
--      greater than &eglibc-version; are not recommended as they have
-+      greater than &glibc-version; are not recommended as they have
-       not been tested)</para>
-     </listitem>
- 
-@@ -74,10 +74,6 @@
-       <para><emphasis role="strong">Gzip-1.2.4</emphasis></para>
-     </listitem>
- 
--   <listitem>
--     <para><emphasis role="strong">Linux 2.6.32 (Built with GCC 4.1.2 or later)</emphasis></para>
--   </listitem>
--
-     <listitem>
-       <para><emphasis role="strong">Make-3.80</emphasis></para>
-     </listitem>
-@@ -103,7 +99,7 @@
-     </listitem>
- 
-     <listitem>
--      <para><emphasis role="strong">XZ-Utils-4.999.8beta</emphasis></para>
-+      <para><emphasis role="strong">XZ Utils-4.999.8beta</emphasis></para>
-     </listitem>
- 
-   </itemizedlist>
-@@ -130,7 +126,6 @@
- ldd $(which ${SHELL}) | grep libc.so | cut -d ' ' -f 3 | ${SHELL} | head -n 1 | cut -d ' ' -f 1-7
- grep --version | head -n1
- gzip --version | head -n1
--uname -s -r
- make --version | head -n1
- tic -V
- patch --version | head -n1
-@@ -138,7 +133,7 @@
- tar --version | head -n1
- makeinfo --version | head -n1
- xz --version | head -n1
--echo 'main(){}' | gcc -v -o /dev/null -x c - > dummy.log 2>&1
-+echo 'main(){}' | gcc -v -o /dev/null -x c - > dummy.log 2>&1
- if ! grep -q ' error' dummy.log; then
-   echo "Compilation successful" && rm dummy.log
- else
-diff -ru /home/jp/a/BOOK/cross-tools/multilib/gcc-static.xml BOOK/cross-tools/multilib/gcc-static.xml
---- /home/jp/a/BOOK/cross-tools/multilib/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/multilib/gcc-static.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -24,6 +24,10 @@
-     and no Threads</title>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc-static.xml"
-+    xpointer="xpointer(//*[@os='e'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/gcc.xml"
-     xpointer="xpointer(//*[@os='p1'])"/>
- 
-@@ -68,18 +72,17 @@
-     xpointer="xpointer(//*[@os='h'])"/>
- 
- <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
--  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
--  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
--  --with-sysroot=${CLFS} --with-local-prefix=/tools \
--  --with-native-system-header-dir=/tools/include --disable-nls \
--  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
--  --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
--  --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
--  --disable-libssp --disable-threads --disable-libatomic --disable-libitm \
--  --disable-libsanitizer --disable-libquadmath --disable-target-libiberty \
--  --disable-target-zlib --with-system-zlib --enable-cloog-backend=isl \
--  --with-isl=/cross-tools --disable-isl-version-check --enable-languages=c \
--  --enable-checking=release</userinput></screen>
-+    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-+    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-+    --with-sysroot=${CLFS} --with-local-prefix=/tools \
-+    --with-native-system-header-dir=/tools/include --disable-nls \
-+    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-+    --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
-+    --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
-+    --disable-libssp --disable-libatomic --disable-libitm \
-+    --disable-libsanitizer --disable-libquadmath --disable-threads \
-+    --disable-target-zlib --with-system-zlib --with-isl=/cross-tools \
-+    --enable-languages=c --enable-checking=release</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc-static.xml"
-diff -ru /home/jp/a/BOOK/prologue/common/organization.xml BOOK/prologue/common/organization.xml
---- /home/jp/a/BOOK/prologue/common/organization.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/prologue/common/organization.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -42,7 +42,7 @@
- 
-     <para>Part IV explains how to build a tool chain designed
-           to operate on your target system. These are the tools
--          that will allow you to build a working system on your 
-+          that will allow you to build a working system on your
-           target computer.</para>
- 
-   </sect2>
-diff -ru /home/jp/a/BOOK/prologue/common/prerequisites.xml BOOK/prologue/common/prerequisites.xml
---- /home/jp/a/BOOK/prologue/common/prerequisites.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/prologue/common/prerequisites.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -17,15 +17,15 @@
-   the command line (shell) to copy or move files and directories, list
-   directory and file contents, and change the current directory. It is also
-   expected that the reader has a reasonable knowledge of using and installing
--  Linux software. A basic knowledge of the architectures being used in 
-+  Linux software. A basic knowledge of the architectures being used in
-   the Cross LFS process and the host operating systems in use is also
-   required.</para>
- 
-   <para>Because the CLFS book assumes <emphasis>at least</emphasis> this basic
-   level of skill, the various CLFS support forums are unlikely to be able to
--  provide you with much assistance. Your questions regarding such basic knowledge
--  will likely go unanswered, or you will be referred to the CLFS essential
--  pre-reading list.</para>
-+  provide you with much assistance in these areas. Your questions regarding
-+  such basic knowledge will likely go unanswered, or you will be referred to
-+  the CLFS essential pre-reading list.</para>
- 
-   <para>Before building a CLFS system, we recommend reading the following
-   HOWTOs:</para>
-@@ -40,7 +40,7 @@
-     </listitem>
-     <listitem>
-       <para remap="verbatim">The Linux Users' Guide
--      <ulink url="http://www.linuxhq.com/guides/LUG/guide.html"/></para>
-+      <ulink url="http://www.tldp.org/pub/Linux/docs/ldp-archived/users-guide/"/></para>
- 
-       <para>This guide covers the usage of assorted Linux software.</para>
-     </listitem>
-diff -ru /home/jp/a/BOOK/README BOOK/README
---- /home/jp/a/BOOK/README	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/README	2014-10-03 20:44:43.888339260 +0200
-@@ -13,12 +13,12 @@
- 
- XML to XHTML:
- -------------
--make RENDERDIR=/path/to/output/location
-+make BASEDIR=/path/to/output/location
- 
- 
- XML to single file XHTML (nochunks):
- ------------------------------------
--make RENDERDIR=/path/to/output/location nochunks
-+make BASEDIR=/path/to/output/location nochunks
- 
- 
- XML to TXT
-@@ -29,4 +29,4 @@
- 
- XML to PDF:
- -----------
--make RENDERDIR=/path/to/output/location pdf
-+make BASEDIR=/path/to/output/location pdf
-diff -ru /home/jp/a/BOOK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl BOOK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
---- /home/jp/a/BOOK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	2014-05-11 16:24:52.626516679 +0200
-+++ BOOK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	2014-10-03 20:44:43.932339262 +0200
-@@ -156,7 +156,7 @@
-             </xsl:when>
- 
-               <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
--            <xsl:when test="$prev[@id='ch-chroot-devices'] or $prev[@id='ch-boot-whatnext']">
-+            <xsl:when test="$prev[@id='ch-chroot-pwdgroup'] or $prev[@id='ch-boot-whatnext']">
-               <a accesskey="p">
-                 <xsl:attribute name="href">
-                   <xsl:call-template name="href.target">
-diff -ru /home/jp/a/BOOK/stylesheets/top-index.xsl BOOK/stylesheets/top-index.xsl
---- /home/jp/a/BOOK/stylesheets/top-index.xsl	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/stylesheets/top-index.xsl	2014-10-03 20:44:43.932339262 +0200
-@@ -96,121 +96,112 @@
-       </div>
-       <div class="toc">
-         <h3>
--          <xsl:text>32 Bit Builds</xsl:text>
-+          <xsl:text>Select your target architecture:</xsl:text>
-+        </h3>
-+        <h3>
-+          <xsl:text>Intel/AMD x86</xsl:text>
-         </h3>
-         <ul>
--	  <h3>
--	    <xsl:text>Working. Testers and comments welcomed.</xsl:text>
--          </h3>
-           <li>
-             <h4>
-               <a href="x86">
--                <xsl:text>Intel/AMD x86</xsl:text>
-+                <xsl:text>32 Bits</xsl:text>
-               </a>
-             </h4>
-           </li>
-           <li>
-             <h4>
--              <a href="ppc">
--                <xsl:text>PowerPC</xsl:text>
--              </a>
--            </h4>
--          </li>
--          <li>
--            <h4>
--              <a href="mips">
--                <xsl:text>MIPS</xsl:text>
-+              <a href="x86_64-64">
-+                <xsl:text>64 Bits</xsl:text>
-               </a>
-             </h4>
-           </li>
-           <li>
-             <h4>
--              <a href="sparc">
--                <xsl:text>Sparc v8</xsl:text>
-+              <a href="x86_64">
-+                <xsl:text>Multilib</xsl:text>
-               </a>
-             </h4>
-           </li>
- 	</ul>
-         <h3>
--          <xsl:text>64 Bit Builds</xsl:text>
-+          <xsl:text>MIPS</xsl:text>
-         </h3>
- 	<ul>
--          <h3>
--            <xsl:text>Working. Testers and comments welcomed.</xsl:text>
--          </h3>
-           <li>
-             <h4>
--              <a href="x86_64-64">
--                <xsl:text>x86_64</xsl:text>
-+              <a href="mips">
-+                <xsl:text>32 Bits</xsl:text>
-               </a>
-             </h4>
-           </li>
-           <li>
-             <h4>
--              <a href="ppc64-64">
--                <xsl:text>PowerPC64</xsl:text>
-+              <a href="mips64-64">
-+                <xsl:text>64 Bits</xsl:text>
-               </a>
-             </h4>
-           </li>
--
-           <li>
-             <h4>
--              <a href="mips64-64">
--                <xsl:text>MIPS</xsl:text>
-+              <a href="mips64">
-+                <xsl:text>Multilib</xsl:text>
-               </a>
-             </h4>
-           </li>
-+	</ul>
-+        <h3>
-+          <xsl:text>PowerPC</xsl:text>
-+        </h3>
-+	<ul>
-           <li>
-             <h4>
--             <a href="sparc64-64">
--                <xsl:text>Sparc v9/Ultrasparc</xsl:text>
--             </a>
-+              <a href="ppc">
-+                <xsl:text>32 Bits</xsl:text>
-+              </a>
-             </h4>
-           </li>
-           <li>
-             <h4>
--             <a href="alpha">
--                <xsl:text>Alpha</xsl:text>
--             </a>
-+              <a href="ppc64-64">
-+                <xsl:text>64 Bits</xsl:text>
-+              </a>
-             </h4>
-           </li>
--	</ul>
--        <h3>
--          <xsl:text>Multilib Builds</xsl:text>
--        </h3>
--	<ul>
--          <h3>
--             <xsl:text>Working. Testers and comments welcomed.</xsl:text>
--          </h3>
-           <li>
-             <h4>
--              <a href="x86_64">
--                <xsl:text>x86_64</xsl:text>
-+              <a href="ppc64">
-+                <xsl:text>Multilib</xsl:text>
-               </a>
-             </h4>
-           </li>
-+        </ul>
-+        <h3>
-+          <xsl:text>Sparc</xsl:text>
-+        </h3>
-+	<ul>
-           <li>
-             <h4>
--              <a href="mips64">
--                <xsl:text>MIPS</xsl:text>
-+              <a href="sparc">
-+                <xsl:text>32 Bits</xsl:text>
-               </a>
-             </h4>
-           </li>
-           <li>
-             <h4>
--             <a href="sparc64">
--                <xsl:text>Sparc v9/Ultrasparc</xsl:text>
--             </a>
-+              <a href="sparc64-64">
-+                <xsl:text>64 Bits</xsl:text>
-+              </a>
-             </h4>
-           </li>
-           <li>
-             <h4>
--              <a href="ppc64">
--                <xsl:text>PowerPC64</xsl:text>
-+              <a href="sparc64">
-+                <xsl:text>Multilib</xsl:text>
-               </a>
-             </h4>
-           </li>
--        </ul>
-+	</ul>
-       </div>
-     </div>
-   </xsl:template>
-diff -ru /home/jp/a/BOOK/stylesheets/wget.xsl BOOK/stylesheets/wget.xsl
---- /home/jp/a/BOOK/stylesheets/wget.xsl	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/stylesheets/wget.xsl	2014-10-03 20:44:43.932339262 +0200
-@@ -23,15 +23,15 @@
-   </xsl:template>
- 
-   <xsl:template match="ulink">
--      <!-- Packages. If some package don't have the string ".tar." in their
--      name, the next test must be fixed to match it also. -->
-+      <!-- Packages. If some package doesn't have the string ".tar." or
-+      ".tgz" in its name, the next test must be fixed to match it also. -->
-     <xsl:if test="contains(@url, '.tar.') or contains(@url, '.tgz')">
-       <xsl:value-of select="@url"/>
-       <xsl:text>&#x0a;</xsl:text>
-     </xsl:if>
-       <!-- Patches. Match only the patches and skip possible duplicated
--      URLs due that may be splitted for PDF output-->
--    <xsl:if test="contains(@url, '.patch') and contains(@url, '&patches-root;')
-+      URLs that may be split for PDF output-->
-+    <xsl:if test="contains(@url, '&patches-root;') and @url != '&patches-root;'
-             and not(ancestor-or-self::*/@condition = 'pdf')">
-       <xsl:value-of select="@url"/>
-       <xsl:text>&#x0a;</xsl:text>
-diff -ru /home/jp/a/BOOK/temp-system/64/binutils.xml BOOK/temp-system/64/binutils.xml
---- /home/jp/a/BOOK/temp-system/64/binutils.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/temp-system/64/binutils.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -43,14 +43,14 @@
-     href="../common/binutils.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
-+<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
-     --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-     --target=${CLFS_TARGET} --with-lib-path=/tools/lib --disable-nls \
-     --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../multilib/binutils.xml"
--    xpointer="xpointer(//*[@os='ea'])"/>
-+    href="../common/binutils.xml"
-+    xpointer="xpointer(//*[@os='k'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/binutils.xml"
-diff -ru /home/jp/a/BOOK/temp-system/64/gcc.xml BOOK/temp-system/64/gcc.xml
---- /home/jp/a/BOOK/temp-system/64/gcc.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/temp-system/64/gcc.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -51,7 +51,7 @@
-     xpointer="xpointer(//*[@os='fix1'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../../final-system/common/gcc.xml"
-+    href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='fix2'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -70,30 +70,16 @@
-     href="../../final-system/common/gcc.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
--    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-+<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
--    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
--    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
--    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
--    --enable-cloog-backend=isl --with-gmp=/tools --with-mpfr=/tools \
--    --with-mpc=/tools --with-isl=/tools --disable-isl-version-check \
--    --with-cloog=/tools --with-system-zlib \
--    --with-native-system-header-dir=/tools/include --enable-checking=release \
--    --enable-libstdcxx-time</userinput></screen>
--
--    <variablelist>
--      <title>The meaning of the new configure options:</title>
--
--      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--      href="../multilib/gcc.xml"
--      xpointer="xpointer(//*[@os='dd1'])"/>
--
--      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--      href="../common/gcc.xml"
--      xpointer="xpointer(//*[@os='cl1'])"/>
-+    --with-local-prefix=/tools --disable-multilib --disable-nls \
-+    --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \
-+    --with-native-system-header-dir=/tools/include --disable-libssp \
-+    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
- 
--    </variablelist>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='cl'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc.xml"
-@@ -119,6 +105,14 @@
-     href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='cp'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='u'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='cr'])"/>
-+
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/temp-system/common/bash.xml BOOK/temp-system/common/bash.xml
---- /home/jp/a/BOOK/temp-system/common/bash.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/common/bash.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -34,7 +34,7 @@
-     of named pipes, among other things. If you used <command>su</command> to
-     become an unprivileged user, this combination will cause Bash to build
-     without <emphasis>process substitution</emphasis>, which will break one
--    of the C++ test scripts in <literal>eglibc</literal>. The following prevents
-+    of the C++ test scripts in <literal>glibc</literal>. The following prevents
-     future problems by skipping the check for named pipes, as well as other
-     tests that can not run while cross-compiling or that do not run properly:</para>
- 
-@@ -62,7 +62,7 @@
-     --without-bash-malloc --cache-file=config.cache</userinput></screen>
- 
-     <variablelist os="c">
--      <title>The meaning of the configure option:</title>
-+      <title>The meaning of the new configure option:</title>
- 
-       <varlistentry>
-         <term><parameter>--without-bash-malloc</parameter></term>
-@@ -90,11 +90,6 @@
- 
- <screen os="h"><userinput>make install</userinput></screen>
- 
--    <para os="t3">Make a link for programs that use <command>sh</command> for
--    a shell:</para>
--
--<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/temp-system/common/binutils.xml BOOK/temp-system/common/binutils.xml
---- /home/jp/a/BOOK/temp-system/common/binutils.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/common/binutils.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -49,6 +49,20 @@
-     --with-lib-path=/tools/lib --disable-nls --enable-shared \
-     --disable-multilib</userinput></screen>
- 
-+    <variablelist os="k">
-+      <title>The meaning of the new configure option:</title>
-+
-+      <varlistentry>
-+        <term><parameter>--enable-shared</parameter></term>
-+        <listitem>
-+          <para>When this is specified, Binutils will create a shared
-+          <filename class="libraryfile">libbfd</filename> and link its programs
-+          to it.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+    </variablelist>
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../cross-tools/common/binutils.xml"
-     xpointer="xpointer(//*[@os='be'])"/>
-diff -ru /home/jp/a/BOOK/temp-system/common/bison.xml BOOK/temp-system/common/bison.xml
---- /home/jp/a/BOOK/temp-system/common/bison.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/common/bison.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -25,14 +25,7 @@
-     <para os='s1'>Apply a <command>sed</command> which disables the building of <filename>bison.help</filename> when cross-compiling.</para>
- 
- <screen os='s2'><userinput>cp -v Makefile.in{,.orig}
--sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../../final-system/common/bison.xml"
--    xpointer="xpointer(//*[@os='t3'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../../final-system/common/bison.xml"
--    xpointer="xpointer(//*[@os='t4'])"/>
-+sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/bison.xml"
-diff -ru /home/jp/a/BOOK/temp-system/common/bzip2.xml BOOK/temp-system/common/bzip2.xml
---- /home/jp/a/BOOK/temp-system/common/bzip2.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/common/bzip2.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -23,7 +23,7 @@
-     <title>Installation of Bzip2</title>
- 
-     <para os="ca">Bzip2's default <filename>Makefile</filename> target
--    automatically runs the testsuite as well. Disable the tests since they
-+    automatically runs the test suite as well. Disable the tests since they
-     won't work on a multi-architecture build:</para>
- 
- <screen os="cb"><userinput>cp -v Makefile{,.orig}
 diff -ru /home/jp/a/BOOK/temp-system/common/check.xml BOOK/temp-system/common/check.xml
 --- /home/jp/a/BOOK/temp-system/common/check.xml	2014-05-11 16:24:52.634516678 +0200
 +++ BOOK/temp-system/common/check.xml	2014-10-03 20:44:43.932339262 +0200

Modified: trunk/clfs/materials/common/introduction.xml
===================================================================
--- trunk/clfs/materials/common/introduction.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/materials/common/introduction.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -43,7 +43,8 @@
   <para>Affectez le droit d'écriture et le droit sticky sur ce répertoire, ce qui signifie que même si de nombreux utilisateurs
   peuvent écrire sur un répertoire, seul le propriétaire du fichier
   peut supprimer ce fichier à l'intérieur du répertoire sticky. La
-  commande suivante activera les droits d'Ă©criture et sticky :</para>
+  commande suivante, lancée en tant que <systemitem class="username">root</systemitem>,
+  activera les droits d'Ă©criture et sticky :</para>
 
 <screen><userinput>chmod -v a+wt ${CLFS}/sources</userinput></screen>
 
@@ -56,14 +57,13 @@
 
   <para>Vous pouvez vérifier les paquets téléchargés en téléchargeant les listes
   de sommes de contrĂ´le MD5 ou SHA1 suivantes :</para>
+  <para><ulink url="&packages-root;MD5SUMS">MD5SUMS</ulink> :</para>
 
-  <para><ulink url="/files/packages/git/MD5SUMS">MD5SUMS</ulink> :</para>
-
 <screen><userinput>pushd ${CLFS}/sources
 md5sum -c MD5SUMS
 popd</userinput></screen>
 
-  <para><ulink url="/files/packages/git/SHA1SUMS">SHA1SUMS</ulink> :</para>
+    <para><ulink url="&packages-root;SHA1SUMS">SHA1SUMS</ulink> :</para>
 
 <screen><userinput>pushd ${CLFS}/sources
 sha1sum -c SHA1SUMS

Modified: trunk/clfs/network/common/choose.xml
===================================================================
--- trunk/clfs/network/common/choose.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/common/choose.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -8,7 +8,7 @@
 <sect1 id="ch-network-choose">
   <?dbhtml filename="choose.html"?>
 
-  <title>RĂ©seau DHCP ou Statique ?</title>
+  <title>Le rĂ©seau avec Systemd ?</title>
 
   <indexterm zone="ch-network-choose">
     <primary sortas="d-network">network</primary>
@@ -18,11 +18,13 @@
   vous pouvez passer Ă 
   <xref linkend="chapter-bootable"/>.</para>
 
-  <para>Vous pouvez configurer votre réseau par deux manières différentes. Le dynamique vous permettra de tirer parti d'un serveur DHCP 
-  pour obtenir toutes vos informations de configuration. En statique, vous devenez responsable du paramétrage de vos options.</para>
+  <para>Vous pouvez configurer votre réseau par deux manières différentes.  Vous
+  pouvez utiliser Systemd ou installer CLFS-Network-Scripts.</para>
 
-  <para>Pour configurer une interface statique, suivez <xref linkend="ch-network-static"/>.</para>
+  <para>Pour utiliser Systemd pour configurer une interface réseau, suivez le
+  <xref linkend="ch-systemd-network"/>.</para>
 
-  <para>Pour configurer une interface DHCP, suivez <xref linkend="ch-network-dhcpcd"/>.</para>
+  <para>Pour utiliser CLFS-network-scripts pour configurer une Interface réseau,
+  suivez le <xref linkend="ch-network-network-scripts"/>.</para>
 
 </sect1>

Modified: trunk/clfs/network/common/dhcpcd.xml
===================================================================
--- trunk/clfs/network/common/dhcpcd.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/common/dhcpcd.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -31,21 +31,73 @@
 
     <para os="b">PrĂ©parez la compilation de DHCPCD :</para>
 
-<screen os="c"><userinput>./configure --prefix=/usr --sbindir=/sbin \
+<screen os="c" role="nodump"><userinput>./configure --prefix=/usr --sbindir=/sbin \
     --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib/dhcpcd</userinput></screen>
 
     <para os="d">Compilez le paquet :</para>
 
-<screen os="e"><userinput>make</userinput></screen>
+<screen os="e" role="nodump"><userinput>make</userinput></screen>
 
     <para os="f">Ce paquet est fourni sans suite de tests.</para>
 
     <para os="g">Installez le paquet :</para>
 
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="h" role="nodump"><userinput>make install</userinput></screen>
 
   </sect2>
 
+  <sect2 id="conf-dhcpcd" role="configuration">
+    <title>Créer le fichier de configuration de l'interface réseau DHCP</title>
+
+    <para>Voici un exemple pour l'interface eth0. Reportez-vous Ă  la page de man
+    de dhcpcd.conf pour plus d'informations. Vous pouvez sauter cette Ă©tape si le
+    comportement par défaut de dhcpcd suffit.</para>
+
+    <para>Créez le fichier de configuration <filename>/etc/dhcpcd.conf</filename>
+    en utilisant les commandes suivantes. Ajustez-le correctement selon vos 
+    options supplĂ©mentaires :</para>
+
+<screen role="nodump"><userinput>cd /etc &&
+cat > dhcpcd.conf << "EOF"
+<literal># interface eth0 de configuration de dhcpcd
+# Voir dhcpcd.conf(5) pour les détails.
+
+interface eth0
+# dhcpcd-run-hooks utilise ces options.
+option subnet_mask, routers, domain_name_servers
+
+# Le délai d'attente de réponse DHCP par défaut est de 30 secondes, ce pui peut
+# ĂŞtre trop long ou trop court et vous pouvez le changer ici.
+timeout 16</literal>
+EOF</userinput></screen>
+
+    <para>Pour configurer une autre interface Statique, suivez le <xref linkend="ch-network-static"/>.</para>
+
+  </sect2>
+
+  <sect2>
+    <title>Configurer l'Interface réseau au démarrage</title>
+
+    <para>L'activation de la configuration d'une interface réseau se fait
+    individuellement. Pour en activer une au dĂ©marrage, lancez :</para>
+
+<screen role="nodump"><userinput>systemctl enable dhcpcd at eth0</userinput></screen>
+
+    <para>Pour désactiver une configuration d'interface réseau précédemment activée
+     au dĂ©marrage, lancez :</para>
+
+<screen role="nodump"><userinput>systemctl disable dhcpcd at eth0</userinput></screen>
+
+    <para>Pokr démarrer à la main une configuration d'interface réseau,
+     lancez :</para>
+
+<screen role="nodump"><userinput>systemctl start dhcpcd at eth0</userinput></screen>
+
+    <para>Remplacez eth0 par le bon nom d'interface réseau comme indiqué au début
+    de cette page.</para> .
+
+  </sect2>
+
   <sect2 id="contents-dhcpcd" role="content">
     <title>Contenu de dhcpcd</title>
 

Modified: trunk/clfs/network/common/hostname.xml
===================================================================
--- trunk/clfs/network/common/hostname.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/common/hostname.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -8,20 +8,19 @@
 <sect1 id="ch-network-hostname">
   <?dbhtml filename="hostname.html"?>
 
-  <title>Configurer le script localnet</title>
+  <title>Configurer le nom d'hôte du système</title>
 
   <indexterm zone="ch-network-hostname">
-    <primary sortas="d-localnet">localnet</primary>
+    <primary sortas="d-hostname">hostname</primary>
   <secondary>configuration</secondary></indexterm>
 
-  <para>Une partie du boulot du script <command>localnet</command>
-  est de configurer le nom du système. Ce nom doit être indiqué dans le fichier
-  <filename>/etc/sysconfig/network</filename>.</para>
+  <para>Systemd lit <filename>/etc/hostname</filename> pour déterminer le nom de
+  domaine Ă  utiliser.</para>
 
-  <para>Créez le fichier <filename>/etc/sysconfig/network</filename> et
+  <para>Créez le fichier <filename>/etc/hostname</filename> et
   entrez le nom du système en lançant :</para>
 
-  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" > /etc/sysconfig/network</userinput></screen>
+  <screen role="nodump"><userinput>echo "<replaceable>[clfs]</replaceable>" > /etc/hostname</userinput></screen>
 
   <para>Vous devez remplacer <replaceable>[clfs]</replaceable> par le nom donné à l'ordinateur. N'entrez pas le nom de domaine pleinement 
   qualifié (FQDN) ici. On mettra cette information dans le fichier 

Modified: trunk/clfs/network/common/hosts.xml
===================================================================
--- trunk/clfs/network/common/hosts.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/common/hosts.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -23,7 +23,7 @@
   <secondary>/etc/hosts</secondary></indexterm>
 
   <para>Si une carte réseau doit être configurée, choisissez l'adresse
-  IP, le nom de domaine pleinement qualifié et les alias possibles à
+  IP, le nom de domaine pleinement qualifié (FQDN) et les alias possibles à
   déclarer
   dans le fichier <filename>/etc/hosts</filename>. La syntaxe
   est :</para>
@@ -37,29 +37,31 @@
   se trouve dans la plage d'adresses réservée aux réseaux privés. Les
   plages valides sont :</para>
 
-<screen><literal>  Class Networks
-  A     10.0.0.0
-  B     172.16.0.0 through 172.31.0.255
-  C     192.168.0.0 through 192.168.255.255</literal></screen>
+<screen><literal>Private Network Address Range       Normal Prefix
+10.0.0.1 - 10.255.255.254           8
+172.x.0.1 - 172.x.255.254           16
+192.168.y.1 - 192.168.y.254         24</literal></screen>
 
+  <para>x peut ĂŞtre un nombre compris entre 16-31. y peut ĂŞtre un nombre compris
+  entre 0-255.</para>
+
   <para>Une adresse IP valide pourrait ĂŞtre 192.168.1.1. Un nom de
   domaine
   pleinement qualifié pour cette adresse IP pourrait être
-  <uri>www.linuxfromscratch.org</uri> (non recommandé car c'est une adresse de domaine enregistrée et cela pourrait entraîner des 
+  <uri>www.cross-lfs.org</uri> (non recommandé car c'est une adresse de domaine enregistrée et cela pourrait entraîner des 
   problèmes de serveur de nom de domaine).</para>
 
   <para>Même si vous ne possédez pas de carte réseau, un nom de domaine
-  pleinement qualifié est toujours requis. Certains programmes en ont
+  pleinement qualifié valide est toujours requis. Certains programmes en ont
   besoin pour fonctionner correctement.</para>
 
-  <para>CrĂ©ez le fichier <filename>/etc/hosts</filename> file en lançant :</para>
+  <para>CrĂ©ez le fichier <filename>/etc/hosts</filename> en lançant :</para>
 
-<screen><userinput>cat > /etc/hosts << "EOF"
+<screen role="nodump"><userinput>cat > /etc/hosts << "EOF"
 <literal># DĂ©but de /etc/hosts (network card version)
 
 127.0.0.1 localhost
-<replaceable>[192.168.1.1]</replaceable> <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable>
-
+<replaceable>[192.168.1.1]</replaceable> <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> <replaceable>[alias ...]</replaceable>
 # Fin de /etc/hosts (network card version)</literal>
 EOF</userinput></screen>
 
@@ -68,12 +70,12 @@
   être remplacées suivant les contraintes/besoins des utilisateurs (si
   la machine se voit affectée une adresse IP par un administrateur
   réseau/système et que cette machine est connectée à un réseau
-  existant).</para>
+  existant). Vous pouvez vous passer du/des nom(s) d',alias facultatif(s).</para>
 
   <para>Si vous n'avez pas de carte réseau, créez le fichier
   <filename>/etc/hosts</filename> en lançant :</para>
 
-<screen><userinput>cat > /etc/hosts << "EOF"
+<screen role="nodump"><userinput>cat > /etc/hosts << "EOF"
 <literal># DĂ©but de /etc/hosts (no network card version)
 
 127.0.0.1 <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost

Modified: trunk/clfs/network/common/resolv.xml
===================================================================
--- trunk/clfs/network/common/resolv.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/common/resolv.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -10,10 +10,7 @@
 
   <title>Création du fichier /etc/resolv.conf</title>
 
-  <sect2 id="resolv.conf">
-    <title>Création du fichier /etc/resolv.conf</title>
-
-    <indexterm zone="resolv.conf">
+    <indexterm zone="ch-network-resolv">
       <primary sortas="e-/etc/resolv.conf">/etc/resolv.conf</primary>
     </indexterm>
 
@@ -26,7 +23,7 @@
     interfaces réseau ou si vous paramétrez manuellement votre DNS en utilisant DHCP, créez le fichier en lançant ce qui 
     suit :</para>
 
-<screen><userinput>cat > /etc/resolv.conf << "EOF"
+<screen role="nodump"><userinput>cat > /etc/resolv.conf << "EOF"
 <literal># DĂ©but de /etc/resolv.conf
 
 domain <replaceable>[Votre nom de domaine]</replaceable>
@@ -36,11 +33,13 @@
 # Fin de /etc/resolv.conf</literal>
 EOF</userinput></screen>
 
+    <para>Vous pouvez vous passer de la ligne <replaceable>domain</replaceable>
+    ou la remplacer par une ligne <replaceable>search</replaceable>. Voir la
+    page de man de resolv.conf pour plus de détails.</para>
+
     <para>Remplacez <replaceable>[adresse IP du nom de serveur]</replaceable> par l'adresse IP du DNS la plus adaptée à la 
     configuration. Souvent il y aura plus d'une entrée (sont requis des serveurs secondaires pour la fonctionnalité fallback). Si vous 
     n'avez besoin ou ne voulez qu'un serveur DNS, supprimez la seconde ligne <emphasis>nameserver</emphasis> du fichier. L'adresse IP 
     peut être aussi un routeur sur le réseau local.</para>
 
-  </sect2>
-
 </sect1>

Modified: trunk/clfs/network/multilib/dhcpcd.xml
===================================================================
--- trunk/clfs/network/multilib/dhcpcd.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/multilib/dhcpcd.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -29,7 +29,7 @@
     href="../common/dhcpcd.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
+<screen os="c" role="nodump"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
     --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib64/dhcpcd \
     --libdir=/usr/lib64</userinput></screen>
 
@@ -57,6 +57,10 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/dhcpcd.xml"
+  xpointer="xpointer(id('conf-dhcpcd'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/dhcpcd.xml"
   xpointer="xpointer(id('contents-dhcpcd'))"/>
 
 </sect1>

Modified: trunk/clfs/network/x86-chapter.xml
===================================================================
--- trunk/clfs/network/x86-chapter.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/x86-chapter.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -15,8 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>

Modified: trunk/clfs/network/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/network/x86_64-64-chapter.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/x86_64-64-chapter.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -15,8 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>

Modified: trunk/clfs/network/x86_64-chapter.xml
===================================================================
--- trunk/clfs/network/x86_64-chapter.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/network/x86_64-chapter.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -15,8 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>

Modified: trunk/clfs/partitioning/common/creatingfilesystem.xml
===================================================================
--- trunk/clfs/partitioning/common/creatingfilesystem.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/partitioning/common/creatingfilesystem.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -22,12 +22,12 @@
 
   <para os="b">Pour créer un système de fichiers
   <systemitem class="filesystem">ext2</systemitem> sur la partition CLFS,
-  lancez ce qui suit :</para>
-  
+  lancez ce qui suit en tant que <systemitem class="username">root</systemitem> :</para>
+
 <screen os="c"><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
 
   <para os="d">Remplacez <replaceable>[xxx]</replaceable> par le nom de
-  la partition CLFS (<filename class="devicefile">hda5</filename> dans
+  la partition CLFS (<filename class="devicefile">sda5</filename> dans
   notre exemple précédent).</para>
 
   <note os="e">
@@ -49,7 +49,8 @@
     avoir des améliorations personnalisées. Dans ce cas, pour éviter tout
     problème ultérieur, vous devez compiler le paquet e2fsprogs et
     utiliser les binaires résultant de cette compilation pour re-créer
-    le système de fichiers sur votre partition CLFS :</para>
+    le système de fichiers sur votre partition CLFS. Pour ce faire, lancez les
+    commandes suivantes en tant que <systemitem class="username">root</systemitem> :</para>
 
 <screen os="g"><userinput>cd /tmp
 tar xjf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.bz2
@@ -64,15 +65,15 @@
 
   </note>
 
-  <para os="h">Si vous avez créé une nouvelle
-  partition swap, elle devra
-  être initialisée, pour pouvoir être utilisée, en exécutant la
-  commande ci-dessous. Si vous utilisez une partition de swap existante, il n'est
-  pas nécessaire de la formater. </para>
+  <para os="h">Si vous avez créé une nouvelle partition d'échange, vous devrez
+  l'initialiser, pour pouvoir être utilisée, en exécutant la
+  commande ci-dessous en tant que <systemitem class="username">root</systemitem> :</para>
 
 <screen os="i"><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
 
-  <para os="j">Remplacez <replaceable>[yyy]</replaceable>  par le nom de la partition de swap.</para>
+  <para os="j">Remplacez <replaceable>[yyy]</replaceable>  par le nom de la partition
+  d'Ă©change. Si vous utilisez une partition d'Ă©change existante, vous n'avez pas
+  besoin de la formater.</para>
 
 </sect1>
 

Modified: trunk/clfs/partitioning/common/creatingpartition.xml
===================================================================
--- trunk/clfs/partitioning/common/creatingpartition.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/partitioning/common/creatingpartition.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -16,7 +16,10 @@
   recommandée pour la construction d'un système CLFS est d'utiliser une
   partition vide disponible ou, si vous avez assez d'espace non
   partitionné, d'en créer une. Néanmoins si vous construisez pour une architecture différente, vous pouvez simplement tout construire dans 
-  <quote>/mnt/clfs</quote> et le transférer vers votre machine cible.</para>
+  <quote>/mnt/clfs</quote> (ou le répertoire que vous voulez utiliser) et le 
+  transférer vers votre machine cible. Si vous n'envisagez pas d'utiliser une
+  partition séparée pour construire CLFS, vous pouvez passer le reste de ce
+  chapitre et aller au <xref linkend="chapter-getting-materials"/>.</para>
 
   <para os="b">Un système minimal requiert une partition d'environ 6 Gio
   (giga octets informatique). C'est suffisant pour conserver toutes les archives tar
@@ -40,13 +43,14 @@
   Il n'est donc pas nécessaire de créer une autre partition si votre
   système hôte a déjà cette configuration.</para>
 
-  <para os="d">Lancez un programme de partitionnement de disques tel que
+  <para os="d">En tant que <systemitem class="username">root</systemitem>,
+  lancez un programme de partitionnement de disques tel que
   <command>cfdisk</command> ou <command>fdisk</command> avec une option
   en ligne
   de commande nommant le disque dur sur lequel la nouvelle partition
   sera crĂ©Ă©e—par exemple 
-  <filename class="devicefile">/dev/hda</filename> pour un disque
-  primaire Integrated Drive Electronics (IDE). Créez une partition
+  <filename class="devicefile">/dev/sda</filename> pour un disque
+  primaire Integrated Drive Electronics (IDE) ou Serial ATA (SATA). Créez une partition
   Linux native et, si nécessaire, une partition de 
   <systemitem class="filesystem">swap</systemitem>.
   Merci de vous référer aux pages de man
@@ -54,11 +58,16 @@
   vous ne savez pas encore utiliser ces programmes.</para>
 
   <para os="e">Rappelez-vous de la désignation de la nouvelle partition (par
-  exemple <filename class="devicefile">hda5</filename>). Ce livre y fera
+  exemple <filename class="devicefile">sda5</filename>). Ce livre y fera
   référence en tant que la partition CLFS. Rappelez-vous aussi de la
   désignation de la partition 
   <systemitem class="filesystem">swap</systemitem>. Ces noms seront
   nécessaires après pour créer le fichier
   <filename>/etc/fstab</filename>.</para>
 
+  <note><para>SYSTEMD ne supporte pas de configuration avec un système de fichiers
+  <filename class="directory">/usr</filename> Ă  part. Il faut un initramfs 
+  qui monte un <filename class="directory">/usr</filename> 
+  </para></note>
+
 </sect1>

Modified: trunk/clfs/partitioning/common/mounting.xml
===================================================================
--- trunk/clfs/partitioning/common/mounting.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/partitioning/common/mounting.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -12,18 +12,17 @@
 
   <para>Maintenant qu'un système de fichiers a été créé, la partition
   doit être accessible. Pour cela, la partition a besoin d'être montée
-  sur un point de montage choisi. Pour ce livre, il est supposé que le
-  système de fichiers est monté sous <filename
-  class="directory">/mnt/clfs</filename>, mais le choix du répertoire
-  vous appartient.</para>
+  sur un point de montage choisi.</para>
 
-  <para>Choisissez un point de montage et affectez-le Ă  la variable
-  d'environnement <envar>CLFS</envar> en lançant :</para>
+  <para>En tant que <systemitem class="username">root</systemitem>, assurez-vous que
+  la variable d'environnement <envar>CLFS</envar> est définie si vous ne l'avez
+  pas dĂ©jĂ  fait :</para>
 
-<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
+<screen><userinput>export CLFS=<replaceable>[/mnt/clfs]</replaceable></userinput></screen>
 
   <para>Puis, créez le point de montage et montez le système de
-  fichiers CLFS en lançant :</para>
+  fichiers CLFS en lançant les commandes suivantes en tant que
+  <systemitem class="username">root</systemitem> :</para>
 
 <screen><userinput>mkdir -pv ${CLFS}
 mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}</userinput></screen>
@@ -35,7 +34,7 @@
   <para>Si vous utilisez plusieurs partitions pour CLFS (par exemple 
   une pour <filename class="directory">/</filename> et une autre pour
   <filename class="directory">/usr</filename>), montez-les en
-  utilisant :</para>
+  tant que <systemitem class="username">root</systemitem> en utilisant :</para>
 
 <screen><userinput>mkdir -pv ${CLFS}
 mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}

Modified: trunk/clfs/partitioning/x86-chapter.xml
===================================================================
--- trunk/clfs/partitioning/x86-chapter.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/partitioning/x86-chapter.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -12,6 +12,7 @@
   <title>Préparez une nouvelle partition</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingpartition.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>

Modified: trunk/clfs/prologue/common/foreword.xml
===================================================================
--- trunk/clfs/prologue/common/foreword.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/prologue/common/foreword.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -33,7 +33,7 @@
   ayez compilé votre système vous-même. En 
   plus, pendant une construction CLFS, vous apprendrez des techniques avancées comme la construction croisée d'ensembles 
   d'outils, le support multilib (bibliothèques 32 & 64 bits séparées), des architectures alternatives telles que Sparc, 
-  MIPS et Alpha et beaucoup plus.</para>
+  MIPS et beaucoup plus.</para>
 
   <para>Nous espérons que vous apprécierez la construction de votre propre système CLFS et les
   avantages résultant d'un système sur mesure selon vos besoins.</para>

Modified: trunk/clfs/prologue/common/hostreqs.xml
===================================================================
--- trunk/clfs/prologue/common/hostreqs.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/prologue/common/hostreqs.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -58,7 +58,7 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Les versions supérieures à &eglibc-version; ne sont pas recommandées car 
+      <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Les versions supérieures à &glibc-version; ne sont pas recommandées car 
       elles n'ont pas été testées)</para>
     </listitem>
 
@@ -71,11 +71,6 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Linux 2.6.32 (construit avec GCC 4.1.2 ou
-      supérieur</emphasis></para>
-    </listitem>
-
-    <listitem>
       <para><emphasis role="strong">Make-3.80</emphasis></para>
     </listitem>
 
@@ -100,7 +95,7 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">XZ-Utils-4.999.8beta</emphasis></para>
+      <para><emphasis role="strong">Xz Utils-4.999.8beta</emphasis></para>
     </listitem>
 
   </itemizedlist>
@@ -129,7 +124,6 @@
 ldd $(which ${SHELL}) | grep libc.so | cut -d ' ' -f 3 | ${SHELL} | head -n 1 | cut -d ' ' -f 1-7
 grep --version | head -n1
 gzip --version | head -n1
-uname -s -r
 make --version | head -n1
 tic -V
 patch --version | head -n1
@@ -137,7 +131,7 @@
 tar --version | head -n1
 makeinfo --version | head -n1
 xz --version | head -n1
-echo 'main(){}' | gcc -v -o /dev/null -x c - > dummy.log 2>&1
+echo 'main(){}' | gcc -v -o /dev/null -x c - > dummy.log 2>&1
 if ! grep -q ' error' dummy.log; then
   echo "Compilation réussie" && rm dummy.log
 else

Modified: trunk/clfs/prologue/common/prerequisites.xml
===================================================================
--- trunk/clfs/prologue/common/prerequisites.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/prologue/common/prerequisites.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -25,8 +25,8 @@
 
   <para>Comme le livre CLFS attend <emphasis>au moins</emphasis> ce
   simple niveau de connaissance, les différents forums de support CLFS
-  seront peu capables de vous fournir une assistance en dessous de ce
-  niveau ; vous finirez par remarquer que vos questions n'auront
+  seront peu capables de vous fournir une assistance dans ces domaines.
+  Vos questions sur des sujets aussi basiques n'auront probablement
   pas de réponses ou que vous serez renvoyé à la liste des lectures
   principales avant installation.</para>
 
@@ -44,7 +44,7 @@
 
     <listitem>
       <para>The Linux Users' Guide
-      <ulink url="http://www.linuxhq.com/guides/LUG/guide.html"/></para>
+      <ulink url="http://www.tldp.org/pub/Linux/docs/ldp-archived/users-guide/"/></para>
 
       <para>Ce guide couvre l'utilisation de différents logiciels
       Linux.</para>

Modified: trunk/clfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
===================================================================
--- trunk/clfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	2014-10-22 01:55:25 UTC (rev 6604)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
 
 <!--
 $LastChangedBy$
@@ -156,7 +156,7 @@
             </xsl:when>
 
               <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
-            <xsl:when test="$prev[@id='ch-chroot-devices'] or $prev[@id='ch-boot-whatnext']">
+            <xsl:when test="$prev[@id='ch-chroot-pwdgroup'] or $prev[@id='ch-boot-whatnext']">
               <a accesskey="p">
                 <xsl:attribute name="href">
                   <xsl:call-template name="href.target">

Modified: trunk/clfs/stylesheets/top-index.xsl
===================================================================
--- trunk/clfs/stylesheets/top-index.xsl	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/stylesheets/top-index.xsl	2014-10-22 01:55:25 UTC (rev 6604)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
@@ -8,7 +8,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
-  <xsl:output method="html" encoding="utf-8"/>
+  <xsl:output method="html" encoding="iso-8859-1"/>
 
   <xsl:template match="/">
     <html>
@@ -96,121 +96,112 @@
       </div>
       <div class="toc">
         <h3>
-          <xsl:text>32 Bit Builds</xsl:text>
+          <xsl:text>Select your target architecture:</xsl:text>
         </h3>
+        <h3>
+          <xsl:text>Intel/AMD x86</xsl:text>
+        </h3>
         <ul>
-	  <h3>
-	    <xsl:text>Working. Testers and comments welcomed.</xsl:text>
-          </h3>
           <li>
             <h4>
               <a href="x86">
-                <xsl:text>Intel/AMD x86</xsl:text>
+                <xsl:text>32 Bits</xsl:text>
               </a>
             </h4>
           </li>
           <li>
             <h4>
-              <a href="ppc">
-                <xsl:text>PowerPC</xsl:text>
+              <a href="x86_64-64">
+                <xsl:text>64 Bits</xsl:text>
               </a>
             </h4>
           </li>
           <li>
             <h4>
-              <a href="mips">
-                <xsl:text>MIPS</xsl:text>
+              <a href="x86_64">
+                <xsl:text>Multilib</xsl:text>
               </a>
             </h4>
           </li>
+	</ul>
+        <h3>
+          <xsl:text>MIPS</xsl:text>
+        </h3>
+	<ul>
           <li>
             <h4>
-              <a href="sparc">
-                <xsl:text>Sparc v8</xsl:text>
+              <a href="mips">
+                <xsl:text>32 Bits</xsl:text>
               </a>
             </h4>
           </li>
-	</ul>
-        <h3>
-          <xsl:text>64 Bit Builds</xsl:text>
-        </h3>
-	<ul>
-          <h3>
-            <xsl:text>Working. Testers and comments welcomed.</xsl:text>
-          </h3>
           <li>
             <h4>
-              <a href="x86_64-64">
-                <xsl:text>x86_64</xsl:text>
+              <a href="mips64-64">
+                <xsl:text>64 Bits</xsl:text>
               </a>
             </h4>
           </li>
           <li>
             <h4>
-              <a href="ppc64-64">
-                <xsl:text>PowerPC64</xsl:text>
+              <a href="mips64">
+                <xsl:text>Multilib</xsl:text>
               </a>
             </h4>
           </li>
-
+	</ul>
+        <h3>
+          <xsl:text>PowerPC</xsl:text>
+        </h3>
+	<ul>
           <li>
             <h4>
-              <a href="mips64-64">
-                <xsl:text>MIPS</xsl:text>
+              <a href="ppc">
+                <xsl:text>32 Bits</xsl:text>
               </a>
             </h4>
           </li>
           <li>
             <h4>
-             <a href="sparc64-64">
-                <xsl:text>Sparc v9/Ultrasparc</xsl:text>
-             </a>
+              <a href="ppc64-64">
+                <xsl:text>64 Bits</xsl:text>
+              </a>
             </h4>
           </li>
           <li>
             <h4>
-             <a href="alpha">
-                <xsl:text>Alpha</xsl:text>
-             </a>
+              <a href="ppc64">
+                <xsl:text>Multilib</xsl:text>
+              </a>
             </h4>
           </li>
-	</ul>
+        </ul>
         <h3>
-          <xsl:text>Multilib Builds</xsl:text>
+          <xsl:text>Sparc</xsl:text>
         </h3>
 	<ul>
-          <h3>
-             <xsl:text>Working. Testers and comments welcomed.</xsl:text>
-          </h3>
           <li>
             <h4>
-              <a href="x86_64">
-                <xsl:text>x86_64</xsl:text>
+              <a href="sparc">
+                <xsl:text>32 Bits</xsl:text>
               </a>
             </h4>
           </li>
           <li>
             <h4>
-              <a href="mips64">
-                <xsl:text>MIPS</xsl:text>
+              <a href="sparc64-64">
+                <xsl:text>64 Bits</xsl:text>
               </a>
             </h4>
           </li>
           <li>
             <h4>
-             <a href="sparc64">
-                <xsl:text>Sparc v9/Ultrasparc</xsl:text>
-             </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="ppc64">
-                <xsl:text>PowerPC64</xsl:text>
+              <a href="sparc64">
+                <xsl:text>Multilib</xsl:text>
               </a>
             </h4>
           </li>
-        </ul>
+	</ul>
       </div>
     </div>
   </xsl:template>
@@ -226,7 +217,7 @@
 
   <xsl:template match="copyright">
     <p class="copyright">
-      <xsl:text>Copyright ©</xsl:text>
+      <xsl:text>Copyright ©</xsl:text>
       <xsl:apply-templates/>
     </p>
   </xsl:template>

Modified: trunk/clfs/stylesheets/wget.xsl
===================================================================
--- trunk/clfs/stylesheets/wget.xsl	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/stylesheets/wget.xsl	2014-10-22 01:55:25 UTC (rev 6604)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
@@ -23,15 +23,15 @@
   </xsl:template>
 
   <xsl:template match="ulink">
-      <!-- Packages. If some package don't have the string ".tar." in their
-      name, the next test must be fixed to match it also. -->
+      <!-- Packages. If some package doesn't have the string ".tar." or
+      ".tgz" in its name, the next test must be fixed to match it also. -->
     <xsl:if test="contains(@url, '.tar.') or contains(@url, '.tgz')">
       <xsl:value-of select="@url"/>
       <xsl:text>&#x0a;</xsl:text>
     </xsl:if>
       <!-- Patches. Match only the patches and skip possible duplicated
-      URLs due that may be splitted for PDF output-->
-    <xsl:if test="contains(@url, '.patch') and contains(@url, '&patches-root;')
+      URLs that may be split for PDF output-->
+    <xsl:if test="contains(@url, '&patches-root;') and @url != '&patches-root;'
             and not(ancestor-or-self::*/@condition = 'pdf')">
       <xsl:value-of select="@url"/>
       <xsl:text>&#x0a;</xsl:text>

Modified: trunk/clfs/temp-system/64/binutils.xml
===================================================================
--- trunk/clfs/temp-system/64/binutils.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/temp-system/64/binutils.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -44,14 +44,14 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
+<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
     --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --target=${CLFS_TARGET} --with-lib-path=/tools/lib --disable-nls \
     --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ea'])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"

Modified: trunk/clfs/temp-system/64/gcc.xml
===================================================================
--- trunk/clfs/temp-system/64/gcc.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/temp-system/64/gcc.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -16,7 +16,7 @@
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
+  href="../common/gcc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
@@ -78,31 +78,17 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --enable-cloog-backend=isl --with-gmp=/tools --with-mpfr=/tools \
-    --with-mpc=/tools --with-isl=/tools --disable-isl-version-check \
-    --with-cloog=/tools --with-system-zlib \
-    --with-native-system-header-dir=/tools/include --enable-checking=release \
-    --enable-libstdcxx-time</userinput></screen>
+    --with-local-prefix=/tools --disable-multilib --disable-nls \
+    --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \
+    --with-native-system-header-dir=/tools/include --disable-libssp \
+    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
-    <variablelist>
-      <title>Voici la signification des nouvelles options de configure :</title>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cl'])"/>
 
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../multilib/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
@@ -127,6 +113,14 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cp'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cr'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/temp-system/common/bash.xml
===================================================================
--- trunk/clfs/temp-system/common/bash.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/temp-system/common/bash.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -34,7 +34,7 @@
     pas tester la présence de pipes (tubes) nommés. 
     Si vous avez utilisé <command>su</command> pour devenir utilisateur non privilégié, cette combinaison aura pour conséquence que Bash se 
     construira sans <emphasis>substitution de processus</emphasis>, ce qui va casser un des scripts de test de C++ dans
-    <literal>eglibc</literal>. Ce qui suit empêche des problèmes futurs en sautant
+    <literal>glibc</literal>. Ce qui suit empêche des problèmes futurs en sautant
     la vérification des tubes nommés et d'autres tests qui ne peuvent pas s'exécuter 
     lors d'une compilation croisĂ©e ou qui ne s'exĂ©cutent pas correctement :</para>
 
@@ -62,7 +62,7 @@
     --without-bash-malloc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="c">
-      <title>Voici la signification de l'option de configure :</title>
+      <title>Voici la signification de la nouvelle option de configure :</title>
 
       <varlistentry>
         <term><parameter>--without-bash-malloc</parameter></term>
@@ -91,10 +91,6 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="t3">CrĂ©ez un lien pour les programmes qui utilisent <command>sh</command> comme shell :</para>
-
-<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/temp-system/common/binutils.xml
===================================================================
--- trunk/clfs/temp-system/common/binutils.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/temp-system/common/binutils.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -51,6 +51,20 @@
     --with-lib-path=/tools/lib --disable-nls --enable-shared \
     --disable-multilib</userinput></screen>
 
+    <variablelist os="k">
+      <title>Voici la signification de la nouvelle option de configure :</title>
+
+      <varlistentry>
+        <term><parameter>--enable-shared</parameter></term>
+        <listitem>
+          <para>Quand on spécifie cela, Binutils créera un
+          <filename class="libraryfile">libbfd</filename> partagé et y liera ses
+          programmes.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/binutils.xml"
     xpointer="xpointer(//*[@os='be'])"/>

Modified: trunk/clfs/temp-system/common/bison.xml
===================================================================
--- trunk/clfs/temp-system/common/bison.xml	2014-10-21 20:43:15 UTC (rev 6603)
+++ trunk/clfs/temp-system/common/bison.xml	2014-10-22 01:55:25 UTC (rev 6604)
@@ -27,18 +27,10 @@
     croisée.</para>
 
 <screen os='s2'><userinput>cp -v Makefile.in{,.orig}
-sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
+sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='t3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='t4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ca"><userinput>M4=m4 ./configure --prefix=/tools \



More information about the lfs-traducfr mailing list