[lfs-fr] r6565 - in trunk/blfs: general/genlib general/genutils general/graphlib general/prog general/sysutils gnome/applications gnome/platform introduction/welcome kde/add kde/core lxde/apps lxde/desktop multimedia/audioutils multimedia/cdwriteutils multimedia/libdriv multimedia/videoutils networking/connect networking/mailnews networking/netlibs networking/netprogs networking/netutils postlfs/config postlfs/editors postlfs/filesystems postlfs/security postlfs/shells postlfs/virtualization pst/printing pst/ps pst/typesetting server/databases server/mail server/major server/other x/installing x/lib xfce/core xsoft/graphweb xsoft/office xsoft/other

myou72 at orange.fr myou72 at orange.fr
Mer 1 Oct 14:28:43 PDT 2014


Author: myou72
Date: 2014-10-01 23:28:43 +0200 (Wed, 01 Oct 2014)
New Revision: 6565

Modified:
   trunk/blfs/general/genlib/grantlee.xml
   trunk/blfs/general/genlib/icu.xml
   trunk/blfs/general/genlib/libassuan.xml
   trunk/blfs/general/genlib/libatasmart.xml
   trunk/blfs/general/genlib/libdaemon.xml
   trunk/blfs/general/genlib/libdbusmenuqt.xml
   trunk/blfs/general/genlib/libgcrypt.xml
   trunk/blfs/general/genlib/libpaper.xml
   trunk/blfs/general/genlib/libsigsegv.xml
   trunk/blfs/general/genlib/nspr.xml
   trunk/blfs/general/genlib/openobex.xml
   trunk/blfs/general/genlib/qca.xml
   trunk/blfs/general/genlib/qjson.xml
   trunk/blfs/general/genlib/xapian.xml
   trunk/blfs/general/genutils/appstream-glib.xml
   trunk/blfs/general/genutils/imagemagick.xml
   trunk/blfs/general/genutils/iso-codes.xml
   trunk/blfs/general/graphlib/harfbuzz.xml
   trunk/blfs/general/graphlib/librsvg.xml
   trunk/blfs/general/graphlib/libwebp.xml
   trunk/blfs/general/graphlib/poppler.xml
   trunk/blfs/general/prog/clisp.xml
   trunk/blfs/general/prog/doxygen.xml
   trunk/blfs/general/prog/elfutils.xml
   trunk/blfs/general/prog/gcc-ada.xml
   trunk/blfs/general/prog/gcc-java.xml
   trunk/blfs/general/prog/gcc.xml
   trunk/blfs/general/prog/git.xml
   trunk/blfs/general/prog/llvm.xml
   trunk/blfs/general/prog/mercurial.xml
   trunk/blfs/general/prog/openjdk.xml
   trunk/blfs/general/prog/perl-modules.xml
   trunk/blfs/general/prog/php.xml
   trunk/blfs/general/prog/pycairo.xml
   trunk/blfs/general/prog/scons.xml
   trunk/blfs/general/prog/subversion.xml
   trunk/blfs/general/prog/tcl.xml
   trunk/blfs/general/prog/tk.xml
   trunk/blfs/general/prog/valgrind.xml
   trunk/blfs/general/sysutils/at.xml
   trunk/blfs/general/sysutils/bluez.xml
   trunk/blfs/general/sysutils/colord.xml
   trunk/blfs/general/sysutils/dbus.xml
   trunk/blfs/general/sysutils/mc.xml
   trunk/blfs/general/sysutils/sysstat.xml
   trunk/blfs/general/sysutils/udev-extras.xml
   trunk/blfs/gnome/applications/gnome-system-monitor.xml
   trunk/blfs/gnome/applications/totem.xml
   trunk/blfs/gnome/platform/gvfs.xml
   trunk/blfs/introduction/welcome/changelog.xml
   trunk/blfs/kde/add/ark.xml
   trunk/blfs/kde/add/gwenview.xml
   trunk/blfs/kde/add/kate.xml
   trunk/blfs/kde/add/kdepim-runtime.xml
   trunk/blfs/kde/add/kdepim.xml
   trunk/blfs/kde/add/kdeplasma-addons.xml
   trunk/blfs/kde/add/kmix.xml
   trunk/blfs/kde/add/konsole.xml
   trunk/blfs/kde/add/libkcddb.xml
   trunk/blfs/kde/add/libkdcraw.xml
   trunk/blfs/kde/add/libkexiv2.xml
   trunk/blfs/kde/add/okular.xml
   trunk/blfs/kde/core/akonadi.xml
   trunk/blfs/kde/core/baloo-widgets.xml
   trunk/blfs/kde/core/baloo.xml
   trunk/blfs/kde/core/kactivities.xml
   trunk/blfs/kde/core/kde-baseapps.xml
   trunk/blfs/kde/core/kde-runtime.xml
   trunk/blfs/kde/core/kde-workspace.xml
   trunk/blfs/kde/core/kdelibs.xml
   trunk/blfs/kde/core/kdepimlibs.xml
   trunk/blfs/kde/core/kfilemetadata.xml
   trunk/blfs/kde/core/phonon-backend-gstreamer.xml
   trunk/blfs/kde/core/phonon-backend-vlc.xml
   trunk/blfs/kde/core/phonon.xml
   trunk/blfs/lxde/apps/gpicview.xml
   trunk/blfs/lxde/apps/lxappearance-obconf.xml
   trunk/blfs/lxde/apps/lxdm.xml
   trunk/blfs/lxde/desktop/libfm-extra.xml
   trunk/blfs/lxde/desktop/libfm.xml
   trunk/blfs/lxde/desktop/lxappearance.xml
   trunk/blfs/lxde/desktop/lxde-common.xml
   trunk/blfs/lxde/desktop/menu-cache.xml
   trunk/blfs/lxde/desktop/pcmanfm.xml
   trunk/blfs/multimedia/audioutils/amarok.xml
   trunk/blfs/multimedia/cdwriteutils/simpleburn.xml
   trunk/blfs/multimedia/libdriv/alsa-lib.xml
   trunk/blfs/multimedia/libdriv/alsa-tools.xml
   trunk/blfs/multimedia/libdriv/grilo.xml
   trunk/blfs/multimedia/libdriv/gst10-libav.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml
   trunk/blfs/multimedia/libdriv/gstreamer10.xml
   trunk/blfs/multimedia/libdriv/icedtea-sound.xml
   trunk/blfs/multimedia/libdriv/libdvdnav.xml
   trunk/blfs/multimedia/libdriv/libdvdread.xml
   trunk/blfs/multimedia/libdriv/pulseaudio.xml
   trunk/blfs/multimedia/libdriv/x264.xml
   trunk/blfs/multimedia/videoutils/ffmpeg.xml
   trunk/blfs/multimedia/videoutils/mplayer.xml
   trunk/blfs/multimedia/videoutils/xine-ui.xml
   trunk/blfs/networking/connect/dhcp.xml
   trunk/blfs/networking/mailnews/mutt.xml
   trunk/blfs/networking/netlibs/libpcap.xml
   trunk/blfs/networking/netlibs/serf.xml
   trunk/blfs/networking/netprogs/bridgeutils.xml
   trunk/blfs/networking/netprogs/cifsutils.xml
   trunk/blfs/networking/netprogs/samba.xml
   trunk/blfs/networking/netutils/avahi.xml
   trunk/blfs/networking/netutils/mod_dnssd.xml
   trunk/blfs/networking/netutils/nmap.xml
   trunk/blfs/networking/netutils/wireshark.xml
   trunk/blfs/postlfs/config/profile.xml
   trunk/blfs/postlfs/config/users.xml
   trunk/blfs/postlfs/editors/vim.xml
   trunk/blfs/postlfs/filesystems/fuse.xml
   trunk/blfs/postlfs/filesystems/lvm2.xml
   trunk/blfs/postlfs/filesystems/parted.xml
   trunk/blfs/postlfs/filesystems/xfsprogs.xml
   trunk/blfs/postlfs/security/cacerts.xml
   trunk/blfs/postlfs/security/cyrus-sasl.xml
   trunk/blfs/postlfs/security/gnupg2.xml
   trunk/blfs/postlfs/security/gnutls.xml
   trunk/blfs/postlfs/security/mitkrb.xml
   trunk/blfs/postlfs/security/nss.xml
   trunk/blfs/postlfs/security/openssh.xml
   trunk/blfs/postlfs/shells/zsh.xml
   trunk/blfs/postlfs/virtualization/qemu.xml
   trunk/blfs/pst/printing/cups-filters.xml
   trunk/blfs/pst/ps/psutils.xml
   trunk/blfs/pst/typesetting/biber.xml
   trunk/blfs/pst/typesetting/texlive.xml
   trunk/blfs/pst/typesetting/tl-installer.xml
   trunk/blfs/pst/typesetting/typesetting.xml
   trunk/blfs/server/databases/mariadb.xml
   trunk/blfs/server/databases/sqlite.xml
   trunk/blfs/server/mail/exim.xml
   trunk/blfs/server/mail/sendmail.xml
   trunk/blfs/server/major/bind.xml
   trunk/blfs/server/other/xinetd.xml
   trunk/blfs/x/installing/mesalib.xml
   trunk/blfs/x/installing/x7driver-ati.xml
   trunk/blfs/x/installing/x7driver-intel.xml
   trunk/blfs/x/installing/x7driver-nouveau.xml
   trunk/blfs/x/installing/x7driver-openchrome.xml
   trunk/blfs/x/installing/x7driver-synaptics.xml
   trunk/blfs/x/installing/x7driver-tdfx.xml
   trunk/blfs/x/installing/x7driver-vmmouse.xml
   trunk/blfs/x/installing/x7driver-vmware.xml
   trunk/blfs/x/installing/xorg-server.xml
   trunk/blfs/x/installing/xorg7.xml
   trunk/blfs/x/lib/libepoxy.xml
   trunk/blfs/x/lib/webkitgtk2.xml
   trunk/blfs/xfce/core/xfce4-power-manager.xml
   trunk/blfs/xsoft/graphweb/firefox.xml
   trunk/blfs/xsoft/graphweb/seamonkey.xml
   trunk/blfs/xsoft/office/libreoffice.xml
   trunk/blfs/xsoft/other/gimp.xml
   trunk/blfs/xsoft/other/icedtea-web.xml
   trunk/blfs/xsoft/other/pidgin.xml
   trunk/blfs/xsoft/other/thunderbird.xml
Log:
synchro screen

Modified: trunk/blfs/general/genlib/grantlee.xml
===================================================================
--- trunk/blfs/general/genlib/grantlee.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/grantlee.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -66,8 +66,8 @@
     suivantes </para>
 <screen>
 <userinput>mkdir build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+cd    build &&
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
       .. &&
 make</userinput>

Modified: trunk/blfs/general/genlib/icu.xml
===================================================================
--- trunk/blfs/general/genlib/icu.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/icu.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -64,7 +64,7 @@
     suivantes :</para>
 <screen>
 <userinput>cd source &&
-CXX=g++ ./configure --prefix=/usr &&
+./configure --prefix=/usr &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/general/genlib/libassuan.xml
===================================================================
--- trunk/blfs/general/genlib/libassuan.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/libassuan.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -54,7 +54,6 @@
         <para>Estimation du temps de construction : &libassuan-time;</para>
       </listitem>
     </itemizedlist>
-
       <bridgehead renderas="sect3">Téléchargements supplémentaires</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
@@ -64,9 +63,6 @@
           </para>
         </listitem>
       </itemizedlist>
-
-
-
     <bridgehead renderas="sect3">Dépendances de Libassuan</bridgehead>
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required"><xref linkend="libgpg-error"/></para>
@@ -89,8 +85,8 @@
     <para>Si vous souhaitez construire la documentation, 
     vous devez avoir installé <xref linkend="texlive"/>, et tapez les commandes suivantes :</para>
 <screen>
-<userinput>make -C doc pdf || true &&
-make -C doc ps</userinput>
+<userinput>patch -Np1 -i ../libassuan-&libassuan-version;-fix_doc_build-1.patch &&
+make -C doc pdf ps</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
@@ -102,7 +98,8 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>install -v -dm755 /usr/share/doc/libassuan-&libassuan-version; &&
-install -v -m644  doc/assuan.{pdf,ps,dvi}                   /usr/share/doc/libassuan-&libassuan-version;</userinput>
+install -v -m644  doc/assuan.{pdf,ps,dvi} \
+                  /usr/share/doc/libassuan-&libassuan-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/general/genlib/libatasmart.xml
===================================================================
--- trunk/blfs/general/genlib/libatasmart.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/libatasmart.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY libatasmart-download-http "http://0pointer.de/public/libatasmart-&libatasmart-version;.tar.xz">-->
   <!ENTITY libatasmart-download-http "&fedora-http-repo;/libatasmart/libatasmart-&libatasmart-version;.tar.xz/&libatasmart-md5sum;/libatasmart-&libatasmart-version;.tar.xz">
   <!ENTITY libatasmart-download-ftp  " ">
   <!ENTITY libatasmart-md5sum        "53afe2b155c36f658e121fe6def33e77">

Modified: trunk/blfs/general/genlib/libdaemon.xml
===================================================================
--- trunk/blfs/general/genlib/libdaemon.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/libdaemon.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY libdaemon-download-http "http://0pointer.de/lennart/projects/libdaemon/libdaemon-&libdaemon-version;.tar.gz">-->
   <!ENTITY libdaemon-download-http "&fedora-http-repo;/libdaemon/libdaemon-&libdaemon-version;.tar.gz/&libdaemon-md5sum;/libdaemon-&libdaemon-version;.tar.gz">
   <!ENTITY libdaemon-download-ftp  " ">
   <!ENTITY libdaemon-md5sum        "509dc27107c21bcd9fbf2f95f5669563">

Modified: trunk/blfs/general/genlib/libdbusmenuqt.xml
===================================================================
--- trunk/blfs/general/genlib/libdbusmenuqt.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/libdbusmenuqt.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -65,9 +65,9 @@
     commandes suivantes :</para>
 <screen>
 <userinput>mkdir build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
-      -DCMAKE_BUILD_TYPE=Release     \
+cd    build &&
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
       -DWITH_DOC=OFF .. &&
 make</userinput>
 </screen>

Modified: trunk/blfs/general/genlib/libgcrypt.xml
===================================================================
--- trunk/blfs/general/genlib/libgcrypt.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/libgcrypt.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -84,15 +84,19 @@
 <screen role="root">
 <userinput>make install &&
 install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version; &&
-install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*}                     /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput>
+install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*} \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput>
 </screen>
     <para>Si vous avez construit la documentation supplémentaire, installez-la en exécutant
     les commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version;/html &&
-install -v -m644 doc/gcrypt.html/*                     /usr/share/doc/libgcrypt-&libgcrypt-version;/html &&
-install -v -m644 doc/gcrypt_nochunks.html                     /usr/share/doc/libgcrypt-&libgcrypt-version; &&
-install -v -m644 doc/gcrypt.{pdf,ps,dvi,txt,texi}                     /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput>
+install -v -m644 doc/gcrypt.html/* \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;/html &&
+install -v -m644 doc/gcrypt_nochunks.html \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version; &&
+install -v -m644 doc/gcrypt.{pdf,ps,dvi,txt,texi} \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/general/genlib/libpaper.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/genlib/libsigsegv.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/genlib/nspr.xml
===================================================================
--- trunk/blfs/general/genlib/nspr.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/nspr.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -58,9 +58,12 @@
     suivantes :</para>
 <screen>
 <userinput>cd nspr                                                     &&
-sed -ri 's#^(RELEASE_BINS =).*#1#' pr/src/misc/Makefile.in &&
+sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in &&
 sed -i 's#$(LIBRARY) ##' config/rules.mk                    &&
-./configure --prefix=/usr             --with-mozilla             --with-pthreads             $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
+./configure --prefix=/usr \
+            --with-mozilla \
+            --with-pthreads \
+            $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/general/genlib/openobex.xml
===================================================================
--- trunk/blfs/general/genlib/openobex.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/openobex.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -87,10 +87,9 @@
     <para><application>OpenOBEX</application> installe une regle udev qui demande un nom de groupe 
     plugdev.  Créez ce groupe en tant qu'utilisateur 
     <systemitem class="username">root</systemitem> :</para>
-<screen role="root"><userinput>groupadd -g 90 plugdev</userinput></screen>
-
-
-
+<screen role="root">
+<userinput>groupadd -g 90 plugdev</userinput>
+</screen>
     <para>
       Installez <application>OpenOBEX</application> en lançant les commandes suivantes :
       

Modified: trunk/blfs/general/genlib/qca.xml
===================================================================
--- trunk/blfs/general/genlib/qca.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/qca.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -64,9 +64,9 @@
     suivantes :</para>
 <screen>
 <userinput>sed -i '217s at set@this->set@' src/botantools/botan/botan/secmem.h &&
-./configure --prefix=&qt4-dir; \
-            --certstore-path=/etc/ssl/ca-bundle.crt \
-	    --no-separate-debug-info &&
+./configure --prefix=/usr            \
+	         --no-separate-debug-info \
+            --certstore-path=/etc/ssl/ca-bundle.crt &&
 make</userinput>
 </screen>
  <para>Pour tester les résultats, tapez <command>make test</command>.</para>

Modified: trunk/blfs/general/genlib/qjson.xml
===================================================================
--- trunk/blfs/general/genlib/qjson.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/qjson.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -79,8 +79,8 @@
 <screen>
 <userinput>mkdir build &&
 cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
-      -DCMAKE_BUILD_TYPE=Release \
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
       .. &&
 make</userinput>
 </screen>

Modified: trunk/blfs/general/genlib/xapian.xml
===================================================================
--- trunk/blfs/general/genlib/xapian.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genlib/xapian.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -55,7 +55,8 @@
     <title>Installation de Xapian</title>
     <para>Installez <application>Xapian</application> en lançant les comandes suivantes </para>
 <screen>
-<userinput>./configure --prefix=/usr           --disable-static &&
+<userinput>./configure --prefix=/usr \
+          --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/genutils/appstream-glib.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/genutils/imagemagick.xml
===================================================================
--- trunk/blfs/general/genutils/imagemagick.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genutils/imagemagick.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -118,7 +118,6 @@
       FlashPIX (libfpx)</ulink>,
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
-
       <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
       <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
  <ulink url="http://sourceforge.net/projects/openjpeg.mirror/">OpenJPEG 2</ulink>, et
@@ -163,7 +162,12 @@
     suivantes :</para>
  
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --with-modules                --with-perl                   --disable-static  &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --enable-hdri     \
+            --with-modules    \
+            --with-perl       \
+            --disable-static  &&
 make</userinput>
 </screen>
      <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/general/genutils/iso-codes.xml
===================================================================
--- trunk/blfs/general/genutils/iso-codes.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/genutils/iso-codes.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,9 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--
-<!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
--->
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
   <!ENTITY iso-codes-md5sum        "d032b2f9750bd59d350e0ccb060c8710">

Modified: trunk/blfs/general/graphlib/harfbuzz.xml
===================================================================
--- trunk/blfs/general/graphlib/harfbuzz.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/graphlib/harfbuzz.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -92,15 +92,14 @@
   </sect2>
   <sect2 role="installation">
     <title>Installation de Harfbuzz</title>
-
      <para>
       si vous souhaitez lancer la suite de tests, lancer les commandes suivantes, pour
       désactiver un test qui échoue:
     </para>
-<screen><userinput>sed -i '/arabic-fallback-shaping.tests/d' test/shaping/Makefile.am &&
-autoreconf -f -i</userinput></screen>
-
-
+<screen>
+<userinput>sed -i '/arabic-fallback-shaping.tests/d' test/shaping/Makefile.am &&
+autoreconf -f -i</userinput>
+</screen>
     <para>
       Installez <application>Harfbuzz</application> en lançant les commandes suivantes :
       

Modified: trunk/blfs/general/graphlib/librsvg.xml
===================================================================
--- trunk/blfs/general/graphlib/librsvg.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/graphlib/librsvg.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -76,7 +76,9 @@
     <para>Installez <application>librsvg</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --enable-vala             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --enable-vala \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make -k check</command>.</para>

Modified: trunk/blfs/general/graphlib/libwebp.xml
===================================================================
--- trunk/blfs/general/graphlib/libwebp.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/graphlib/libwebp.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -84,8 +84,7 @@
        
     </para>
 <screen>
-<userinput>sed -i '/DGifCloseFile/s:gif:&, NULL:g' examples/gif2webp.c &&
-./configure --prefix=/usr --disable-static &&
+<userinput>./configure --prefix=/usr --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/graphlib/poppler.xml
===================================================================
--- trunk/blfs/general/graphlib/poppler.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/graphlib/poppler.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -124,7 +124,10 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --enable-xpdf-headers &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-xpdf-headers &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez : <command>make check</command>.

Modified: trunk/blfs/general/prog/clisp.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/prog/doxygen.xml
===================================================================
--- trunk/blfs/general/prog/doxygen.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/doxygen.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -78,7 +78,8 @@
     <para>Installez <application>Doxygen</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix /usr             --docdir /usr/share/doc/doxygen-&doxygen-version; &&
+<userinput>./configure --prefix /usr \
+            --docdir /usr/share/doc/doxygen-&doxygen-version; &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/general/prog/elfutils.xml
===================================================================
--- trunk/blfs/general/prog/elfutils.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/elfutils.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -78,9 +78,11 @@
     <para>
      si vous souhaitez lancer la suite de tests, en premier corrigez la pour passer deux tests qui échouent:
    </para>
-<screen><userinput>sed -i '/srcdir/ iexit 77\n'         \
+<screen>
+<userinput>sed -i '/srcdir/ iexit 77\n'         \
        tests/run-backtrace-native.sh \
-       tests/run-backtrace-native-core.sh</userinput></screen>
+       tests/run-backtrace-native-core.sh</userinput>
+</screen>
     <para>
     Pour tester le résultat, tapez : <command>make check</command>. 
     </para>

Modified: trunk/blfs/general/prog/gcc-ada.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/prog/gcc-java.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/prog/gcc.xml
===================================================================
--- trunk/blfs/general/prog/gcc.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/gcc.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -91,9 +91,6 @@
         </para>
       </listitem>
     </itemizedlist>
-
-
-
 <bridgehead renderas="sect3">Dépendances de GCC</bridgehead>
     
     
@@ -140,7 +137,7 @@
 </screen>
    <para>Installez <application>GCC</application> en lançant les commandes suivantes:</para>
 <screen>
-<userinput>
+<userinput>patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch    &&
 mkdir ../gcc-build                                   &&
 cd    ../gcc-build                                   &&
 ../gcc-&gcc-version;/configure                               \
@@ -205,9 +202,6 @@
       ce correctif corrige des bogues dans le compilateur C++, qui aboutissent à des erreurs de
        segmentation dans certain cas.
      </para>
-
-
-
 <para><command>mkdir ../gcc-build; cd ../gcc-build</command> : La
     documentation de <application>GCC</application> recommande de construire
     le paquet dans un répertoire de construction dédié.</para>

Modified: trunk/blfs/general/prog/git.xml
===================================================================
--- trunk/blfs/general/prog/git.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/git.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -100,17 +100,15 @@
     <para>Installez <application>Git</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                     --with-gitconfig=/etc/gitconfig &&
+<userinput>./configure --prefix=/usr         \
+            --with-gitconfig=/etc/gitconfig &&
 make</userinput>
 </screen>
-
      <para>
       Vous pouvez construire les pages de manuel et/ou les docs html, ou
       utiliser les versions téléchargées. Si vous choisissez de les construire, utilisez les deux instructions
       suivantes.
     </para>
-
-
     <para>Si vous avez installé <ulink
     url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> et
     <xref linkend="xmlto"/> vous pouvez créer la version html des pages de manuel
@@ -143,49 +141,30 @@
     <para>Installez les docs html en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make htmldir=/usr/share/doc/git-&git-version; install-html              &&
-mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &&
-mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &&
-mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &&
-mv       /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &&
-mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &&
-mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &&
-mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &&
-mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput>
+<userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput>
 </screen>
  <bridgehead renderas="sect3">Si vous avez téléchargé les pages de man et/ou les docs html</bridgehead>
     <para>Si vous avez téléchargé les pages de manuel déballez les en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>tar -xf ../git-manpages-&git-version;.tar.xz -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput>
+<userinput>tar -xf ../git-manpages-&git-version;.tar.xz \
+    -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput>
 </screen>
     <para>Si vous avez téléchargé les documentations HTML déballez les en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
-tar -xf  ../git-htmldocs-&git-version;.tar.xz     -C   /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &&
-find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} ;     &&
-find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} ;     &&
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &&
-mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &&
-mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &&
-mv       /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &&
-mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &&
-mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &&
-mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &&
-mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput>
+<userinput>tar -xf  ../git-htmldocs-&git-version;.tar.xz \
+    -C   /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &&
+find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;     &&
+find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput>
 </screen>
-
    <bridgehead renderas="sect3">Reorganisez les pages de man et.ou les docs html (pour les deux méthodes)</bridgehead>
-
     <para>
       Pour les deux méthodes, réorganisez les fichiers, en tant qu'utilisateur
       <systemitem class="username">root</systemitem>:
     </para>
-
-<screen role="root"><userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
-
+<screen role="root">
+<userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
 mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &&
 mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &&
 mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &&
@@ -193,13 +172,8 @@
 mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &&
 mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &&
 mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &&
-mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen>
-
-
-
-
-
-
+mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput>
+</screen>
   </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>

Modified: trunk/blfs/general/prog/llvm.xml
===================================================================
--- trunk/blfs/general/prog/llvm.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/llvm.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -126,17 +126,24 @@
     <para>Si vous avez téléchargé les paquets facultatifs,
     installez-les dans l'arborescence des sources :</para>
 <screen>
-<userinput>tar -xf ../cfe-&llvm-version;.src.tar.gz -C tools &&
-tar -xf ../compiler-rt-&rt-version;.src.tar.gz -C projects &&
+<userinput>tar -xf ../cfe-&llvm-version;.src.tar.xz -C tools &&
+tar -xf ../compiler-rt-&rt-version;.src.tar.xz -C projects &&
 mv tools/cfe-&llvm-version;.src tools/clang &&
-mv projects/compiler-rt-&rt-version; projects/compiler-rt</userinput>
+mv projects/compiler-rt-&rt-version;.src projects/compiler-rt</userinput>
 </screen>
     <para>
       Installez <application>LLVM</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>sed -e 's:/docs/llvm:/share/doc/llvm-&llvm-version;:'     -i Makefile.config.in &&
-CC=gcc CXX=g++                         ./configure --prefix=/usr                          --sysconfdir=/etc                      --enable-libffi                        --enable-optimized                     --enable-shared                        --disable-assertions       &&
+<userinput>sed -e "s:/docs/llvm:/share/doc/llvm-&llvm-version;:" \
+    -i Makefile.config.in &&
+CC=gcc CXX=g++                         \
+./configure --prefix=/usr              \
+            --sysconfdir=/etc          \
+            --enable-libffi            \
+            --enable-optimized         \
+            --enable-shared            \
+            --disable-assertions       &&
 make</userinput>
 </screen>
     <para>
@@ -190,8 +197,6 @@
       <command>sed -e ... Makefile.config.in</command>: Ce sed corrige l'emplacement d'installation de la 
       documentation.
     </para>
-
-
     <para>
       <parameter>--enable-libffi</parameter>: Ce paramètre initialise 
       <application>LLVM</application> pour utiliser

Modified: trunk/blfs/general/prog/mercurial.xml
===================================================================
--- trunk/blfs/general/prog/mercurial.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/mercurial.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -97,7 +97,8 @@
   test-patchbomb.t</literal>
 EOF
 rm -rf tests/tmp &&
-TESTFLAGS="--tmpdir tmp --blacklist blacklists/test-failed" make check</userinput>
+TESTFLAGS="--tmpdir tmp --blacklist blacklists/test-failed" \
+make check</userinput>
 </screen>
     <para>Les tests peuvent être fait en parallèle, ajoutez juste
     <quote>-j$(getconf _NPROCESSORS_ONLN)</quote> à TESTFLAGS.</para>

Modified: trunk/blfs/general/prog/openjdk.xml
===================================================================
--- trunk/blfs/general/prog/openjdk.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/openjdk.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -223,10 +223,6 @@
         </para>
       </listitem>
     </itemizedlist>
-
-
-
-
     <bridgehead renderas="sect3">Dépendances de OpenJDK</bridgehead>
     <bridgehead renderas="sect4">Dépendances requises</bridgehead>
     <para role="required">
@@ -313,7 +309,6 @@
 <screen>
 <userinput>patch -Np1 -i ../icedtea-&icedtea-version;-fix_tests-1.patch</userinput>
 </screen>
-
     <note>
       <para>
          Avant de continuer, vous devez vous assurer que votre environnement est correctement
@@ -326,9 +321,6 @@
          <xref linkend="java"/> et <xref linkend="junit"/>.
        </para>
     </note>
-
-
-
     <para>Configurez et construisez le paquet avec les commandes suivantes 
    (les valeurs de with-pkgversion et de with-version-suffix peuvent être modifiées selon les préférences
    de l'utilisateur):
@@ -336,7 +328,11 @@
 <screen>
 <userinput>unset JAVA_HOME                                               &&
 ./autogen.sh                                                  &&
-./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin                     --with-version-suffix=BLFS                                    --enable-nss                                                  --disable-system-kerberos                                     --with-parallel-jobs                              &&
+./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin         \
+            --with-version-suffix=BLFS                        \
+            --enable-nss                                      \
+            --disable-system-kerberos                         \
+            --with-parallel-jobs                              &&
 make</userinput>
 </screen>
     <note><para>Si vous n'avez pas installé l'archive spécifiée précédemment,
@@ -377,11 +373,17 @@
     <para>si vous le souhaitez, vous pouvez installer un fichier .desktop
 correspondant à une netrée dans le menu du bureau pour <command>policytool</command>. En premier,
 vous devez obtenir un icone de <xref linkend="icedtea-web"/>:</para>
-<screen role="root"><userinput>tar -xf icedtea-web-&icedtea-web-version;.tar.gz icedtea-web-&icedtea-web-version;/javaws.png --strip-components=1</userinput></screen>
+<screen>
+<userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz  \
+        icedtea-web-&icedtea-web-version;/javaws.png \
+        --strip-components=1</userinput>
+</screen>
 <para>
 Maintenant, en tant
 qu'utilisateur <systemitem class="username">root</systemitem> :</para>
-<screen role="root"><userinput>cat >> /usr/share/applications/openjdk-7-policytool.desktop << "EOF" &&
+<screen role="root">
+<userinput>mkdir -pv /usr/share/applications &&
+cat > /usr/share/applications/openjdk-7-policytool.desktop << "EOF" &&
 <literal>[Desktop Entry]
 Name=OpenJDK Java 7 Policy Tool
 Name[pt_BR]=OpenJDK Java 7 - Ferramenta de Política
@@ -393,8 +395,8 @@
 Icon=javaws
 Categories=Settings;</literal>
 EOF
-install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png &&</userinput></screen>
-
+install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput>
+</screen>
     <para>Le choix de pt_BR est juste un exemple. Vous pouvez ajouter des traductions en ajoutant
     les lignes correspondantes à votre locale, par exemple
     fr_FR, avec les valeurs 
@@ -448,8 +450,11 @@
 <literal># Begin /etc/profile.d/openjdk.sh
 # Set JAVA_HOME directory
 JAVA_HOME=/opt/jdk
+# Set ANT_HOME directory
+ANT_HOME=/opt/ant
 # Adjust PATH
 pathappend $JAVA_HOME/bin PATH
+pathappend $ANT_HOME/bin PATH
 # Auto Java CLASSPATH
 # Copy jar files to, or create symlinks in this directory
 AUTO_CLASSPATH_DIR=/usr/share/java
@@ -460,7 +465,7 @@
 for jar in `find ${AUTO_CLASSPATH_DIR} -name "*.jar" 2>/dev/null`; do
     pathappend $jar CLASSPATH
 done
-export JAVA_HOME CLASSPATH
+export JAVA_HOME ANT_HOME CLASSPATH
 unset AUTO_CLASSPATH_DIR dir jar
 # End /etc/profile.d/openjdk.sh</literal>
 EOF</userinput>
@@ -468,16 +473,22 @@
     <para>Finalement, ajoutez les pages de man dans la configuration de <application>man_db</application>.
     En tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>cat >> /etc/man_db.conf << "EOF" &&
-<literal>MANDATORY_MANPATH     /opt/jdk/man
+<userinput>cat >> /etc/profile.d/extrapaths.sh << "EOF" &&
+# Begin Java addition
+<literal>pathappend /opt/jdk/man       MANPATH
+# End Java addition</literal>
+EOF
+cat >> /etc/man_db.conf << "EOF" &&
+<literal># Begin Java addition
+MANDATORY_MANPATH     /opt/jdk/man
 MANPATH_MAP           /opt/jdk/bin     /opt/jdk/man
-MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk</literal>
+MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk
+# End Java addition</literal>
 EOF
 mandb -c /opt/jdk/man</userinput>
 </screen>
 <para>Pour tester que les pages de man sont correctement installées, tapez <command>source /etc/profile</command> et <command>man java</command> pour afficher les pages de man respectives.</para>
  
-
     </sect3>
     
     <sect3 id='ojdk-certs'>
@@ -580,19 +591,23 @@
     {
         echo "`basename ${0}` creates a valid cacerts file for use with IcedTea."
         echo ""
-        echo "        -f  --cafile        The path to a file containing PEM formated CA"
-        echo "                            certificates.  May not be used with -d/--cadir."
-        echo "        -d  --cadir         The path to a diectory of PEM formatted CA"
-        echo "                            certificates.  May not be used with -f/--cafile."
-        echo "        -o  --outfile       The path to the output file."
+        echo "        -f  --cafile     The path to a file containing PEM"
+        echo "                         formated CA certificates. May not be"
+        echo "                         used with -d/--cadir."
         echo ""
-        echo "        -k  --keytool       The path to the java keytool utility."
+        echo "        -d  --cadir      The path to a directory of PEM formatted"
+        echo "                         CA certificates. May not be used with"
+        echo "                         -f/--cafile."
         echo ""
-        echo "        -s  --openssl       The path to the openssl utility."
+        echo "        -o  --outfile    The path to the output file."
         echo ""
-        echo "        -h  --help          Show this help message and exit."
+        echo "        -k  --keytool    The path to the java keytool utility."
         echo ""
+        echo "        -s  --openssl    The path to the openssl utility."
         echo ""
+        echo "        -h  --help       Show this help message and exit."
+        echo ""
+        echo ""
     }
 # Initialize empty variables so that the shell does not pollute the script
 CAFILE=""
@@ -608,31 +623,31 @@
 # Handle common errors
 if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then
     echo "ERROR!  You must provide an x509 certificate store!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then
     echo "ERROR!  You cannot provide two x509 certificate stores!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${KEYTOOL}x" == "x" ; then
     echo "ERROR!  You must provide a valid keytool program!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${OPENSSL}x" == "x" ; then
     echo "ERROR!  You must provide a valid path to openssl!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${OUTFILE}x" == "x" ; then
     echo "ERROR!  You must provide a valid output file!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
@@ -674,7 +689,11 @@
     certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
     certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
     sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
-    echo yes | env LC_ALL=C "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore                    "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
+    echo yes | env LC_ALL=C "${KEYTOOL}" -import                     \
+                                         -alias `basename "${cert}"` \
+                                         -keystore "${OUTFILE}"      \
+                                         -storepass 'changeit'       \
+                                         -file "${tempfile}"
     rm "${tempfile}"
 done
 if test "${TEMPDIR}x" != "x" ; then
@@ -696,7 +715,11 @@
     Ensuite vous pouvez en créer un nouveau, en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>/opt/jdk/bin/mkcacerts -d "/etc/ssl/certs/"  -k "/opt/jdk/bin/keytool"                        -s "/usr/bin/openssl" -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
+<userinput>/opt/jdk/bin/mkcacerts            \
+        -d "/etc/ssl/certs/"      \
+        -k "/opt/jdk/bin/keytool" \
+        -s "/usr/bin/openssl"     \
+        -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
 </screen>
     </sect3> 
   </sect2>

Modified: trunk/blfs/general/prog/perl-modules.xml
===================================================================
--- trunk/blfs/general/prog/perl-modules.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/perl-modules.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,28 +3,21 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY perl_modules_md5sums_download_http "&sources-anduin-http;/perl-modules/">
   <!ENTITY perl_modules_md5sums_download_ftp  "&sources-anduin-ftp;/perl-modules/">
 ]>
-
 <sect1 id="perl-modules" xreflabel="Perl modules">
   <?dbhtml filename="perl-modules.html" ?>
-
   <sect1info>
     <othername>$LastChangedBy: ken $</othername>
     <date>$Date: 2014-08-30 06:50:58 +0200 (sam. 30 août 2014) $</date>
   </sect1info>
-
   <title>Modules Perl</title>
-
   <indexterm zone="perl-modules">
     <primary sortas="a-Perl-modules">Modules Perl</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction aux modules Perl</title>
-
     <para>Les paquets de modules <application>Perl</application> ajoutent des
     objets utiles au langage <application>Perl</application>. Voici les modules
     utilisés par paquets à travers BLFS avec leurs dépendances.
@@ -32,77 +25,51 @@
     installant les dépendances dans l'ordre indiqué. Les instructions
     d'installation et de construction du modules Perl standard sont montrés à la fin de cette page.
     </para>
-
-    <!-- <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download MD5 sums (HTTP):
-        <ulink url="&perl_modules_md5sums_download_http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sums (FTP):
-        <ulink url="&perl_modules_md5sums_download_ftp;"/></para>
-      </listitem>
-    </itemizedlist> -->
-
-    <!-- Archive::Zip -->
+    
+    
     <bridgehead renderas="sect3" id="perl-archive-zip"
     xreflabel="Archive::Zip-&Archive-Zip-version;">
     Archive::Zip-&Archive-Zip-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-archive-zip">
       <primary sortas="a-Archive-Zip">Archive::Zip</primary>
     </indexterm>
-
     <para>Le module Archive::Zip permet à un programme <application>Perl</application>
     de créer, de manipuler, de lire et d'écrire des fichiers d'archives
     Zip. Ce module utilise le standard <xref linkend="perl-standard-install"/>.</para>
-
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url="http://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">Archive::Zip-&Archive-Zip-version;</ulink> 
 http://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz 
 MD5 sum: e804985def2c1f0ed640ab4ca6aa85a1</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- autovivification -->
+    
     <bridgehead renderas="sect3" id="perl-autovivification"
     xreflabel="autovivification-&autovivification-version;">
     autovivification-&autovivification-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-autovivification">
       <primary sortas="a-autovivification">autovivification</primary>
     </indexterm>
-
     <para>Le module autovivification vous permet de désactiver l'autovivification. Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url="http://www.cpan.org/authors/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz">autovivification-&autovivification-version;</ulink> 
 http://www.cpan.org/authors/id/V/VP/VPIT/autovification-&autovivification-version;.tar.gz 
 MD5 sum: 871ce0e9b93ef616da7cfa91dbd2772e</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- Business::ISBN -->
+    
     <bridgehead renderas="sect3" id="perl-business-isbn"
     xreflabel="Business::ISBN-&Business-ISBN-version;">
     Business::ISBN-&Business-ISBN-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-business-isbn">
       <primary sortas="a-Business-ISBN">Business::ISBN</primary>
     </indexterm>
-
     <para>Le module Business::ISBN est pour travailler avec les "International Standard Book
     Numbers". Ce module et ses dépendances utilisent le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">Business::ISBN-&Business-ISBN-version;</ulink> 
 http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz 
@@ -114,22 +81,17 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- Business::ISMN -->
+    
     <bridgehead renderas="sect3" id="perl-business-ismn"
     xreflabel="Business::ISMN-&Business-ISMN-version;">
     Business::ISMN-&Business-ISMN-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-business-ismn">
       <primary sortas="a-Business-ISMN">Business::ISMN</primary>
     </indexterm>
-
     <para>Le module Business::ISMN est pour travailler avec les "International Standard
     Music Numbers". Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz">Business::ISMN-&Business-ISMN-version;</ulink> 
 http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz 
@@ -141,44 +103,34 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- Business::ISSN -->
+    
     <bridgehead renderas="sect3" id="perl-business-issn"
     xreflabel="Business::ISSN-&Business-ISSN-version;">
     Business::ISSN-&Business-ISSN-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-business-issn">
       <primary sortas="a-Business-ISSN">Business::ISSN</primary>
     </indexterm>
-
     <para>Le module Business::ISSN est pour travailler avec les "International Standard
     Serial Numbers".  Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISSN-&Business-ISSN-version;.tar.gz">Business::ISSN-&Business-ISSN-version;</ulink> 
 http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISSN-&Business-ISSN-version;.tar.gz 
 MD5 sum: d1f609422d3a0ad5e301ae694d142fe4</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- Data::Compare -->
+    
     <bridgehead renderas="sect3" id="perl-data-compare"
     xreflabel="Data::Compare-&Data-Compare-version;">
     Data::Compare-&Data-Compare-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-data-compare">
       <primary sortas="a-Data-Compare">Data::Compare</primary>
     </indexterm>
-
     <para>Le module Data::Compare compare deux structures de données <application>perl</application>.
     Ce module est ses dépendances utilient le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/D/DC/DCANTRELL/Data-Compare-&Data-Compare-version;.tar.gz">Data::Compare-&Data-Compare-version;</ulink> 
 http://www.cpan.org/authors/id/D/DC/DCANTRELL/Data-Compare-&Data-Compare-version;.tar.gz 
@@ -186,7 +138,6 @@
         <itemizedlist>
           <listitem> <literallayout><ulink url="http://search.cpan.org/~rclamp/File-Find-Rule/">File::Find::Rule</ulink>
 (http://search.cpan.org/~rclamp/File-Find-Rule/) 
-
 </literallayout>
             <itemizedlist>
               <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Number-Compare/">Number::Compare</ulink>
@@ -200,140 +151,108 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- Date::Simple -->
+    
     <bridgehead renderas="sect3" id="perl-date-simple"
     xreflabel="Date::Simple-&Date-Simple-version;">
     Date::Simple-&Date-Simple-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-date-simple">
       <primary sortas="a-Date-Simple">Date::Simple</primary>
     </indexterm>
-
     <para>Date::Simple fournit un objet date simple. Ce module utilise le standard
      <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/I/IZ/IZUT/Date-Simple-&Date-Simple-version;.tar.gz">Date::Simple-&Date-Simple-version;</ulink> 
 http://www.cpan.org/authors/id/I/IZ/IZUT/Date-Simple-&Date-Simple-version;.tar.gz 
 MD5 sum: 436049dc2c7dfd8423d8bcc807248b31</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- Encode-EUCJPASCII -->
+    
     <bridgehead renderas="sect3" id="perl-encode-eucjpascii"
     xreflabel="Encode::EUCJPASCII-&Encode-EUCJPASCII-version;">
     Encode::EUCJPASCII-&Encode-EUCJPASCII-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-encode-eucjpascii">
       <primary sortas="a-Encode-EUCJPASCII">Encode-EUCJPASCII</primary>
     </indexterm>
-
     <para>Encode::EUCJPASCII fournit un mappage eucJP-open mapping. Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-&Encode-EUCJPASCII-version;.tar.gz">Encode-EUCJPASCII-&Encode-EUCJPASCII-version;</ulink> 
 http://www.cpan.org/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-&Encode-EUCJPASCII-version;.tar.gz 
 MD5 sum: 5daa65f55b7c2050bb0713d9e95f239d</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- Encode::HanExtra -->
+    
     <bridgehead renderas="sect3" id="perl-encode-hanextra"
     xreflabel="Encode::HanExtra-&Encode-HanExtra-version;">
     Encode::HanExtra-&Encode-HanExtra-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-encode-hanextra">
       <primary sortas="a-Encode-HanExtra">Encode::HanExtra</primary>
     </indexterm>
-
     <para>Le module Encode::HanExtra fournit des ensembles supplémentaires d'encodage Chinois.
     Ce module utilise le standard <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">Encode::HanExtra-&Encode-HanExtra-version;</ulink> 
 http://www.cpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-&Business-ISSN-version;.tar.gz 
 MD5 sum: e1d3bc32c1c8ee304235a06fbcd5d5a4</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- Encode::JIS2K -->
+    
     <bridgehead renderas="sect3" id="perl-encode-jis2k"
     xreflabel="Encode::JIS2K-&Encode-JIS2K-version;">
     Encode::JIS2K-&Encode-JIS2K-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-encode-jis2k">
       <primary sortas="a-Encode-JIS2K">Encode::JIS2K</primary>
     </indexterm>
-
     <para>Le module Encode::JIS2K fournit l'encodage JIS X 0212 (c'est à dire JIS 2000).
     Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/D/DA/DANKOGAI/Encode-JIS2K-&Encode-JIS2K-version;.tar.gz">Encode::JIS2K-&Encode-JIS2K-version;</ulink> 
 http://www.cpan.org/authors/id/D/DA/DANKOGAI/Encode-JIS2K-&Business-ISSN-version;.tar.gz 
 MD5 sum: 00e73ee943fb2f882b00b7b61e4c9db1</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- File::Slurp -->
+    
     <bridgehead renderas="sect3" id="perl-file-slurp"
     xreflabel="File::Slurp-&File-Slurp-version;">
     File::Slurp-&File-Slurp-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-file-slurp">
       <primary sortas="a-File-Slurp">File::Slurp</primary>
     </indexterm>
-
     <para>Le module File::Slurp fournit un moyen simple et efficace
     d'écrire/lire/modifier des fichiers complets.
     Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/U/UR/URI/File-Slurp-&File-Slurp-version;.tar.gz">File::Slurp-&File-Slurp-version;</ulink> 
 http://www.cpan.org/authors/id/U/UR/URI/File-Slurp-&Business-ISSN-version;.tar.gz 
 MD5 sum: 7d584cd15c4f8b9547765eff8c4ef078</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- File::Which -->
+    
     <bridgehead renderas="sect3" id="perl-file-which"
     xreflabel="File::Which-&File-Which-version;">
     File::Which-&File-Which-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-file-which">
       <primary sortas="a-File-Which">File::Which</primary>
     </indexterm>
-
     <para>File::Which fournit une implémentation portable de l'utilitaire
     'which'. Ce module et ses dépendances utilisent le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://www.cpan.org/authors/id/A/AD/ADAMK/File-Which-&File-Which-version;.tar.gz">File::Which-&File-Which-version;</ulink> 
 http://www.cpan.org/authors/id/A/AD/ADAMK/File-Which-&File-Which-version;.tar.gz 
 MD5 sum: b9429edaad7f45caafa4d458afcfd8af 
-
 </literallayout>
         <itemizedlist>
           <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Test-Script/">Test::Script</ulink>
 (http://search.cpan.org/dist/Test-Script/)
-
 </literallayout>
             <itemizedlist>
               <listitem>
@@ -343,81 +262,26 @@
               </listitem>
               <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Probe-Perl/">Probe-Perl</ulink>
 (http://search.cpan.org/dist/Probe-Perl/
-
 </literallayout>
-       <!--     <itemizedlist>
-                  <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Encode-ISO2022/">Encode-ISO2022</ulink>
-(http://search.cpan.org/dist/Encode-ISO2022/>)
-
-</literallayout>
-                  </listitem>
-                </itemizedlist> -->
+       
               </listitem>
             </itemizedlist>
           </listitem>
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-<!--    <!- Glib ->
-    <bridgehead renderas="sect3" id="perl-glib"
-    xreflabel="Glib-&Glib-perl-version;">
-    Glib-&Glib-perl-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-glib">
-      <primary sortas="a-Glib">Glib</primary>
-    </indexterm>
-
-    <para>
-      This module is a <application>Perl</application> wrapper around
-      <application>GLib</application> that attempts to provide a perlish
-      interface while remaining as true as possible to the underlying C API, so
-      that any reference materials you can find on using GLib may still apply to
-      using the libraries from Perl. This module and the dependency modules use
-      the standard <xref linkend="perl-standard-install"/>.
-    </para>
-
-    &lfs7 4_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/T/TS/TSCH/Glib-&Glib-perl-version;.tar.gz">
-          Glib-&Glib-perl-version;</ulink> (MD5 sum: 1d81a8aec5f7f1182a96cfaaf119d866)
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <ulink url="http://search.cpan.org/~xaoc/ExtUtils-PkgConfig/">ExtUtils::PkgConfig</ulink>
-            </para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ulink url="http://search.cpan.org/~flora/ExtUtils-Depends/">ExtUtils::Depends</ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
--->
-    <!-- HTML::Parser -->
+    
     <bridgehead renderas="sect3" id="perl-html-parser"
     xreflabel="HTML::Parser-&HTML-Parser-version;">
     HTML::Parser-&HTML-Parser-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-html-parser">
       <primary sortas="a-HTML-Parser">HTML::Parser</primary>
     </indexterm>
-
     <para>La distribution HTML::Parser est un ensemble de modules qui analysent
     et extraient des informations à partir de documents HTML. Ce module et
     les modules dépendants utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url="http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">HTML::Parser-&HTML-Parser-version;</ulink> 
 http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz 
@@ -436,97 +300,31 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- HTML::TableExtract
-    <bridgehead renderas="sect3" id="perl-html-tableextract"
-    xreflabel="HTML::TableExtract-&HTML-TableExtract-version;">
-    HTML::TableExtract-&HTML-TableExtract-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-html-tableextract">
-      <primary sortas="a-HTML-TableExtract">HTML::TableExtract</primary>
-    </indexterm>
-
-    <para>HTML::TableExtract is a module that simplifies the extraction of the
-    content contained in tables within HTML documents, extracted either as
-    text or encoded element trees. Tables of note may be specified using
-    Headers, Depth, Count, Attributes, or some combination of the four. This
-    module and dependency modules use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://cpan.org/authors/id/M/MS/MSISK/HTML-TableExtract-&HTML-TableExtract-version;.tar.gz">
-          HTML::TableExtract-&HTML-TableExtract-version;</ulink> (MD5sum: ac1b8fa092d53931a9f3fdbba330f5b0)
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <ulink url="http://search.cpan.org/~msisk/HTML-Element-Extended/">HTML::Element::Extended</ulink>
-            </para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ulink url="http://search.cpan.org/~cjm/HTML-Tree/">HTML::Tree</ulink>
-                </para>
-                <itemizedlist>
-                  <listitem>
-                    <para>
-                      <xref linkend="perl-html-parser"/>
-                    </para>
-                  </listitem>
-                  <listitem>
-                    <para>
-                      <ulink url="http://search.cpan.org/dist/Test-Fatal/">Test::Fatal</ulink>
-                      (optionally used in the test suite)
-                    </para>
-                    <itemizedlist>
-                      <listitem>
-                        <para>
-                          <ulink url="http://search.cpan.org/~doy/Try-Tiny/">Try::Tiny</ulink>
-                        </para>
-                      </listitem>
-                    </itemizedlist>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist> -->
-
-    <!-- IPC-Run3 -->
+    
+    
     <bridgehead renderas="sect3" id="perl-ipc-run3"
     xreflabel="IPC::Run3-&IPC-Run3-version;">
     IPC::Run3-&IPC-Run3-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-ipc-run3">
       <primary sortas="a-IPC-Run3">IPC-Run3</primary>
     </indexterm>
-
     <para>Le module IPC::Run3 est utilisé pour lancer un sous-processus avec 
     une redirection d'entrée/sortie. Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/R/RJ/RJBS/IPC-Run3-&IPC-Run3-version;.tar.gz">IPC-Run3-&IPC-Run3-version;</ulink> 
 http://www.cpan.org/authors/id/R/RJ/RJBS/IPC-Run3-&Business-ISSN-version;.tar.gz 
 MD5 sum: 5a8cec571c51a118b265cf6e24e55761</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- LWP (but listed as libwww-perl) -->
+    
     <bridgehead renderas="sect3" id="perl-lwp"
     xreflabel="libwww-perl-&LWP-version;">
     libwww-perl-&LWP-version; (a.k.a. LWP)</bridgehead>
-
     <indexterm zone="perl-modules perl-lwp">
       <primary sortas="a-libwww-perl">libwww-perl</primary>
     </indexterm>
-
     <para>L'ensemble libwww-perl (LWP) est un rassemblement de modules
     <application>Perl</application> qui offrent une interface de programmation
     d'applications simple et cohérente avec le <foreignphrase>World-Wide Web</foreignphrase>.
@@ -538,9 +336,7 @@
     <xref linkend="perl-standard-install"/>. Les dépendances doivent être
     installées dans l'ordre listé après. Assurez vous d'installer la chaîne de
     dépendance pour chaque module avant d'installer les modules.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url="http://cpan.org/authors/id/M/MS/MSCHILLI/libwww-perl-&LWP-version;.tar.gz">libwww-perl-&LWP-version;</ulink>
 http://cpan.org/authors/id/M/MS/MSCHILLI/libwww-perl-&LWP-version;.tar.gz 
@@ -551,7 +347,6 @@
           </listitem>
           <listitem> <literallayout><ulink url="http://search.cpan.org/~gaas/HTML-Form/">HTML::Form</ulink>
 (http://search.cpan.org/~gaas/HTML-Form/) 
-
 </literallayout>
             <itemizedlist>
               <listitem>
@@ -566,7 +361,6 @@
               </listitem>
               <listitem> <literallayout><ulink url="http://search.cpan.org/~gaas/HTTP-Message/">HTTP::Message</ulink>
 (http://search.cpan.org/~gaas/HTTP-Message/) 
-
 </literallayout>
                 <itemizedlist> <listitem><literallayout><ulink url="http://search.cpan.org/~gaas/HTTP-Date/">HTTP::Date</ulink>
 (http://search.cpan.org/~gaas/HTTP-Date/) </literallayout>
@@ -602,10 +396,8 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
     <para>Après l'installation de LWP, si vous voulez le support du protocole HTTPS,
     installez la suite (application et modules):</para>
-
     <itemizedlist>
       <listitem>
         <para>
@@ -617,7 +409,6 @@
         <itemizedlist>
           <listitem> <literallayout><ulink url="http://search.cpan.org/~behroozi/IO-Socket-SSL/">IO::Socket::SSL</ulink>
 (http://search.cpan.org/~behroozi/IO-Socket-SSL/) 
-
 </literallayout>
             <itemizedlist>
               <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Net-SSLeay/">Net::SSLeay</ulink>
@@ -631,25 +422,21 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- List::AllUtils -->
+    
     <bridgehead renderas="sect3" id="perl-list-allutils"
     xreflabel="List::AllUtils-&List-AllUtils-version;">
     List::AllUtils-&List-AllUtils-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-list-allutils">
       <primary sortas="a-List-AllUtils">List::AllUtils</primary>
     </indexterm>
-
     <para>Le module List::Allutils combine List::Util et List::MoreUtils dans un paquet plus compacte.
     Ce module et ses dépendances utilisent le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     <para>Ce paquet échouera (les tests, mais pas pour une raison triviale, et à l'éxécution) si le module
     List::Util est plus ancien que 1.31, ce qui arrive par exemple avec 
     perl-5.18.2 de LFS-7.5. Pour tester la version, vous pouvez lancer la commande suivante
     </para>
-    <!-- use para to avoid line break in the long path -->
+    
     <para><command>strings /usr/lib/perl5/5.*/*/auto/List/Util/Util.so |
     grep v5 -A 1 | tail -n 1</command></para>
     <para>et si nécessaire installer
@@ -657,9 +444,7 @@
     (http://search.cpan.org/dist/Scalar-List-Utils/) pour avoir une nouvelle version de ce module sans
     mettre à jour l'ensemble de
     <application>perl</application>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">List::AllUtils-&List-AllUtils-version;</ulink> 
 http://www.cpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz 
@@ -674,147 +459,42 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- Log::Log4perl -->
+    
     <bridgehead renderas="sect3" id="perl-log-log4perl"
     xreflabel="Log::Log4perl-&Log-Log4perl-version;">
     Log-Log4perl-&Log-Log4perl-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-log-log4perl">
       <primary sortas="a-Log-Log4perl">Log-Log4perl</primary>
     </indexterm>
-
     <para>Log-Log4perl fournit une implémentation de Log4j pour
     <application>perl</application>. Ce module utilise le standard <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/M/MS/MSCHILLI/Log-Log4perl-&Log-Log4perl-version;.tar.gz">Log-Log4perl-&Log-Log4perl-version;</ulink> 
 http://www.cpan.org/authors/id/M/MS/MSCHILLI/Log-Log4perl-&Log-Log4perl-version;.tar.gz 
 MD5 sum: 4065a8b123badf07a3d6f57b48a0aa5c</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- Module::Info
-    <bridgehead renderas="sect3" id="perl-module-info"
-    xreflabel="Module::Info-&Module-Info-version;">
-    Module::Info-&Module-Info-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-module-info">
-      <primary sortas="a-Module-Info">Module::Info</primary>
-    </indexterm>
-
-    <para>The Module::Info module is quite useful for tasks other than just
-    support of other modules. It can be used from the command-line to tell you
-    if a particular module is included in, or has been installed into your
-    <application>Perl</application> installation. Additionally, Module::Info
-    can tell you what version of a module is installed and what dependencies
-    are required for it. You can even use Module::Info to gather dependencies
-    of uninstalled modules. The Module::Info module and dependencies install
-    using the standard <application>Perl</application> module
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/M/MB/MBARBON/Module-Info-&Module-Info-version;.tar.gz">
-          Module-Info-&Module-Info-version;</ulink>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <!-- Module::Signature
-    <bridgehead renderas="sect3" id="perl-module-signature"
-    xreflabel="Module::Signature-&Module-Signature-version;">
-    Module::Signature-&Module-Signature-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-module-signature">
-      <primary sortas="a-Module-Signature">Module::Signature</primary>
-    </indexterm>
-
-    <para>The Module::Signature module is used to check and create
-    <filename>SIGNATURE</filename> files for CPAN distributions. After
-    installing Module::Signature you can verify the content of a distribution
-    tarball (if it includes a <filename>SIGNATURE</filename> file) by unpacking
-    the tarball, changing into the newly created directory and issuing the
-    command <command>cpansign -v</command>. It will check each file's
-    integrity, as well as the signature's validity. Note that some of the
-    dependencies appear to be circular, however, they are only run-time
-    conflicts and you should be able to fully utilize them as long as
-    everything is installed. Module::Signature and the dependency modules are
-    installed using the standard <application>Perl</application>
-    module <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://cpan.org/authors/id/A/AU/AUDREYT/Module-Signature-&Module-Signature-version;.tar.gz">
-          Module-Signature-&Module-Signature-version;</ulink>
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-text-diff"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <ulink url="http://cpan.org/authors/id/S/SM/SMUELLER/PAR-Dist-&PAR-Dist-version;.tar.gz">
-              PAR-Dist-&PAR-Dist-version;</ulink>
-            </para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <xref linkend="perl-archive-zip"/>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <xref linkend="perl-lwp"/>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <xref linkend="perl-module-signature"/>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para>
-            <xref linkend="gnupg"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <!-- Net::DNS -->
+    
+    
+    
     <bridgehead renderas="sect3" id="perl-net-dns"
     xreflabel="Net::DNS-&Net-DNS-version;">
     Net::DNS-&Net-DNS-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-net-dns">
       <primary sortas="a-Net-DNS">Net::DNS</primary>
     </indexterm>
-
     <para>Net::DNS est un résolveur de DNS implémenté dans
     <application>Perl</application>. On peut l'utiliser pour effectuer presque
     n'importe quel type de requête DNS à partir d'un script
     <application>Perl</application>. Le module Nett::DNS et toutes ses
     dépendances s'installent en utilisant le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">Net::DNS-&Net-DNS-version;</ulink> 
 http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz 
 MD5 sum: 219dada09d01b7233f82fd1c32ddad39 
-
 </literallayout>
         <itemizedlist>
           <listitem> <literallayout><ulink url="http://search.cpan.org/~gaas/Digest-HMAC/">Digest::HMAC</ulink>
@@ -825,7 +505,6 @@
           </listitem>
           <listitem> <literallayout><ulink url="http://search.cpan.org/~gbarr/IO/lib/IO/Socket/INET.pm">IO::Socket::INET</ulink>
 (http://search.cpan.org/~gbarr/IO/lib/IO/Socket/INET.pm) (required for IPv6 support)
-
 </literallayout>
             <itemizedlist>
               <listitem> <literallayout><ulink url="http://search.cpan.org/~umemoto/Socket6/">Socket6</ulink>
@@ -836,22 +515,17 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- Readonly::XS -->
+    
     <bridgehead renderas="sect3" id="perl-readonly-xs"
     xreflabel="Readonly::XS-&Readonly-XS-version;">
     Readonly::XS-&Readonly-XS-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-readonly-xs">
       <primary sortas="a-Readonly-XS">Readonly::XS</primary>
     </indexterm>
-
     <para>Le module Readonly::XS est un module compagnon pour Readonly.pm, pour accélérer les variables scalaires
     en lecture seul.Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/R/RO/ROODE/Readonly-XS-&Readonly-XS-version;.tar.gz">Readonly::XS-&Readonly-XS-version;</ulink> 
 http://www.cpan.org/authors/id/R/RO/ROODE/Readonly-XS-&Readonly-XS-version;.tar.gz 
@@ -864,84 +538,67 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- Regexp::Common -->
+    
     <bridgehead renderas="sect3" id="perl-regexp-common"
     xreflabel="Regexp::Common-&Regexp-Common-version;">
     Regexp::Common-&Regexp-Common-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-regexp-common">
       <primary sortas="a-Regexp-Common">Regexp-Common</primary>
     </indexterm>
-
     <para>Regexp::Common fournit des expressions régulières requises. Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-&Regexp-Common-version;.tar.gz">Regexp-Common-&Regexp-Common-version;</ulink> 
 http://www.cpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-&Regexp-Common-version;.tar.gz 
 MD5 sum: 2b9c335312dcfd9980ff7acbad0e5905</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- SGMLSpm -->
+    
     <bridgehead renderas="sect3" id="perl-sgmlspm"
     xreflabel="SGMLSpm-&SGMLSpm-version;">
     SGMLSpm-&SGMLSpm-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-sgmlspm">
       <primary sortas="a-SGMLSpm">SGMLSpm</primary>
     </indexterm>
-
         <para>Le module SGMLSpm est une bibliothèque de <application>Perl</application>
     utilisé pour analyser la sortie des analyseurs SGML et NSGML de James Clark. Ces modules utilisent
       le standard <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
 <para>Avant de commencer la construction, tapez la commande
     suivante pour éviter une erreur :</para>
-
-<screen><userinput>chmod -v 644 MYMETA.yml</userinput></screen>
-
+<screen>
+<userinput>chmod -v 644 MYMETA.yml</userinput>
+</screen>
     <para>
       Après l'installation, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>ln -sv sgmlspl.pl /usr/bin/sgmlspl</userinput></screen>
-
+<screen role="root">
+<userinput>ln -sv sgmlspl.pl /usr/bin/sgmlspl</userinput>
+</screen>
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://anduin.&lfs-domainname;/sources/BLFS/conglomeration/perl-modules/SGMLSpm-&SGMLSpm-version;.tar.gz">SGMLSpm-&SGMLSpm-version;</ulink> 
 http://anduin.&lfs-domainname;/sources/BLFS/conglomeration/perl-modules/SGMLSpm-&SGMLSpm-version;.tar.gz 
 MD5 sum: 746c74ae969992cedb1a2879b4168090 </literallayout>
-<!--http://search.cpan.org/CPAN/authors/id/R/RA/RAAB/SGMLSpm-&SGMLSpm-version;.tar.gz -->
       </listitem>
     </itemizedlist>
-
-    <!-- Text::BibTeX -->
+    
     <bridgehead renderas="sect3" id="perl-text-bibtex"
     xreflabel="Text::BibTeX-&Text-BibTeX-version;">
     Text::BibTeX-&Text-BibTeX-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-text-bibtex">
       <primary sortas="a-Text-BibTeX">Text::BibTex</primary>
     </indexterm>
-
     <para>Text::BibTeX fournit une interface pour lire et analyser les fichiers
     <application>BibTeX</application>. Ce module utilise
     <xref linkend="perl-build-install"/>, mais à l'exception de ce qui est noté, ses dépendances sont installées
     en utilisant le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://www.cpan.org/authors/id/A/AM/AMBS/Text/Text-BibTeX-&Text-BibTeX-version;.tar.gz">Text::BibTeX-&Text-BibTeX-version;</ulink> 
 http://www.cpan.org/authors/id/A/AM/AMBS/Text/Text-BibTeX-&Text-BibTeX-version;.tar.gz 
 MD5 sum: 2b83fd66f252f4c11d1f49b4ea638ea3 
-
 </literallayout>
         <itemizedlist>
           <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Config-AutoConf/">Config::AutoConf</ulink>
@@ -961,134 +618,51 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- Text::Diff
-    <bridgehead renderas="sect3" id="perl-text-diff"
-    xreflabel="Text::Diff-&Text-Diff-version;">
-    Text::Diff-&Text-Diff-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-text-diff">
-      <primary sortas="a-Text-Diff">Text::Diff</primary>
-    </indexterm>
-
-    <para>Text::Diff is used to perform diffs on files and record sets. It
-    provides a basic set of services akin to the GNU <command>diff</command>
-    utility. It is not anywhere near as feature complete as GNU
-    <command>diff</command>, but it is better integrated with
-    <application>Perl</application> and available on all platforms. Text::Diff
-    is often faster than shelling out to a system's <command>diff</command>
-    executable for small files, and generally slower on larger files. The
-    modules listed below are installed using the standard
-    <application>Perl</application> module
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://cpan.org/authors/id/R/RB/RBS/Text-Diff-&Text-Diff-version;.tar.gz">
-          Text-Diff-&Text-Diff-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <ulink url="http://cpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-&Algorithm-Diff-version;.tar.gz">
-              Algorithm-Diff-&Algorithm-Diff-version;</ulink></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <!-- Tk
-    <bridgehead renderas="sect3" id="tk-perl"
-    xreflabel="Tk-Perl-&Tk-Perl-version;">
-    Tk-&Tk-Perl-version;</bridgehead>
-
-    <indexterm zone="perl-modules tk-perl">
-      <primary sortas="a-Tk">Tk</primary>
-    </indexterm>
-
-    <para>The <application>Tk</application> module is a
-    <application>Perl</application> interface to the
-    <application>Tk</application> package. The goal of this release is Unicode
-    support via <application>Perl</application>'s and
-    core-<application>Tk</application>'s use of UTF-8. Tk-&Tk-Perl-version;
-    builds and loads into a threaded <application>Perl</application> but is NOT
-    yet thread safe. The module is installed using the standard
-    <application>Perl</application> module
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-&Tk-Perl-version;.tar.gz">
-          Tk-&Tk-Perl-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="tk"/> and <xref linkend="libjpeg"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <!-- Unicode::Collate -->
+    
+    
+    
     <bridgehead renderas="sect3" id="perl-unicode-collate"
     xreflabel="Unicode::Collate-&Unicode-Collate-version;">
     Unicode::Collate-&Unicode-Collate-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-unicode-collate">
       <primary sortas="a-Unicode-Collate">Unicode-Collate</primary>
     </indexterm>
-
     <para>Unicode::Collate fournit un algorithme pour Unicode. Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url=" http://www.cpan.org/authors/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz">Unicode-Collate-&Unicode-Collate-version;</ulink> 
 http://www.cpan.org/authors/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz 
 MD5 sum: 80b9d8452be51a638268fffd129d2480</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- Unicode::LineBreak -->
+    
     <bridgehead renderas="sect3" id="perl-unicode-linebreak"
     xreflabel="Unicode::LineBreak-&Unicode-LineBreak-version;">
     Unicode::LineBreak-&Unicode-LineBreak-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-unicode-linebreak">
       <primary sortas="a-Unicode-LineBreak">Unicode::LineBreak</primary>
     </indexterm>
-
     <para>Unicode::LineBreak fournit une algorithme pour les lignes Unicode cassées de UAX #14.
     Ce module et ses dépendances utilisent le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://www.cpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz">Unicode::LineBreak-&Unicode-LineBreak-version;</ulink> 
 http://www.cpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz 
 MD5 sum: c908890e6a00f4203da5d4a5d6060586 
-
 </literallayout>
         <itemizedlist>
           <listitem> <literallayout><ulink url="http://search.cpan.org/dist/MIME-Charset/">MIME::Charset</ulink>
 (http://search.cpan.org/dist/MIME-Charset/)
-
 </literallayout>
             <itemizedlist>
               <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Encode-JISX0213/">Encode-JISX0213</ulink>
 (http://search.cpan.org/dist/Encode-JISX0213/
-
 </literallayout>
                 <itemizedlist>
                   <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Encode-ISO2022/">Encode-ISO2022</ulink>
 (http://search.cpan.org/dist/Encode-ISO2022/>)
-
 </literallayout>
                   </listitem>
                 </itemizedlist>
@@ -1098,16 +672,13 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- URI -->
+    
     <bridgehead renderas="sect3" id="perl-uri"
     xreflabel="URI-&URI-version;">
     URI-&URI-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-uri">
       <primary sortas="a-URI">URI</primary>
     </indexterm>
-
     <para>Ce module implémente la classe URI. Les objets de cette classe
     représentent les références "Uniform Resource Identifier" selon la
     spécification de la RFC 2396 ( et mise à jour par la RFC 2732). Un identifiant de
@@ -1118,32 +689,25 @@
     est une URI qui peut avoir des informations supplémentaires d'attachées sous la forme d'un
     fragment d'identifiant. Ce module utilise le standard
       <xref linkend="perl-standard-install"/>. </para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://www.cpan.org/authors/id/E/ET/ETHER/URI-&URI-version;.tar.gz">URI-&URI-version;</ulink>
 http://www.cpan.org/authors/id/E/ET/ETHER/URI-&URI-version;.tar.gz 
 MD5 sum: 975b2282bc8f0fd72a6dae5cefc33824 </literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- XML::LibXML::Simple -->
+    
     <bridgehead renderas="sect3" id="perl-xml-libxml-simple"
     xreflabel="XML::LibXML::Simple-&XML-LibXML-Simple-version;">
     XML::libXML::Simple-&XML-LibXML-Simple-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-xml-libxml-simple">
       <primary sortas="a-XML-LibXML-Simple">XML::LibXML::Simple</primary>
     </indexterm>
-
     <para>Le module XML::Simple est une extension <application>Perl</application> qui
     offre une API facile pour lire et écrire des XML (en particulier des fichiers
     de configuration). Le module et les modules dépendants utilisent le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://cpan.org/authors/id/M/MA/MARKOV/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz">XML::LibXML::Simple-&XML-LibXML-Simple-version;</ulink> 
 http://cpan.org/authors/id/M/MA/MARKOV/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz 
@@ -1166,22 +730,17 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- XML::LibXSLT -->
+    
     <bridgehead renderas="sect3" id="perl-xml-libxslt"
     xreflabel="XML::LibXSLT-&XML-LibXSLT-version;">
     XML::LibXSLT-&XML-LibXSLT-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-xml-libxslt">
       <primary sortas="a-XML-LibXSLT">XML::LibXSLT</primary>
     </indexterm>
-
     <para>Le module XML::LibXSLT fournit une interface pour
     <application>libxslt</application>. Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url="http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz">XML::LibXSLT-&XML-LibXSLT-version;</ulink> 
 http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz 
@@ -1195,69 +754,28 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- XML::Parser -->
-<!--    <bridgehead renderas="sect3" id="perl-xml-parser"
-    xreflabel="XML::Parser-&XML-Parser-version;">
-    XML::Parser-&XML-Parser-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-parser">
-      <primary sortas="a-XML-Parser">XML::Parser</primary>
-    </indexterm>
-
-    <para>The XML::Parser module is a <application>Perl</application> extension
-    interface to James Clark's XML parser,
-    <application>expat</application>. The module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    &lfs76_checked;
-
-    <itemizedlist>
-      <listitem> <literallayout><ulink url="http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&XML-Parser-version;.tar.gz">XML::Parser-&XML-Parser-version;</ulink>
-http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&XML-Parser-version;.tar.gz 
-MD5 sum: c320d2ffa459e6cdc6f9f59c1185855e) </literallayout>
-        <itemizedlist>
-          <!-<listitem>
-            <para>
-              <xref linkend="expat"/>
-            </para>
-          </listitem> ->
-          <listitem>
-            <para>
-              <xref linkend="perl-lwp"/> (optionally used in the test suite)
-            </para>
-          </listitem>
-        </itemizedlist>
-
-      </listitem>
-    </itemizedlist>-->
-
-    <!-- XML::Simple -->
+    
+    
     <bridgehead renderas="sect3" id="perl-xml-simple"
     xreflabel="XML::Simple-&XML-Simple-version;">
     XML::Simple-&XML-Simple-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-xml-simple">
       <primary sortas="a-XML-Simple">XML::Simple</primary>
     </indexterm>
-
     <para>Le module XML::Simple est une extension <application>Perl</application> qui
     offre une API facile pour lire et écrire des XML (en particulier des fichiers
     de configuration). Le module et les modules dépendants utilisent le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem> <literallayout><ulink url="http://cpan.org/authors/id/G/GR/GRANTM/XML-Simple-&XML-Simple-version;.tar.gz">XML::Simple-&XML-Simple-version;</ulink> 
 http://cpan.org/authors/id/G/GR/GRANTM/XML-Simple-&XML-Simple-version;.tar.gz 
 MD5 sum: 4d10964e123b76eca36678464daa63cd </literallayout>
         <itemizedlist>
-   <!--   <listitem> <literallayout><ulink url="http://search.cpan.org/~grantm/XML-SAX/">XML::SAX</ulink> -->
+   
           <listitem> <literallayout><ulink id="perl-xml-sax" xreflabel="XML::SAX" url="http://search.cpan.org/~grantm/XML-SAX/">XML::SAX</ulink>
 (http://search.cpan.org/~grantm/XML-SAX/)
               (Note: Ce paquet ne supporte par la construction parallèle)
-
 </literallayout>
             <itemizedlist>
               <listitem> <literallayout><ulink url="http://search.cpan.org/~perigrin/XML-NamespaceSupport/">XML::NamespaceSupport</ulink>
@@ -1271,15 +789,7 @@
           <listitem> <literallayout><ulink url="http://search.cpan.org/~bjoern/XML-SAX-Expat/">XML::SAX::Expat</ulink>
 (http://search.cpan.org/~bjoern/XML-SAX-Expat/)
               (Note: Ce paquet ne supporte par la construction parallèle)
-
 </literallayout>
-<!--            <itemizedlist>
-              <listitem>
-                <para>
-                  <xref linkend="perl-xml-parser"/>
-                </para>
-              </listitem>
-            </itemizedlist>-->
           </listitem>
           <listitem> <literallayout> <ulink id="perl-xml-libxml" xreflabel="XML::LibXML" url="http://search.cpan.org/~shlomif/XML-LibXML/">XML::LibXML</ulink>
 (http://search.cpan.org/~shlomif/XML-LibXML/)
@@ -1292,104 +802,25 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-
-    <!-- XML::Writer -->
+    
     <bridgehead renderas="sect3" id="perl-xml-writer"
     xreflabel="XML::Writer-&XML-Writer-version;">
     XML::Writer-&XML-Writer-version;</bridgehead>
-
     <indexterm zone="perl-modules perl-xml-writer">
       <primary sortas="a-XML-Writer">XML::Writer</primary>
     </indexterm>
-
     <para>XML::Writer fournit une extension <application>Perl</application>
     pour l'écriture des documents XML. Ce module utilise le standard
     <xref linkend="perl-standard-install"/>.</para>
-
     &lfs76_checked;
-
     <itemizedlist>
       <listitem><literallayout><ulink url="http://www.cpan.org/authors/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz">XML::Writer-&XML-Writer-version;</ulink> 
 http://www.cpan.org/authors/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz 
 MD5 sum: b9c2420c243c6a36ce45a008740fcede</literallayout>
       </listitem>
     </itemizedlist>
-
-    <!-- YAML
-    <bridgehead renderas="sect3" id="perl-yaml"
-    xreflabel="YAML-&YAML-version;">
-    YAML-&YAML-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-yaml">
-      <primary sortas="a-YAML">YAML</primary>
-    </indexterm>
-
-    <para>The <application>YAML</application> modules implement a
-    <application>YAML</application> Loader and Dumper based on the
-    <application>YAML</application> 1.0 specification
-    <ulink url="http://www.yaml.org/spec/"/>.
-    <application>YAML</application> is a generic data serialization language
-    that is optimized for human readability. It can be used to express the data
-    structures of most modern programming languages. The module and
-    dependencies are installed using the standard
-    <application>Perl</application> module
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <note>
-      <para>The <application>YAML</application>,
-      <application>Test::Base</application> and
-      <application>Spiffy</application> modules will install UTF-8
-      encoded manual pages. To modify the manual pages so that non-UTF-8
-      encoded pages are installed, issue the following commands (before
-      any other build commands):</para>
-
-<screen><literal>For <application>Spiffy</application>:     <command>sed -i 's,\xc3\xb6,o,' lib/Spiffy.pm</command>
-
-For <application>Test::Base</application>: <command>sed -i 's,\xc3\xb6,o,' \
-                  lib/Test/Base{,/Filter}.pm \
-                  lib/Module/Install/TestBase.pm</command>
-
-For <application>YAML</application>:       <command>sed -i 's,\xc3\xb6,o,' \
-                  ysh \
-                  lib{,/Test}/YAML.pm \
-                  lib/YAML/{Types,Node,Error,Marshall,Tag,Base}.pm \
-                  lib/YAML/{Loader,Dumper}{,/Base}.pm</command></literal></screen>
-
-    </note>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://cpan.org/authors/id/I/IN/INGY/YAML-&YAML-version;.tar.gz">
-          YAML-&YAML-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <ulink url="http://cpan.org/authors/id/I/IN/INGY/Test-Base-&Test-Base-version;.tar.gz">
-              Test-Base-&Test-Base-version;</ulink>
-              (optionally used during the tests)
-           </para>
-             <itemizedlist>
-               <listitem>
-                <para
-                  <ulink url="http://cpan.org/authors/id/I/IN/INGY/Spiffy-&Spiffy-version;.tar.gz">
-                  Spiffy-&Spiffy-version;</ulink></para>
-               </listitem>
-             </itemizedlist>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-text-diff"/>
-              (optionally used during the tests)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-    -->
-
+    
   </sect2>
-
   <sect2 role="installation" id="perl-standard-install"
   xreflabel="build and installation instructions">
         <title>Installation standard des modules Perl</title>
@@ -1415,37 +846,21 @@
 </screen>
     </note>
   </sect2>
-
   <sect2 role="installation" id="perl-build-install"
   xreflabel="instructions for packages using Build.PL">
     <title>Installation des modules Perl qui utilisent Build.PL</title>
-
     <para>Installez les modules <application>Perl</application> qui utilisent 
     Build.PL en lançant les commandes suivantes:</para>
-
-<!-- when Build is removed from the core perl distribution, perhaps in 5.22,
-     Module::Build should be added to this page, and linked from here -->
-<screen><userinput>perl Build.PL &&
+<screen>
+<userinput>perl Build.PL &&
 ./Build &&
-./Build test</userinput></screen>
-
+./Build test</userinput>
+</screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem>:</para>
-
-<screen role="root"><userinput>./Build install</userinput></screen>
-
-<!-- following not tested
-    <note>
-      <para>When reinstalling a <application>Perl</application> module,
-      sometimes older versions of the module being reinstalled are in other
-      directories specified in <parameter>@INC</parameter>.  To delete all
-      other versions of the module being reinstalled (not simply older ones)
-      set the <varname>UNINST</varname> variable:</para>
-
-<screen><userinput>./Build install UNINST=1</userinput></screen>
-    </note> -->
-
+<screen role="root">
+<userinput>./Build install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="installation" id="perl-auto-install"
   xreflabel="Instruction d'installation auto alternative">
     <title>(Alternative) Installation automatique des modules Perl.</title>
@@ -1483,5 +898,4 @@
     des paramètres supplémentaires que vous pouvez passer à
     <command>cpan</command> en ligne de commande.</para>
   </sect2>
-
 </sect1>

Modified: trunk/blfs/general/prog/php.xml
===================================================================
--- trunk/blfs/general/prog/php.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/php.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -151,7 +151,26 @@
     <para>Installez <application>PHP</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                            --sysconfdir=/etc                        --localstatedir=/var                     --datadir=/usr/share/php                 --mandir=/usr/share/man                  --enable-fpm                             --with-fpm-user=apache                   --with-fpm-group=apache                  --with-config-file-path=/etc             --with-zlib                              --enable-bcmath                          --with-bz2                               --enable-calendar                        --enable-dba=shared                      --with-gdbm                              --with-gmp                               --enable-ftp                             --with-gettext                           --enable-mbstring                        --with-readline              &&
+<userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --datadir=/usr/share/php     \
+            --mandir=/usr/share/man      \
+            --enable-fpm                 \
+            --with-fpm-user=apache       \
+            --with-fpm-group=apache      \
+            --with-config-file-path=/etc \
+            --with-zlib                  \
+            --enable-bcmath              \
+            --with-bz2                   \
+            --enable-calendar            \
+            --enable-dba=shared          \
+            --with-gdbm                  \
+            --with-gmp                   \
+            --enable-ftp                 \
+            --with-gettext               \
+            --enable-mbstring            \
+            --with-readline              &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.
@@ -164,9 +183,12 @@
 install -v -m644 php.ini-production /etc/php.ini     &&
 mv -v /etc/php-fpm.conf{.default,}                   &&
 install -v -m755 -d /usr/share/doc/php-&php-version; &&
-install -v -m644    CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif                     /usr/share/doc/php-&php-version; &&
-ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt                     /usr/share/doc/php-&php-version; &&
-ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs                     /usr/share/doc/php-&php-version;</userinput>
+install -v -m644    CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif \
+                    /usr/share/doc/php-&php-version; &&
+ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
+                    /usr/share/doc/php-&php-version; &&
+ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs \
+                    /usr/share/doc/php-&php-version;</userinput>
 </screen>
     <para>La documentation HTML précompilée est emballée sous deux formes :
     un archive tar contenant beaucoup de fichiers individuels, utile pour être
@@ -179,12 +201,14 @@
     tar ci-dessous si nécessaire).</para>
     <para>Pour le fichier <quote>Unique en HTML</quote> :</para>
 <screen role="root">
-<userinput>install -v -m644 ../php_manual_en.html.gz     /usr/share/doc/php-&php-version; &&
+<userinput>install -v -m644 ../php_manual_en.html.gz \
+    /usr/share/doc/php-&php-version; &&
 gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput>
 </screen>
     <para>Pour l'archive tar <quote>beaucoup de fichiers HTML</quote> :</para>
 <screen role="root">
-<userinput>tar -xvf ../php_manual_en.tar.gz     -C /usr/share/doc/php-&php-version; --no-same-owner</userinput>
+<userinput>tar -xvf ../php_manual_en.tar.gz \
+    -C /usr/share/doc/php-&php-version; --no-same-owner</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">
@@ -264,20 +288,25 @@
       <para>Si désiré, ajoutez l'entrée en utilisant la commande suivante en
       tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>sed -i 's at php/includes"@&ninclude_path = ".:/usr/lib/php"@'     /etc/php.ini</userinput>
+<userinput>sed -i 's at php/includes"@&\ninclude_path = ".:/usr/lib/php"@' \
+    /etc/php.ini</userinput>
 </screen>
       <para>Pour activer le support fastCGI dans un serveur web <application>Apache</application>
       , deux directives de chargement LoadModule doivent être ajoutées dans le fichier
       <filename>httpd.conf</filename>. Elles sont commentées, donc il suffit de taper la commande suivante
       en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>sed -i -e '/proxy_module/s/^#//'             -e '/proxy_fcgi_module/s/^#//'        /etc/httpd/httpd.conf</userinput>
+<userinput>sed -i -e '/proxy_module/s/^#//'      \
+       -e '/proxy_fcgi_module/s/^#//' \
+       /etc/httpd/httpd.conf</userinput>
 </screen>
       <para>Ces modules acceptent différentes directives <command>ProxyPass</command>.
       Une possibilité est (en tant qu'utilisateur
       <systemitem class="username">root</systemitem>):</para>
 <screen role="root">
-<userinput>echo 'ProxyPassMatch ^/(.*.php)$ fcgi://127.0.0.1:9000/srv/www/$1' >> /etc/httpd/httpd.conf</userinput>
+<userinput>echo \
+'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/srv/www/$1' >> \
+/etc/httpd/httpd.conf</userinput>
 </screen>
       <para>En outre, il peut être utile d'ajouter une entrée pour
       <filename>index.php</filename> à la ligne DirectoryIndex du fichier

Modified: trunk/blfs/general/prog/pycairo.xml
===================================================================
--- trunk/blfs/general/prog/pycairo.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/pycairo.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -92,7 +92,7 @@
 <userinput>patch -Np1 -i ../pycairo-&pycairo-version;-waf_unpack-1.patch     &&
 wafdir=$(./waf unpack) &&
 pushd $wafdir          &&
-patch -Np1 -i ../pycairo-&pycairo-version;-waf_python_3_4-1.patch &&
+patch -Np1 -i ../../pycairo-&pycairo-version;-waf_python_3_4-1.patch &&
 popd                   &&
 unset wafdir           &&
 PYTHON=/usr/bin/python3 ./waf configure --prefix=/usr  &&

Modified: trunk/blfs/general/prog/scons.xml
===================================================================
--- trunk/blfs/general/prog/scons.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/scons.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -83,7 +83,10 @@
     </para>
  
 <screen role="root">
-<userinput>python setup.py install --prefix=/usr                          --standard-lib                         --optimize=1                           --install-data=/usr/share</userinput>
+<userinput>python setup.py install --prefix=/usr  \
+                        --standard-lib \
+                        --optimize=1   \
+                        --install-data=/usr/share</userinput>
 </screen>
   </sect2>
   

Modified: trunk/blfs/general/prog/subversion.xml
===================================================================
--- trunk/blfs/general/prog/subversion.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/subversion.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,8 +3,7 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!--<!ENTITY subversion-download-http
-  "http://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">-->
+  
   <!ENTITY subversion-download-http
   "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
@@ -96,7 +95,9 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-static             --with-apache-libexecdir &&
+<userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --with-apache-libexecdir &&
 make</userinput>
 </screen>
     <para>Si vous avez installé <xref linkend="doxygen"/> et si vous souhaitez construire la
@@ -137,7 +138,9 @@
     <para>
 <screen>
 <command>make swig-pl</command> # for <application>Perl</application>
-<command>make swig-py      swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn      swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command> # for <application>Python</application>
+<command>make swig-py \
+     swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command> # for <application>Python</application>
 <command>make swig-rb</command> # for <application>Ruby</application>
 </screen>
 .
@@ -159,7 +162,8 @@
 <screen role="root">
 <userinput>make -j1 install &&
 install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &&
-cp      -v -R       doc/*                     /usr/share/doc/subversion-&subversion-version;</userinput>
+cp      -v -R       doc/* \
+                    /usr/share/doc/subversion-&subversion-version;</userinput>
 </screen>
         <para>
        Si vous construisez les liaisons Java, tapez les commandes suivantes en tant qu'utilisateur
@@ -182,7 +186,9 @@
       
 <screen>
 <command>make install-swig-pl</command>
-<command>make install-swig-py       swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn       swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command>
+<command>make install-swig-py \
+      swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
+      swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command>
 <command>make install-swig-rb</command>
 </screen>
     </para>

Modified: trunk/blfs/general/prog/tcl.xml
===================================================================
--- trunk/blfs/general/prog/tcl.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/tcl.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -12,7 +12,7 @@
   <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
   <!ENTITY tcl-doc-md5sum    "75019542fa735eb0c26e385b1a41296c">
   <!ENTITY tcl-doc-size      "1.2 Mo">
-  <!-- Ensure this is updated when Tcl moves from the 8.6.x branch -->
+  
   <!ENTITY tcl-ver           "8.6">
 ]>
 <sect1 id="tcl" xreflabel="Tcl-&tcl-version;">
@@ -81,10 +81,26 @@
     <para>Installez <application>Tcl</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>cd unix &&
-./configure --prefix=/usr                       --without-tzdata                    --mandir=/usr/share/man             $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
+<userinput>export SRCDIR=`pwd` &&
+cd unix &&
+./configure --prefix=/usr           \
+            --without-tzdata        \
+            --mandir=/usr/share/man \
+            $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
 make &&
-sed -e "s@^(TCL_SRC_DIR=').*@1/usr/include'@"     -e "/TCL_B/s@='(-L)?.*unix@='1/usr/lib@"     -i tclConfig.sh</userinput>
+sed -e "s#$SRCDIR/unix#/usr/lib#" \
+    -e "s#$SRCDIR#/usr/include#"  \
+    -i tclConfig.sh               &&
+sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.1#/usr/lib/tdbc1.0.0#" \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.1/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.1/library#/usr/lib/tcl8.6#" \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.1#/usr/include#"            \
+    -i pkgs/tdbc1.0.1/tdbcConfig.sh                        &&
+sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.1#/usr/lib/itcl4.0.0#" \
+    -e "s#$SRCDIR/pkgs/itcl4.0.1/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/itcl4.0.1#/usr/include#"            \
+    -i pkgs/itcl4.0.1/itclConfig.sh                        &&
+unset SRCDIR</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
@@ -120,9 +136,6 @@
     commande est utilisée pour créer un lien symbolique de compatibilité vers
     le fichier <command>tclsh&tcl-ver;</command> vu que de nombreux paquets
     s'attentent à trouver un fichier appelé <command>tclsh</command>.</para>
-
-
-
     <para><command>sed -e ... </command> : Le paquet
     <application>Tcl</application> s'attend à ce que l'arborescence de ses
     sources soit préservée afin que les paquets qui en dépendent pour leur

Modified: trunk/blfs/general/prog/tk.xml
===================================================================
--- trunk/blfs/general/prog/tk.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/tk.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -9,7 +9,7 @@
   <!ENTITY tk-size          "4.1 Mo">
   <!ENTITY tk-buildsize     "24 Mo">
   <!ENTITY tk-time          "0.3 SBU">
-  <!-- Ensure this is updated when Tk moves from the 8.6.x branch -->
+  
   <!ENTITY tk-ver           "8.6">
 ]>
 <sect1 id="tk" xreflabel="Tk-&tk-version;">
@@ -63,9 +63,13 @@
 suivantes :</para>
 <screen>
 <userinput>cd unix &&
-./configure --prefix=/usr             --mandir=/usr/share/man             $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
+./configure --prefix=/usr \
+            --mandir=/usr/share/man \
+            $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
 make &&
-sed -e "s@^(TK_SRC_DIR=').*@1/usr/include'@"     -e "/TK_B/s@='(-L)?.*unix@='1/usr/lib@"     -i tkConfig.sh</userinput>
+sed -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
+    -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
+    -i tkConfig.sh</userinput>
 </screen>
     <para>L'exécution des tests n'est pas recommandé. Des échecs apparaitront dans les tests,
     en fonction de votre résolution d'écran, des polices installées et des autres paramètres

Modified: trunk/blfs/general/prog/valgrind.xml
===================================================================
--- trunk/blfs/general/prog/valgrind.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/prog/valgrind.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -89,9 +89,9 @@
     <para>Installez <application>Valgrind</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>sed -i 's|2.18|2.19|'      configure        &&
-sed -i 's|/doc/valgrind||' docs/Makefile.in &&
-./configure --prefix=/usr             --datadir=/usr/share/doc/valgrind-&valgrind-version; &&
+<userinput>sed -i 's|/doc/valgrind||' docs/Makefile.in &&
+./configure --prefix=/usr \
+            --datadir=/usr/share/doc/valgrind-&valgrind-version; &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/sysutils/at.xml
===================================================================
--- trunk/blfs/general/sysutils/at.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/sysutils/at.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -84,7 +84,10 @@
     <para>Installez <application>at</application> avec les commandes suivantes
     </para>
 <screen>
-<userinput>./configure --docdir=/usr/share/doc/at-&at-version;             --with-daemon_username=atd                    --with-daemon_groupname=atd                   SENDMAIL=/usr/sbin/sendmail &&
+<userinput>./configure --docdir=/usr/share/doc/at-&at-version; \
+            --with-daemon_username=atd        \
+            --with-daemon_groupname=atd       \
+            SENDMAIL=/usr/sbin/sendmail &&
 make -j1</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>
@@ -132,7 +135,6 @@
           /var/spool/{atjobs,atspool} et
           /usr/share/doc/at-&at-version;
         </seg>
-
       </seglistitem>
     </segmentedlist>
     <variablelist>
@@ -157,7 +159,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="atq">
         <term><command>atq</command></term>
         <listitem>
@@ -176,8 +177,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-
       <varlistentry id="atrun">
         <term><command>atrun</command></term>
         <listitem>

Modified: trunk/blfs/general/sysutils/bluez.xml
===================================================================
--- trunk/blfs/general/sysutils/bluez.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/sysutils/bluez.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -119,7 +119,11 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                     --sysconfdir=/etc                 --localstatedir=/var              --enable-library                  --disable-systemd     &&
+<userinput>./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
+            --enable-library      \
+            --disable-systemd     &&
 make</userinput>
 </screen>
     <para>
@@ -184,6 +188,7 @@
 # Use one line per command
 # See the rfcomm man page for options
 # End of rfcomm.conf</literal>
+EOF
 </screen>
 <screen role="root">
 <userinput>cat > /etc/bluetooth/uart.conf << "EOF"</userinput>
@@ -192,6 +197,7 @@
 # Use one line per device
 # See the hciattach man page for options
 # End of uart.conf</literal>
+EOF
 </screen>
       <indexterm zone="bluez bluez-config">
         <primary

Modified: trunk/blfs/general/sysutils/colord.xml
===================================================================
--- trunk/blfs/general/sysutils/colord.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/sysutils/colord.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -95,12 +95,21 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 71 colord &&
-useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71         -g colord -s /bin/false colord</userinput>
+useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
+        -g colord -s /bin/false colord</userinput>
 </screen>
     <para>Installez <application>colord</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                            --sysconfdir=/etc                        --localstatedir=/var                     --with-daemon-user=colord                --enable-vala                            --enable-systemd-login=no                --disable-bash-completion                --disable-static                         --with-systemdsystemunitdir=no &&
+<userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --with-daemon-user=colord    \
+            --enable-vala                \
+            --enable-systemd-login=no    \
+            --disable-bash-completion    \
+            --disable-static             \
+            --with-systemdsystemunitdir=no &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/general/sysutils/dbus.xml
===================================================================
--- trunk/blfs/general/sysutils/dbus.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/sysutils/dbus.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -80,7 +80,8 @@
     messages système :</para>
 <screen role="root">
 <userinput>groupadd -g 18 messagebus &&
-useradd -c "D-Bus Message Daemon User" -d /var/run/dbus         -u 18 -g messagebus -s /bin/false messagebus</userinput>
+useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
+        -u 18 -g messagebus -s /bin/false messagebus</userinput>
 </screen>
     <para>Installez <application>D-BUS</application> en lançant les commandes
     suivantes (vous pouvez d'abord souhaiter observer la sortie de
@@ -88,7 +89,13 @@
     à la commande <command>configure</command> affichée ci-dessous) :</para>
  
 <screen>
-<userinput>./configure --prefix=/usr                              --sysconfdir=/etc                          --localstatedir=/var                       --with-console-auth-dir=/run/console/             --without-systemdsystemunitdir             --disable-systemd                          --disable-static &&
+<userinput>./configure --prefix=/usr                  \
+            --sysconfdir=/etc              \
+            --localstatedir=/var           \
+            --with-console-auth-dir=/run/console/ \
+            --without-systemdsystemunitdir \
+            --disable-systemd              \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Voir ci-dessous pour les instructions de test.</para>
@@ -128,8 +135,7 @@
 <userinput>make distclean                              &&
 ./configure --enable-tests --enable-asserts &&
 make                                        &&
-make check                                  &&
-make distclean</userinput>
+make check</userinput>
 </screen>
      <para>
       Si <command>run-test.sh</command> échoue, il peut être désactivé avec le sed suivant, avant de lancer

Modified: trunk/blfs/general/sysutils/mc.xml
===================================================================
--- trunk/blfs/general/sysutils/mc.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/sysutils/mc.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -74,7 +74,9 @@
     <para>Installez <application>MC</application> en 
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --enable-charset &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-charset &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/general/sysutils/sysstat.xml
===================================================================
--- trunk/blfs/general/sysutils/sysstat.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/sysutils/sysstat.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -64,7 +64,11 @@
     <para>Installez <application>Sysstat</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sa_lib_dir=/usr/lib/sa    sa_dir=/var/log/sa        conf_dir=/etc/sysconfig   ./configure --prefix=/usr             --disable-man-group &&
+<userinput>sa_lib_dir=/usr/lib/sa    \
+sa_dir=/var/log/sa        \
+conf_dir=/etc/sysconfig   \
+./configure --prefix=/usr \
+            --disable-man-group &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/general/sysutils/udev-extras.xml
===================================================================
--- trunk/blfs/general/sysutils/udev-extras.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/general/sysutils/udev-extras.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -41,7 +41,6 @@
     exceptions, l'équipe BLFS n'a pas d'expérience de mise à jour (ou de retour à une version plus ancienne)
     du paquet <application>Eudev</application> <quote>à la volée</quote>.</para>
 &lfs76_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <caution>
       <para>
@@ -83,8 +82,7 @@
     <title>Installation de Udev Extras</title>
     <para>Tout d'abord, reconstruisez eudev:</para>
 <screen>
-<userinput>sed    -i '/struct ucred/i struct ucred;' src/libudev/util.h &&
-sed -r -i 's|/usr(/bin/test)|\1|'         test/udev-test.pl  &&
+<userinput>sed -r -i 's|/usr(/bin/test)|\1|'         test/udev-test.pl  &&
 ./configure --prefix=/usr           \
             --bindir=/sbin          \
             --sbindir=/sbin         \

Modified: trunk/blfs/gnome/applications/gnome-system-monitor.xml
===================================================================
--- trunk/blfs/gnome/applications/gnome-system-monitor.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/gnome/applications/gnome-system-monitor.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -65,7 +65,6 @@
     <para role="recommended">
       <xref linkend="appdata-tools"/> et
     <xref linkend="libwnck"/>
-
     </para>
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/gnome-system-monitor"/></para>

Modified: trunk/blfs/gnome/applications/totem.xml
===================================================================
--- trunk/blfs/gnome/applications/totem.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/gnome/applications/totem.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -98,7 +98,7 @@
     <para>Installez <application>Totem</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-static &&
+<userinput>./configure --prefix=/usr --disable-static &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>

Modified: trunk/blfs/gnome/platform/gvfs.xml
===================================================================
--- trunk/blfs/gnome/platform/gvfs.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/gnome/platform/gvfs.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -114,7 +114,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --disable-gphoto2 &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-gphoto2 &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/introduction/welcome/changelog.xml
===================================================================
--- trunk/blfs/introduction/welcome/changelog.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/introduction/welcome/changelog.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -28,7 +28,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>20 Septembre 2014</para>
       <itemizedlist>
@@ -42,7 +41,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>19 Septembre 2014</para>
       <itemizedlist>
@@ -177,7 +175,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>14 Septembre 2014</para>
       <itemizedlist>
@@ -221,7 +218,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>13 Septembre 2014</para>
       <itemizedlist>
@@ -231,7 +227,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>12 Septembre 2014</para>
       <itemizedlist>
@@ -263,7 +258,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>10 Septembre 2014</para>
       <itemizedlist>
@@ -288,7 +282,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>8 Septembre 2014</para>
       <itemizedlist>
@@ -316,7 +309,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>6 Septembre 2014</para>
       <itemizedlist>
@@ -367,7 +359,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>4 Septembre 2014</para>
       <itemizedlist>
@@ -377,7 +368,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>3 Septembre 2014</para>
       <itemizedlist>
@@ -452,7 +442,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>31 Aout 2014</para>
       <itemizedlist>
@@ -649,7 +638,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>25 Aout 2014</para>
       <itemizedlist>
@@ -704,10 +692,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
-
-
     <listitem>
       <para>23 Aout 2014</para>
       <itemizedlist>
@@ -835,7 +819,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>18 Aout 2014</para>
       <itemizedlist>
@@ -919,7 +902,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>15 Aout 2014</para>
       <itemizedlist>
@@ -980,7 +962,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>12 Aout 2014</para>
       <itemizedlist>
@@ -1036,16 +1017,11 @@
           <ulink url="&blfs-ticket-root;5333">#5333</ulink>.</para>
         </listitem>
         <listitem>
-
           <para>[igor] - Passage à unrar-5.1.7. Corrige
           <ulink url="&blfs-ticket-root;5342">#5342</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
-
-
-
-
     <listitem>
       <para>10 Aout 2014</para>
       <itemizedlist>

Modified: trunk/blfs/kde/add/ark.xml
===================================================================
--- trunk/blfs/kde/add/ark.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/ark.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/gwenview.xml
===================================================================
--- trunk/blfs/kde/add/gwenview.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/gwenview.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -74,7 +74,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kate.xml
===================================================================
--- trunk/blfs/kde/add/kate.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/kate.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -73,7 +73,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kdepim-runtime.xml
===================================================================
--- trunk/blfs/kde/add/kdepim-runtime.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/kdepim-runtime.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -65,16 +65,174 @@
     <title>Installation de Kdepim-runtime</title>
     <para>Installez <application>kdepim-runtime</application> en exécutant
     les commandes suivantes :</para>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+  <!ENTITY kdepim-runtime-download-http "&kde-download-http;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
+  <!ENTITY kdepim-runtime-download-ftp  " ">
+  <!ENTITY kdepim-runtime-md5sum        "2c5c0ad7091f2a86a0aa94d9c77e875a">
+  <!ENTITY kdepim-runtime-size          "1.1 Mo">
+  <!ENTITY kdepim-runtime-buildsize     "141 Mo">
+  <!ENTITY kdepim-runtime-time          "6.3 SBU">
+]>
+<sect1 id="kdepim-runtime" xreflabel="kdepim-runtime-&kde-version;">
+  <?dbhtml filename="kdepim-runtime.html"?>
+  <sect1info>
+    <othername>$LastChangedBy : rthomsen $</othername>
+    <date>$Date : 2013-04-05 20:35:24 +0200 (Fri, 05 Apr 2013) $</date>
+  </sect1info>
+  <title>Kdepim-runtime-&kde-version;</title>
+  <indexterm zone="kdepim-runtime">
+    <primary sortas="a-kdepim-runtime">kdepim-runtime</primary>
+  </indexterm>
+  <sect2 role="package">
+    <title>Introduction à Kdepim-runtime</title>
+    <para>Ce paquet fournit des ressources supplémentaires pour
+    <application>Akonadi</application>.</para>
+   &lfs76_checked;
+    <bridgehead renderas="sect3">Information sur le paquet</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Téléchargement (HTTP) : <ulink url="&kdepim-runtime-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Téléchargement (FTP) : <ulink url="&kdepim-runtime-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Somme de contrôle MD5 du téléchargement : &kdepim-runtime-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Taille du téléchargement : &kdepim-runtime-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation de l'espace disque requis : &kdepim-runtime-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation du temps de construction : &kdepim-runtime-time;</para>
+      </listitem>
+    </itemizedlist>
+    <bridgehead renderas="sect3">Dependances de Kdepim-Runtime</bridgehead>
+    <bridgehead renderas="sect4">Requises</bridgehead>
+    <para role="required">
+    <xref linkend="kdepimlibs"/>
+    </para>
+    <bridgehead renderas="sect4">Facultatives</bridgehead>
+    <para role="optional">
+    <ulink url="http://git.kolab.org">KolabLibraries</ulink> (pour Kolab Groupware Resource),
+    <ulink url="http://projects.kde.org/libkgapi">LibKGAPI</ulink> (pour accéder aux services Google) et
+    <ulink url="http://projects.kde.org/libkfbapi">libKFbAPI</ulink> (pour accéder aux serviceS Facebook)
+    </para>
+	<para condition="html" role="usernotes">Notes utilisateur :
+    <ulink url="&blfs-wiki;/kdepim-runtime"/>
+    </para>
+  </sect2>
+  <sect2 role="installation">
+    <title>Installation de Kdepim-runtime</title>
+    <para>Installez <application>kdepim-runtime</application> en exécutant
+    les commandes suivantes :</para>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+  <!ENTITY kdepim-runtime-download-http "&kde-download-http;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
+  <!ENTITY kdepim-runtime-download-ftp  " ">
+  <!ENTITY kdepim-runtime-md5sum        "2c5c0ad7091f2a86a0aa94d9c77e875a">
+  <!ENTITY kdepim-runtime-size          "1.1 Mo">
+  <!ENTITY kdepim-runtime-buildsize     "141 Mo">
+  <!ENTITY kdepim-runtime-time          "6.3 SBU">
+]>
+<sect1 id="kdepim-runtime" xreflabel="kdepim-runtime-&kde-version;">
+  <?dbhtml filename="kdepim-runtime.html"?>
+  <sect1info>
+    <othername>$LastChangedBy : rthomsen $</othername>
+    <date>$Date : 2013-04-05 20:35:24 +0200 (Fri, 05 Apr 2013) $</date>
+  </sect1info>
+  <title>Kdepim-runtime-&kde-version;</title>
+  <indexterm zone="kdepim-runtime">
+    <primary sortas="a-kdepim-runtime">kdepim-runtime</primary>
+  </indexterm>
+  <sect2 role="package">
+    <title>Introduction à Kdepim-runtime</title>
+    <para>Ce paquet fournit des ressources supplémentaires pour
+    <application>Akonadi</application>.</para>
+   &lfs76_checked;
+    <bridgehead renderas="sect3">Information sur le paquet</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Téléchargement (HTTP) : <ulink url="&kdepim-runtime-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Téléchargement (FTP) : <ulink url="&kdepim-runtime-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Somme de contrôle MD5 du téléchargement : &kdepim-runtime-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Taille du téléchargement : &kdepim-runtime-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation de l'espace disque requis : &kdepim-runtime-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation du temps de construction : &kdepim-runtime-time;</para>
+      </listitem>
+    </itemizedlist>
+    <bridgehead renderas="sect3">Dependances de Kdepim-Runtime</bridgehead>
+    <bridgehead renderas="sect4">Requises</bridgehead>
+    <para role="required">
+    <xref linkend="kdepimlibs"/>
+    </para>
+    <bridgehead renderas="sect4">Facultatives</bridgehead>
+    <para role="optional">
+    <ulink url="http://git.kolab.org">KolabLibraries</ulink> (pour Kolab Groupware Resource),
+    <ulink url="http://projects.kde.org/libkgapi">LibKGAPI</ulink> (pour accéder aux services Google) et
+    <ulink url="http://projects.kde.org/libkfbapi">libKFbAPI</ulink> (pour accéder aux serviceS Facebook)
+    </para>
+	<para condition="html" role="usernotes">Notes utilisateur :
+    <ulink url="&blfs-wiki;/kdepim-runtime"/>
+    </para>
+  </sect2>
+  <sect2 role="installation">
+    <title>Installation de Kdepim-runtime</title>
+    <para>Installez <application>kdepim-runtime</application> en exécutant
+    les commandes suivantes :</para>
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
+<screen>
+<userinput>mkdir build &&
+cd    build &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
+make</userinput>
+</screen>
+<screen>
+<userinput>mkdir build &&
+cd    build &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
+make</userinput>
+</screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install</userinput>
 </screen>
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
   <sect2 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/kde/add/kdepim.xml
===================================================================
--- trunk/blfs/kde/add/kdepim.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/kdepim.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -76,7 +76,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DSYSCONF_INSTALL_DIR=/etc               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kdeplasma-addons.xml
===================================================================
--- trunk/blfs/kde/add/kdeplasma-addons.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/kdeplasma-addons.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -76,7 +76,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kmix.xml
===================================================================
--- trunk/blfs/kde/add/kmix.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/kmix.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -66,7 +66,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/konsole.xml
===================================================================
--- trunk/blfs/kde/add/konsole.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/konsole.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/libkcddb.xml
===================================================================
--- trunk/blfs/kde/add/libkcddb.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/libkcddb.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -79,7 +79,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/kde/add/libkdcraw.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/kde/add/libkexiv2.xml
===================================================================
--- trunk/blfs/kde/add/libkexiv2.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/libkexiv2.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -63,7 +63,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/okular.xml
===================================================================
--- trunk/blfs/kde/add/okular.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/add/okular.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -89,7 +89,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/akonadi.xml
===================================================================
--- trunk/blfs/kde/core/akonadi.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/akonadi.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -70,7 +70,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;        -DCMAKE_BUILD_TYPE=Release                 -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE        -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;  \
+      -DCMAKE_BUILD_TYPE=Release           \
+      -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE  \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
      <para>Pour tester les résultats, tappez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/baloo-widgets.xml
===================================================================
--- trunk/blfs/kde/core/baloo-widgets.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/baloo-widgets.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -61,7 +61,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>

Modified: trunk/blfs/kde/core/baloo.xml
===================================================================
--- trunk/blfs/kde/core/baloo.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/baloo.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -67,7 +67,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/kde/core/kactivities.xml
===================================================================
--- trunk/blfs/kde/core/kactivities.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/kactivities.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas une suite de tests.</para>

Modified: trunk/blfs/kde/core/kde-baseapps.xml
===================================================================
--- trunk/blfs/kde/core/kde-baseapps.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/kde-baseapps.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -75,7 +75,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/kde-runtime.xml
===================================================================
--- trunk/blfs/kde/core/kde-runtime.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/kde-runtime.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -83,7 +83,11 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;               -DSYSCONF_INSTALL_DIR=/etc                        -DCMAKE_BUILD_TYPE=Release                        -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;         \
+      -DSYSCONF_INSTALL_DIR=/etc                  \
+      -DCMAKE_BUILD_TYPE=Release                  \
+      -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/kde-workspace.xml
===================================================================
--- trunk/blfs/kde/core/kde-workspace.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/kde-workspace.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -103,7 +103,8 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 37 kdm &&
-useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm         -u 37 -s /bin/false kdm &&
+useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm \
+        -u 37 -s /bin/false kdm &&
 install -o kdm -g kdm -dm755 /var/lib/kdm</userinput>
 </screen>
     <para>Installez <application>Kde-workspace</application> en lançant les commandes
@@ -111,14 +112,19 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;                 -DSYSCONF_INSTALL_DIR=/etc                         -DCMAKE_BUILD_TYPE=Release                         -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;           \
+      -DSYSCONF_INSTALL_DIR=/etc                   \
+      -DCMAKE_BUILD_TYPE=Release                   \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install                  &&
 mkdir -p /usr/share/xsessions &&
-ln -sf &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop        /usr/share/xsessions/kde-plasma.desktop</userinput>
+ln -sf &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop \
+       /usr/share/xsessions/kde-plasma.desktop</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/kde/core/kdelibs.xml
===================================================================
--- trunk/blfs/kde/core/kdelibs.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/kdelibs.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -94,15 +94,21 @@
     <para>Corrigez des conflits de fichier avec <application>GNOME Menus</application> en lançant
     les commandes suivantes:</para>
 <screen>
-<userinput>sed -i "s@{SYSCONF_INSTALL_DIR}/xdg/menus@& RENAME kde-applications.menu@"         kded/CMakeLists.txt &&
-sed -i "s at applications.menu@kde-&@"         kded/kbuildsycoca.cpp</userinput>
+<userinput>sed -i "s@{SYSCONF_INSTALL_DIR}/xdg/menus@& RENAME kde-applications.menu@" \
+        kded/CMakeLists.txt &&
+sed -i "s at applications.menu@kde-&@" \
+        kded/kbuildsycoca.cpp</userinput>
 </screen>
    <para>Installez <application>Kdelibs</application> en lançant les commandes
     suivantes :</para>
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DSYSCONF_INSTALL_DIR=/etc               -DCMAKE_BUILD_TYPE=Release               -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version;       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version; \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
 <para>Les tests de régression unitaires sont prévus pour être lancés

Modified: trunk/blfs/kde/core/kdepimlibs.xml
===================================================================
--- trunk/blfs/kde/core/kdepimlibs.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/kdepimlibs.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -79,7 +79,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>La suite de tests complètes pour ce paquet n'est pas active par défaut

Modified: trunk/blfs/kde/core/kfilemetadata.xml
===================================================================
--- trunk/blfs/kde/core/kfilemetadata.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/kfilemetadata.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -71,7 +71,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/kde/core/phonon-backend-gstreamer.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -70,7 +70,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_INSTALL_LIBDIR=lib               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon-backend-vlc.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-vlc.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/phonon-backend-vlc.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -63,7 +63,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_INSTALL_LIBDIR=lib               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon.xml
===================================================================
--- trunk/blfs/kde/core/phonon.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/kde/core/phonon.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -66,18 +66,21 @@
     <para>Soyez sûr que <xref linkend="qt4"/> est compilé sans la bibliothèque fournie
     <application>Phonon</application>. Ce paquet fournit une meilleure
     implémentation.</para>
-
     <note><para>Si vous avez Qt4 et Qt5 d'installé, soyez certain de lancer
     <userinput>source setqt4</userinput> avant l'installation de  Phonon.
     </para></note>
-
     
     <para>Installez <application>Phonon</application> en lançant les commandes
     suivantes :</para>
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release       -DCMAKE_INSTALL_LIBDIR=lib       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE       -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE \
+      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/lxde/apps/gpicview.xml
===================================================================
--- trunk/blfs/lxde/apps/gpicview.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/lxde/apps/gpicview.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -85,7 +85,8 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make install</userinput>
+<userinput>make install &&
+sed -i 's/Utility;//' /usr/share/applications/gpicview.desktop</userinput>
 </screen>
     <para>
       Si vous avez installé <xref linkend="xdg-utils"/>, en tant qu'utilisateur 
@@ -101,8 +102,6 @@
       <application>GPicView</application>.
     </para>
   </sect2>
-
-
   <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/lxde/apps/lxappearance-obconf.xml
===================================================================
--- trunk/blfs/lxde/apps/lxappearance-obconf.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/lxde/apps/lxappearance-obconf.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -78,7 +78,7 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr --disable-static &&
 make</userinput>
 </screen>
     <para>
@@ -96,8 +96,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
   </sect2>
-
-
   <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>
@@ -110,7 +108,6 @@
         </seg>
         <seg>
            /usr/lib/lxappearance/plugins/obconf.so
-
         </seg>
         <seg>
           /usr/lib/lxappearance et

Modified: trunk/blfs/lxde/apps/lxdm.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/lxde/desktop/libfm-extra.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/lxde/desktop/libfm.xml
===================================================================
--- trunk/blfs/lxde/desktop/libfm.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/lxde/desktop/libfm.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -90,7 +90,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static  &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/lxde/desktop/lxappearance.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxappearance.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/lxde/desktop/lxappearance.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -87,7 +87,10 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --enable-dbus     &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-dbus     &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/lxde/desktop/lxde-common.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxde-common.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/lxde/desktop/lxde-common.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -97,8 +97,7 @@
        
     </para>
 <screen>
-<userinput>sed -e "s:@prefix@/share/lxde/pcmanfm:@sysconfdir@/xdg/pcmanfm/LXDE:"     -i startlxde.in &&
-./configure --prefix=/usr --sysconfdir=/etc &&
+<userinput>./configure --prefix=/usr --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>
@@ -109,7 +108,9 @@
     </para>
 <screen role="root">
 <userinput>make install &&
-install -Dm644 lxde-logout.desktop /usr/share/applications/lxde-logout.desktop</userinput>
+ln -svfn profile/LXDE /etc/xdg/lxpanel/LXDE &&
+install -Dm644 lxde-logout.desktop \
+               /usr/share/applications/lxde-logout.desktop</userinput>
 </screen>
     <para>
       Si vosu avez installez les dépendances recommandées, lancez les commandes suivantes en tant qu'utilisateur
@@ -135,18 +136,12 @@
 </screen>
 </sect2>
 <sect2>
-
      <title>Command Explanations</title>
-
      <para>
       <command>ln -svfn profile/LXDE ...</command>: corrige le mauvais chemin du profile par défaut
       de <application>LXPanel</application>.
      </para>
-
-
   </sect2>
-
-
   <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/lxde/desktop/menu-cache.xml
===================================================================
--- trunk/blfs/lxde/desktop/menu-cache.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/lxde/desktop/menu-cache.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -81,7 +81,8 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/lxde/desktop/pcmanfm.xml
===================================================================
--- trunk/blfs/lxde/desktop/pcmanfm.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/lxde/desktop/pcmanfm.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -92,7 +92,8 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make install</userinput>
+<userinput>make install &&
+sed -i 's/System;//' /usr/share/applications/pcmanfm.desktop</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">
@@ -102,8 +103,6 @@
       <application>PCManFM</application>.
     </para>
   </sect2>
-
-
   <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/multimedia/audioutils/amarok.xml
===================================================================
--- trunk/blfs/multimedia/audioutils/amarok.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/audioutils/amarok.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -83,13 +83,10 @@
   </sect2>
   <sect2 role="installation">
     <title>Installation de amarok</title>
-
     <note><para>Amarok dépend fortement de $KDE_PREFIX.  Si une nouvelle version de 
     KDE est installé dans un endroit différent (en installant kde dans un répertoire versionné de /opt), alors ce
      paquet devra être réinstallé.
     </para></note>
-
-
     <para>Install <application>amarok</application> by running
     the following </para>
 <screen>

Modified: trunk/blfs/multimedia/cdwriteutils/simpleburn.xml
===================================================================
--- trunk/blfs/multimedia/cdwriteutils/simpleburn.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/cdwriteutils/simpleburn.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -97,8 +97,8 @@
     </para>
 <screen>
 <userinput>mkdir build &&
-cd build &&
-cmake -DCMAKE_BUILD_TYPE=Release \
+cd    build &&
+cmake -DCMAKE_BUILD_TYPE=Release  \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DBURNING=LIBBURNIA .. &&
 make</userinput>

Modified: trunk/blfs/multimedia/libdriv/alsa-lib.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/alsa-lib.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/alsa-lib.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -105,8 +105,11 @@
 </screen>
         <para>Maintenant, pour installer la documentation de l'API, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -d -m755 /usr/share/doc/alsa-lib-&alsa-lib-version;/html &&
-install -v -m644 doc/doxygen/html/* /usr/share/doc/alsa-lib-&alsa-lib-version;/html</userinput>
+<userinput>install -v -d -m755 /usr/share/doc/alsa-lib-&alsa-lib-version;/html/search &&
+install -v -m644 doc/doxygen/html/*.* \
+                /usr/share/doc/alsa-lib-&alsa-lib-version;/html &&
+install -v -m644 doc/doxygen/html/search/* \
+                /usr/share/doc/alsa-lib-&alsa-lib-version;/html/search</userinput>
 </screen>
  
   </sect2>

Modified: trunk/blfs/multimedia/libdriv/alsa-tools.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/alsa-tools.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/alsa-tools.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -68,26 +68,28 @@
     <title>Installation de ALSA Tools</title>
 &as_root;
     <para>En premier, démarrez un sous-shell qui sortira sur une erreur:</para>
-<screen><userinput>bash -e</userinput></screen>
+<screen>
+<userinput>bash -e</userinput>
+</screen>
      <para>
       Maintenant, enlevez un outil qui demande <application>Qt2 ou 3</application> et deux fichiers inutiles
      (pour les instructions  BLFS dessous):
      </para>
-<screen><userinput>rm -rf qlo10k1 Makefile gitcompile</userinput></screen>
-
+<screen>
+<userinput>rm -rf qlo10k1 Makefile gitcompile</userinput>
+</screen>
     <para>Le paquet <application>ALSA Tools</application> n'est nécessaire que
     pour ceux ayant des exigences élevées de leur carte son. Les outils peuvent être construit
     tous en une seule fois, mais si seulement une partie est nécessaire, vous devez faire un 
     <command>cd</command> dans
     le répertoire de chaque outil que vous souhaitez compiler. Ici, nous présentons les instructions
     pour construire tous les outils.</para>
-
      <para>
       Installez tous les <application>ALSA Tools</application> en lançant les commandes
       suivantes :
      </para>
-
-<screen><userinput>for tool in *
+<screen>
+<userinput>for tool in *
 do
   case $tool in
     seq )
@@ -104,10 +106,12 @@
     as_root /sbin/ldconfig
   popd
 done
-unset tool tool_dir</userinput></screen>
-
+unset tool tool_dir</userinput>
+</screen>
     <para>Finallement, quitter le shell qui a été démarré plus tot:</para>
-<screen><userinput>exit</userinput></screen>
+<screen>
+<userinput>exit</userinput>
+</screen>
   </sect2>
   <sect2 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/multimedia/libdriv/grilo.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/grilo.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/grilo.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -75,7 +75,8 @@
     <para>Install <application>Grilo</application> by running the
     following </para>
 <screen>
-<userinput>./configure --prefix=/usr             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --disable-static &&
 make</userinput>
 </screen>
     

Modified: trunk/blfs/multimedia/libdriv/gst10-libav.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-libav.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/gst10-libav.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -87,7 +87,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Libav Plugins &gst10-libav-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Libav Plugins &gst10-libav-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -131,7 +131,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Bad Plugins &gst10-plugins-bad-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Bad Plugins &gst10-plugins-bad-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -106,7 +106,9 @@
       commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Base Plugins &gst10-plugins-base-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Base Plugins &gst10-plugins-base-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -115,7 +115,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/"  &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/"  &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -103,7 +103,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Ugly Plugins &gst10-plugins-ugly-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Ugly Plugins &gst10-plugins-ugly-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gstreamer10.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gstreamer10.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/gstreamer10.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -91,7 +91,9 @@
       Installez <application>GStreamer</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer &gstreamer10-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer &gstreamer10-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/icedtea-sound.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/multimedia/libdriv/libdvdnav.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libdvdnav.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/libdvdnav.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -60,7 +60,7 @@
     <para>Installez <application>libdvdnav</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./autogen.sh --prefix=/usr &&
+<userinput>./configure --prefix=/usr --docdir=/usr/share/doc/libdvdnav-&libdvdnav-version; &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/multimedia/libdriv/libdvdread.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libdvdread.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/libdvdread.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -55,7 +55,9 @@
     <para>Installez <application>libdvdread</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-static             --docdir=/usr/share/libdvdread-&libdvdread-version; &&
+<userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/libdvdread-&libdvdread-version; &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/multimedia/libdriv/pulseaudio.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/pulseaudio.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/pulseaudio.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -189,8 +189,10 @@
         Par exemple, tapez la commande suivante en tant qu'utilisateur
         <systemitem class="username">root</systemitem>:
      </para>
-<screen role="root"><userinput>sed '/load-module module-console-kit/s/^/#/' \
-                    -i /etc/pulse/default.pa</userinput></screen>
+<screen role="root">
+<userinput>sed '/load-module module-console-kit/s/^/#/' \
+                    -i /etc/pulse/default.pa</userinput>
+</screen>
       <para>
         Vous pouvez également configurer le système audio. Vous devez
        démarrer <application>pulseaudio</application> en ligne de commande en utilisant.

Modified: trunk/blfs/multimedia/libdriv/x264.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/x264.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/libdriv/x264.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -76,7 +76,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --enable-shared             --disable-cli &&
+<userinput>./configure --prefix=/usr \
+            --enable-shared \
+            --disable-cli &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/ffmpeg.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/videoutils/ffmpeg.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -130,7 +130,21 @@
     
 <screen>
 <userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &&
-./configure --prefix=/usr                    --enable-gpl                     --enable-version3                --enable-nonfree                 --disable-static                 --enable-shared                  --disable-debug                  --enable-libass                  --enable-libfdk-aac              --enable-libmp3lame              --enable-libtheora               --enable-libvorbis               --enable-libvpx                  --enable-libx264                 --enable-x11grab     &&
+./configure --prefix=/usr        \
+            --enable-gpl         \
+            --enable-version3    \
+            --enable-nonfree     \
+            --disable-static     \
+            --enable-shared      \
+            --disable-debug      \
+            --enable-libass      \
+            --enable-libfdk-aac  \
+            --enable-libmp3lame  \
+            --enable-libtheora   \
+            --enable-libvorbis   \
+            --enable-libvpx      \
+            --enable-libx264     \
+            --enable-x11grab     &&
 make &&
 gcc tools/qt-faststart.c -o tools/qt-faststart</userinput>
 </screen>
@@ -144,12 +158,15 @@
       Postscript de la documentation, tapez les commandes suivantes:
     </para>
 <screen>
-<userinput>pushd doc &&
+<userinput>sed -i '$s/$/\n\n at bye/' doc/{git-howto,nut,fate}.texi             &&
+sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &&
+pushd doc &&
 for DOCNAME in `basename -s .html *.html`
 do
     texi2pdf -b $DOCNAME.texi &&
     texi2dvi -b $DOCNAME.texi &&
-    dvips -o    $DOCNAME.ps                   $DOCNAME.dvi
+    dvips -o    $DOCNAME.ps   \
+                $DOCNAME.dvi
 done                          &&
 popd                          &&
 unset DOCNAME</userinput>
@@ -189,21 +206,25 @@
 <userinput>make install &&
 install -v -m755    tools/qt-faststart /usr/bin &&
 install -v -m755 -d /usr/share/doc/ffmpeg &&
-install -v -m644    doc/*.txt                     /usr/share/doc/ffmpeg</userinput>
+install -v -m644    doc/*.txt \
+                    /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>
 	Si la documentation HTML est construite, tapez la commande suivante pour l'installer:
     </para>
 <screen role="root">
-<userinput>install -v -m644 doc/*.html                  /usr/share/doc/ffmpeg</userinput>
+<userinput>install -v -m644 doc/*.html \
+                 /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>Si vous avez utilisé <command>doxygen</command> pour créer la 
     documentation de l'API, installez-la (300 Mo d'espace en plus) en
     lançant les commandes suivantes en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api &&
-install -v -m644    doc/doxy/html/*                     /usr/share/doc/ffmpeg/api</userinput>
+<userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api                       &&
+cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg/api                    &&
+find /usr/share/doc/ffmpeg/api -type f -exec chmod -c 0644 "{}" ";" &&
+find /usr/share/doc/ffmpeg/api -type d -exec chmod -c 0755 "{}" ";"</userinput>
 </screen>
    </sect2>
   <sect2 role="commands">
@@ -220,7 +241,6 @@
     <para>
       <command>find ... ";"</command>: Corrige des droits de fichiers et de répertoires de documentation.
     </para>
-
     <para>
       <option>--enable-libfreetype</option>: Active le support de 
       <application>Freetype</application>.

Modified: trunk/blfs/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/mplayer.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/videoutils/mplayer.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -208,8 +208,7 @@
       <para>Installez <application>MPlayer</application> en lançant les commandes
       suivantes :</para>
 <screen>
-<userinput>
-patch -Np1 -i ../MPlayer-&mplayer-version;-giflib_fixes-1.patch &&
+<userinput> patch -Np1 -i ../MPlayer-&mplayer-version;-giflib_fixes-1.patch &&
 patch -Np1 -i ../MPlayer-&mplayer-version;-live_fixes-1.patch   &&
 sed -i 's:libsmbclient.h:samba-4.0/&:'      configure stream/stream_smb.c &&
 sed -i 's/EGifCloseFile(new_gif/&, NULL/'   libvo/vo_gif89a.c             &&

Modified: trunk/blfs/multimedia/videoutils/xine-ui.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/xine-ui.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/multimedia/videoutils/xine-ui.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -6,8 +6,6 @@
   <!ENTITY xine-ui-download-http
     "&sourceforge-repo;/xine/xine-ui-&xine-ui-version;.tar.xz">
   <!ENTITY xine-ui-download-ftp " ">
-<!--  <!ENTITY xine-ui-download-ftp
-    "&gentoo-ftp-repo;/xine-ui-&xine-ui-version;.tar.xz">-->
   <!ENTITY xine-ui-md5sum        "a6d00381b5c8b7aec1a7a3fbf84f01ce">
   <!ENTITY xine-ui-size          "1.7 Mo">
   <!ENTITY xine-ui-buildsize     "26 Mo">
@@ -75,8 +73,7 @@
      Installez <application>xine User Interface</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>sed -i 's/(CPPFunction[^)]*)//' src/xitk/network.c &&
-./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/networking/connect/dhcp.xml
===================================================================
--- trunk/blfs/networking/connect/dhcp.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/connect/dhcp.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -85,8 +85,17 @@
     <para>Installez <application>ISC DHCP</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../dhcp-&dhcp-version;-client_script-2.patch &&
-CFLAGS="-D_PATH_DHCLIENT_SCRIPT='"/sbin/dhclient-script"'                 -D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'                       -D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'"        ./configure --prefix=/usr                                                       --sysconfdir=/etc/dhcp                                              --localstatedir=/var                                                --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases                   --with-srv6-lease-file=/var/lib/dhcpd/dhcpd6.leases                 --with-cli-lease-file=/var/lib/dhclient/dhclient.leases             --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases &&
+<userinput>patch -Np1 -i ../dhcp-&dhcp-version;-client_script-1.patch &&
+CFLAGS="-D_PATH_DHCLIENT_SCRIPT='\"/sbin/dhclient-script\"'         \
+        -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'               \
+        -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'"        \
+./configure --prefix=/usr                                           \
+            --sysconfdir=/etc/dhcp                                  \
+            --localstatedir=/var                                    \
+            --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases       \
+            --with-srv6-lease-file=/var/lib/dhcpd/dhcpd6.leases     \
+            --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
+            --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command></para>

Modified: trunk/blfs/networking/mailnews/mutt.xml
===================================================================
--- trunk/blfs/networking/mailnews/mutt.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/mailnews/mutt.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -108,12 +108,16 @@
     <para>Installez <application>Mutt</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --sysconfdir=/etc \
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
             --with-docdir=/usr/share/doc/mutt-&mutt-version; \
-            --enable-pop --enable-imap \
-            --enable-hcache --without-qdbm \
-            --without-tokyocabinet \
-            --with-gdbm --without-bdb &&
+            --enable-pop      \
+            --enable-imap     \
+            --enable-hcache   \
+            --without-qdbm    \
+            --with-gdbm       \
+            --without-bdb     \
+            --without-tokyocabinet &&
 make</userinput>
 </screen>
    

Modified: trunk/blfs/networking/netlibs/libpcap.xml
===================================================================
--- trunk/blfs/networking/netlibs/libpcap.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netlibs/libpcap.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -57,8 +57,6 @@
         </para>
       </listitem>
     </itemizedlist>
-
-
     <bridgehead renderas="sect3">Dépendances de libpcap</bridgehead>
     <bridgehead renderas="sect4">Facultatives</bridgehead>
     <para role="optional">
@@ -77,7 +75,8 @@
     <para>Installez <application>libpcap</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --enable-bluetooth=no &&
+<userinput>patch -Np1 -i ../libpcap-&libpcap-version;-enable_bluetooth-1.patch &&
+./configure --prefix=/usr &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -85,7 +84,7 @@
       Si vous voulez désactiver l'installation des bibliothèques statiques, utilisez ce sed:
     </para>
 <screen>
-<userinput>sed -i '/INSTALL_DATA.*libpcap.a|RANLIB.*libpcap.a/ s/^/#/' Makefile</userinput>
+<userinput>sed -i '/INSTALL_DATA.*libpcap.a\|RANLIB.*libpcap.a/ s/^/#/' Makefile</userinput>
 </screen>
     <para>
 Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/networking/netlibs/serf.xml
===================================================================
--- trunk/blfs/networking/netlibs/serf.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netlibs/serf.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,9 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!-- This link does not work presently (as of February 16th, 2014), but the
-     next one may have to be updated soon.
-  <!ENTITY serf-download-http "https://serf.googlecode.com/files/serf-&serf-version;.tar.bz2">-->
   <!ENTITY serf-download-http "http://serf.googlecode.com/svn/src_releases/serf-&serf-version;.tar.bz2">
   <!ENTITY serf-download-ftp  " ">
   <!ENTITY serf-md5sum        "0a6fa745df4517dd8f79c75c538919bc">

Modified: trunk/blfs/networking/netprogs/bridgeutils.xml
===================================================================
--- trunk/blfs/networking/netprogs/bridgeutils.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netprogs/bridgeutils.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -71,7 +71,7 @@
 <screen>
 <literal>Networking support: Y
   Networking options:
-    802.1d Ethernet Bridging: M or Y</literal>
+    802.1d Ethernet Bridging: M or Y [CONFIG_BRIDGE]</literal>
 </screen>
     <indexterm zone="bridgeutils bridgeutils-kernel">
       <primary sortas="d-bridgeutils">Bridge Utilities</primary>

Modified: trunk/blfs/networking/netprogs/cifsutils.xml
===================================================================
--- trunk/blfs/networking/netprogs/cifsutils.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netprogs/cifsutils.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -69,7 +69,7 @@
 <screen>
 <literal>File systems  --->
   Network File Systems  --->
-    CIFS support (advanced network filesystem, SMBFS successor): Y or M</literal>
+    CIFS support (advanced network filesystem, SMBFS successor): Y or M [CONFIG_CIFS]</literal>
 </screen>
     <indexterm zone="cifsutils cifsutils-kernel">
       <primary sortas="d-cifsutils">cifs-utils</primary>

Modified: trunk/blfs/networking/netprogs/samba.xml
===================================================================
--- trunk/blfs/networking/netprogs/samba.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netprogs/samba.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -63,8 +63,6 @@
     <para role="recommanded">
       <xref linkend="libxslt"/> (pour la documentation)
     </para>
-
-
       <bridgehead renderas="sect4">Facultatives</bridgehead>
       <para role="optional">
       <xref linkend="avahi"/>,

Modified: trunk/blfs/networking/netutils/avahi.xml
===================================================================
--- trunk/blfs/networking/netutils/avahi.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netutils/avahi.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY avahi-download-http "http://avahi.org/download/avahi-&avahi-version;.tar.gz">-->
   <!ENTITY avahi-download-http "&fedora-http-repo;/avahi/avahi-&avahi-version;.tar.gz/&avahi-md5sum;/avahi-&avahi-version;.tar.gz">
   <!ENTITY avahi-download-ftp  " ">
   <!ENTITY avahi-md5sum        "2f22745b8f7368ad5a0a3fddac343f2d">
@@ -77,7 +76,8 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>groupadd -fg 84 avahi &&
-useradd -c "Avahi Daemon Owner" -d /var/run/avahi-daemon -u 84         -g avahi -s /bin/false avahi</userinput>
+useradd -c "Avahi Daemon Owner" -d /var/run/avahi-daemon -u 84 \
+        -g avahi -s /bin/false avahi</userinput>
 </screen>
     <para>Il doit y avoir un groupe d'accès dédiés pour les clients
     <application>Avahi</application> . Taper les commandes suivantes en tant
@@ -88,9 +88,21 @@
     <para>Installez <application>avahi</application> en lançant les commandes 
     suivantes:</para>
 <screen>
-<userinput>sed -i 's/(CFLAGS=.*)-Werror (.*)/12/' configure &&
-sed -i -e 's/-DG_DISABLE_DEPRECATED=1//'  -e '/-DGDK_DISABLE_DEPRECATED/d' avahi-ui/Makefile.in &&
-./configure --prefix=/usr                    --sysconfdir=/etc                --localstatedir=/var             --disable-static                 --disable-mono                   --disable-monodoc                --disable-python                 --disable-qt3                    --disable-qt4                    --enable-core-docs               --with-distro=none &&
+<userinput>sed -i 's/\(CFLAGS=.*\)-Werror \(.*\)/\1\2/' configure &&
+sed -i -e 's/-DG_DISABLE_DEPRECATED=1//' \
+ -e '/-DGDK_DISABLE_DEPRECATED/d' avahi-ui/Makefile.in &&
+./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-static     \
+            --disable-mono       \
+            --disable-monodoc    \
+            --disable-python     \
+            --disable-qt3        \
+            --disable-qt4        \
+            --enable-core-docs   \
+            --with-distro=none   \
+            --with-systemdsystemunitdir=no &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de tests.</para>
@@ -133,8 +145,6 @@
       dans BLFS, qui ne supporte pas 
       <application>systemd</application>.
     </para>
-
-
     <para><option>--disable-dbus</option> : Ce paramètre désactive
     l'utilisation de <application>D-Bus</application>.</para>
     <para><option>--disable-gtk</option> : Ce paramètre désactive

Modified: trunk/blfs/networking/netutils/mod_dnssd.xml
===================================================================
--- trunk/blfs/networking/netutils/mod_dnssd.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netutils/mod_dnssd.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY mod_dnssd-download-http "http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz">-->
   <!ENTITY mod_dnssd-download-http "&fedora-http-repo;/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz/&mod_dnssd-md5sum;/mod_dnssd-&mod_dnssd-version;.tar.gz">
   <!ENTITY mod_dnssd-download-ftp  " ">
   <!ENTITY mod_dnssd-md5sum        "bed3d95a98168bf0515922d1c05020c5">
@@ -65,7 +64,8 @@
     suivantes:</para>
 <screen>
 <userinput>sed -i 's/unixd_setup_child/ap_&/' src/mod_dnssd.c &&
-./configure --prefix=/usr             --disable-lynx &&
+./configure --prefix=/usr \
+            --disable-lynx &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de tests.</para>

Modified: trunk/blfs/networking/netutils/nmap.xml
===================================================================
--- trunk/blfs/networking/netutils/nmap.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netutils/nmap.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -4,7 +4,6 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
   <!ENTITY nmap-download-http "http://nmap.org/dist/nmap-&nmap-version;.tar.bz2">
-<!--  <!ENTITY nmap-download-ftp  "&gentoo-ftp-repo;/nmap-&nmap-version;.tar.bz2">-->
   <!ENTITY nmap-download-ftp  " ">
   <!ENTITY nmap-md5sum        "edfe81f6763223c0a29bfa15a8526e2a">
   <!ENTITY nmap-size          "7.5 Mo">
@@ -84,7 +83,9 @@
 make -j1</userinput>
 </screen>
     <para>Si vous voulez lancer la suite de tests, lancer la commande suivante:</para>
-<screen><userinput>sed -i 's/lib./lib/' zenmap/test/run_tests.py</userinput></screen>
+<screen>
+<userinput>sed -i 's/lib./lib/' zenmap/test/run_tests.py</userinput>
+</screen>
     <para>Pour tester les résultats, tapez : <command>make -k check</command> en tant qu'utilisateur
     <systemitem class="username">root</systemitem>. Les tests nécessitent une session graphique. Quelques
      tests peuvent échouer.</para>

Modified: trunk/blfs/networking/netutils/wireshark.xml
===================================================================
--- trunk/blfs/networking/netutils/wireshark.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/networking/netutils/wireshark.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -163,7 +163,10 @@
     <para>Continuez à installer <application>Wireshark</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                 --with-gtk3=yes               --with-qt=no                  --sysconfdir=/etc &&
+<userinput>./configure --prefix=/usr     \
+            --with-gtk3=yes   \
+            --with-qt=no      \
+            --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de test</para>
@@ -172,15 +175,19 @@
 <userinput>make install &&
 install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &&
 install -v -m755 -d /usr/share/pixmaps/wireshark &&
-install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt}                     /usr/share/doc/wireshark-&wireshark-version; &&
+install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt} \
+                    /usr/share/doc/wireshark-&wireshark-version; &&
 pushd /usr/share/doc/wireshark-&wireshark-version; &&
    for FILENAME in ../../wireshark/*.html; do
       ln -s -v -f $FILENAME .
    done &&
 popd &&
-install -v -m644 -D wireshark.desktop                     /usr/share/applications/wireshark.desktop &&
-install -v -m644 -D image/wsicon48.png                     /usr/share/pixmaps/wireshark.png &&
-install -v -m644    image/*.{png,ico,xpm,bmp}                     /usr/share/pixmaps/wireshark</userinput>
+install -v -m644 -D wireshark.desktop \
+                    /usr/share/applications/wireshark.desktop &&
+install -v -m644 -D image/wsicon48.png \
+                    /usr/share/pixmaps/wireshark.png &&
+install -v -m644    image/*.{png,ico,xpm,bmp} \
+                    /usr/share/pixmaps/wireshark</userinput>
 </screen>
     <para>Si vous avez téléchargé un des fichiers de documentation mentionnés dans 'Téléchargements supplémentaires', installez les en suivant les commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
@@ -207,16 +214,13 @@
      sont installées, quand on tente de construire avec
      <application>Qt4</application>,
     et que <command>make</command> ne se termine pas.</para>
-
     <para><option>--disable-wireshark</option>: Cette option est requise si vous
     avez installé <application>GTK+</application> mais ne voulez pas construire les interfaces
     GTK+ et Qt.</para>
-
     <para><parameter>--with-gtk3=yes</parameter>: Ce paramètre est requis pour utiliser
 <application>GTK+3</application> pour l'interface, Si vous utilisez
     <parameter>--with-qt=no</parameter>. Changez gtk3 par gtk2,pour utiliser
     <application>GTK+3</application> pour l'interface.</para>
-
     <para><parameter>--with-qt=no</parameter>: Cette option désactive la construction de l'interface Qt. Remplacez
      "no" par "yes", si vous voulez la construire.</para>
     <para><option>--with-gtk2=yes</option>: Cette option est requise si vous voulez utiliser
@@ -249,15 +253,19 @@
       il y a deux possibilités (les instructions doivent être exécutées en tant que root).</para>
       <para>Si seulement l'interface Qt est construite:</para>
 <screen role="root">
-<userinput>mv -v /usr/share/applications/wireshark.desktop       /usr/share/applications/wireshark-qt.desktop</userinput>
+<userinput>mv -v /usr/share/applications/wireshark.desktop \
+      /usr/share/applications/wireshark-qt.desktop</userinput>
 </screen>
       <para>Si les deux interfaces GTK+ et Qt sont construites:</para>
 <screen role="root">
-<userinput>cp -v /usr/share/applications/wireshark.desktop       /usr/share/applications/wireshark-qt.desktop</userinput>
+<userinput>cp -v /usr/share/applications/wireshark.desktop \
+      /usr/share/applications/wireshark-qt.desktop</userinput>
 </screen>
       <para>Maintenant corriger pour <command>wireshark-qt</command>:</para>
 <screen role="root">
-<userinput>sed -e 's/ireshark/&-qt/'     -e 's/^(Icon=wireshark)-qt/1/'     -i /usr/share/applications/wireshark-qt.desktop</userinput>
+<userinput>sed -e 's/ireshark/&-qt/' \
+    -e 's/^\(Icon=wireshark\)-qt/\1/' \
+    -i /usr/share/applications/wireshark-qt.desktop</userinput>
 </screen>
       <note>
         <para>Si vous voulez regarder les paquets, assurez vous que vous ne les filtrez pas avec <xref linkend="iptables"/>. Si vous voulez exclure certaines classes de paquets, il est plus efficace de le faire avec <application>iptables</application> qu'avec <application>Wireshark</application>.</para>

Modified: trunk/blfs/postlfs/config/profile.xml
===================================================================
--- trunk/blfs/postlfs/config/profile.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/config/profile.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -122,7 +122,8 @@
 export HISTSIZE=1000
 export HISTIGNORE="&:[bf]g:exit"
 # Set some defaults for graphical systems
-export XDG_DATA_DIRS=/usr/share
+export XDG_DATA_DIRS=/usr/share/
+export XDG_CONFIG_DIRS=/etc/xdg/
 # Setup a red prompt for root and a green one for users.
 NORMAL="\[\e[0m\]"
 RED="\[\e[1;31m\]"
@@ -137,6 +138,7 @@
                 . $script
         fi
 done
+unset script RED GREEN NORMAL
 # End /etc/profile</literal>
 EOF</userinput>
 </screen>
@@ -196,13 +198,7 @@
 fi
 if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
         pathprepend /usr/local/sbin
-fi
-if [ -d ~/bin ]; then
-        pathprepend ~/bin
-fi
-#if [ $EUID -gt 99 ]; then
-#        pathappend .
-#fi</literal>
+fi</literal>
 EOF</userinput>
 </screen>
     </sect3>
@@ -302,6 +298,7 @@
 else
   PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
 fi
+unset RED GREEN NORMAL
 # End /etc/bashrc</literal>
 EOF</userinput>
 </screen>
@@ -328,25 +325,16 @@
 # Personal aliases and functions should go in ~/.bashrc.  System wide
 # environment variables and startup programs are in /etc/profile.
 # System wide aliases and functions are in /etc/bashrc.
-append () {
-  # First remove the directory
-  local IFS=':'
-  local NEWPATH
-  for DIR in $PATH; do
-     if [ "$DIR" != "$1" ]; then
-       NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
-     fi
-  done
-  # Then append the directory
-  export PATH=$NEWPATH:$1
-}
 if [ -f "$HOME/.bashrc" ] ; then
   source $HOME/.bashrc
 fi
 if [ -d "$HOME/bin" ] ; then
-  append $HOME/bin
+  pathprepend $HOME/bin
 fi
-unset append
+# Having . in the PATH is dangerous
+#if [ $EUID -gt 99 ]; then
+#  pathappend .
+#fi
 # End ~/.bash_profile</literal>
 EOF</userinput>
 </screen>

Modified: trunk/blfs/postlfs/config/users.xml
===================================================================
--- trunk/blfs/postlfs/config/users.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/config/users.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -62,7 +62,7 @@
       <tbody>
         <row><entry>bin     </entry><entry> 1</entry><entry>  </entry></row>
         <row><entry>lp      </entry><entry> 9</entry><entry>  </entry></row>
-        <!--<row><entry>usb     </entry><entry>  </entry><entry>14</entry></row> -->
+        
         <row><entry>adm     </entry><entry>  </entry><entry>16</entry></row>
         <row><entry>atd     </entry><entry>17</entry><entry>17</entry></row>
         <row><entry>messagebus</entry><entry>18</entry><entry>18</entry></row>
@@ -74,7 +74,7 @@
         <row><entry>apache  </entry><entry>25</entry><entry>25</entry></row>
         <row><entry>smmsp   </entry><entry>26</entry><entry>26</entry></row>
         <row><entry>polkitd </entry><entry>27</entry><entry>27</entry></row>
-        <!-- <row><entry>courier </entry><entry>30</entry><entry>30</entry></row> -->
+        
         <row><entry>exim    </entry><entry>31</entry><entry>31</entry></row>
         <row><entry>postfix </entry><entry>32</entry><entry>32</entry></row>
         <row><entry>postdrop</entry><entry>  </entry><entry>33</entry></row>
@@ -95,17 +95,14 @@
         <row><entry>stunnel </entry><entry>51</entry><entry>51</entry></row>
         <row><entry>svn     </entry><entry>56</entry><entry>56</entry></row>
         <row><entry>svntest </entry><entry>  </entry><entry>57</entry></row>
-        <!-- <row><entry>pulse   </entry><entry>58</entry><entry>58</entry></row>
-        <row><entry>pulse-access</entry><entry></entry><entry>59</entry></row>
--->
+        
         <row><entry>games   </entry><entry>60</entry><entry>60</entry></row>
         <row><entry>kvm     </entry><entry>  </entry><entry>61</entry></row>
         <row><entry>wireshark</entry><entry> </entry><entry>62</entry></row>
         <row><entry>lightdm </entry><entry>63</entry><entry>63</entry></row>
         <row><entry>scanner </entry><entry>  </entry><entry>70</entry></row>
         <row><entry>colord  </entry><entry>71</entry><entry>71</entry></row>
-
-        <!-- Begin systemd specific users and groups -->
+        
         <row><entry>systemd-bus-proxy</entry><entry>72</entry><entry>72</entry></row>
         <row><entry>systemd-journal-gateway</entry><entry>73</entry><entry>73</entry></row>
         <row><entry>systemd-journal-remote</entry><entry>74</entry><entry>74</entry></row>
@@ -113,8 +110,7 @@
         <row><entry>systemd-network</entry><entry>76</entry><entry>76</entry></row>
         <row><entry>systemd-resolve</entry><entry>77</entry><entry>77</entry></row>
         <row><entry>systemd-timesync</entry><entry>78</entry><entry>78</entry></row>
-        <!-- End systemd specific users and groups -->
-
+        
         <row><entry>ldap    </entry><entry>83</entry><entry>83</entry></row>
         <row><entry>avahi   </entry><entry>84</entry><entry>84</entry></row>
         <row><entry>avahi-autoipd</entry><entry>85</entry><entry>85</entry></row>

Modified: trunk/blfs/postlfs/editors/vim.xml
===================================================================
--- trunk/blfs/postlfs/editors/vim.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/editors/vim.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -171,7 +171,8 @@
         <filename>gvim.desktop</filename>, en tant qu'utilisateur <systemitem
         class="username">root</systemitem> 
       </para>
-<screen role="root"><userinput>cat > /usr/share/applications/gvim.desktop << "EOF"
+<screen role="root">
+<userinput>cat > /usr/share/applications/gvim.desktop << "EOF"
 <literal>[Desktop Entry]
 Name=GVim Text Editor
 Comment=Edit text files
@@ -184,11 +185,9 @@
 Categories=Utility;TextEditor;
 StartupNotify=true
 MimeType=text/plain;</literal>
-EOF</userinput></screen>
+EOF</userinput>
+</screen>
     </sect3>
-
-
-
     <sect3 id='vim-init'>
       <title>Informations de configuration</title>
       <para><application>Vim</application> a un vérificateur d'orthographe

Modified: trunk/blfs/postlfs/filesystems/fuse.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/fuse.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/filesystems/fuse.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -98,20 +98,8 @@
 fuse.xml.en
 fuse.xml.en.screen
 fuse.xml.fr
-list
-listen
-list-en
-listen2
-list-en2
-listen3
 listfr
-list-fr
-listfr2
-list-fr2
-listfr3
-listfr.complete
 sed8hOP5h
-synchro.erreur
 synchro_screen.sh
 test
 * Please install util-linux version 2.18 or later which supports *

Modified: trunk/blfs/postlfs/filesystems/lvm2.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/lvm2.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/filesystems/lvm2.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -85,7 +85,13 @@
     <para>Installez <application>lvm2</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                   --exec-prefix=                  --with-confdir=/etc             --enable-applib                 --enable-cmdlib                 --enable-pkgconfig              --enable-udev_sync &&
+<userinput>./configure --prefix=/usr       \
+            --exec-prefix=      \
+            --with-confdir=/etc \
+            --enable-applib     \
+            --enable-cmdlib     \
+            --enable-pkgconfig  \
+            --enable-udev_sync  &&
 make</userinput>
 </screen>
     

Modified: trunk/blfs/postlfs/filesystems/parted.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/parted.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/filesystems/parted.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -56,7 +56,6 @@
           </para>
         </listitem>
       </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de Parted</bridgehead>
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
@@ -72,11 +71,12 @@
   </sect2>
   <sect2 role="installation">
     <title>Installation de Parted</title>
-
     <para>
       Si vous voulez construire sans le support de périphériques mappés, une correction est nécessaire:
     </para>
-<screen><userinput>patch -Np1 -i ../parted-&parted-version;-devmapper-1.patch</userinput></screen>
+<screen>
+<userinput>patch -Np1 -i ../parted-&parted-version;-devmapper-1.patch</userinput>
+</screen>
  
     <para>Installez <application>Parted</application> en lançant les commandes
     suivantes :</para>

Modified: trunk/blfs/postlfs/filesystems/xfsprogs.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/xfsprogs.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/filesystems/xfsprogs.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -66,13 +66,16 @@
     <para>Installez <application>xfsprogs</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
+<userinput>make DEBUG=-DNDEBUG     \
+     INSTALL_USER=root  \
+     INSTALL_GROUP=root \
      LOCAL_CONFIGURE_OPTIONS="--enable-readline"</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make install install-dev &&
+<userinput>make install     &&
+make install-dev &&
 rm -rfv /lib/libhandle.{a,la,so} &&
 ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so &&
 sed -i "s at libdir='/lib at libdir='/usr/lib at g" /usr/lib/libhandle.la</userinput>

Modified: trunk/blfs/postlfs/security/cacerts.xml
===================================================================
--- trunk/blfs/postlfs/security/cacerts.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/security/cacerts.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -69,10 +69,10 @@
     class="username">root</systemitem> :</para>
   
 <screen role="root">
-<userinput>cat > /bin/make-cert.pl << "EOF"
+<userinput>cat > /usr/bin/make-cert.pl << "EOF"
 <literal>#!/usr/bin/perl -w
 # Used to generate PEM encoded files from Mozilla certdata.txt.
-# Run as ./mkcrt.pl > certificate.crt
+# Run as ./make-cert.pl > certificate.crt
 #
 # Parts of this script courtesy of RedHat (mkcabundle.pl)
 #
@@ -113,7 +113,7 @@
     }
 }</literal>
 EOF
-chmod +x /bin/make-cert.pl</userinput>
+chmod +x /usr/bin/make-cert.pl</userinput>
 </screen>
    <para>Le script suivant crée les certificats et un bouquet de tous les
    certificats. Il crée un répertoire <filename class='directory'>./certs</filename>
@@ -121,7 +121,7 @@
    ce script en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
    
 <screen role="root">
-<userinput>cat > /bin/make-ca.sh << "EOF"
+<userinput>cat > /usr/bin/make-ca.sh << "EOF"
 <literal>#!/bin/sh
 # Begin make-ca.sh
 # Script to populate OpenSSL's CApath from a bundle of PEM formatted CAs
@@ -147,10 +147,10 @@
 TEMPDIR=$(mktemp -d)
 TRUSTATTRIBUTES="CKA_TRUST_SERVER_AUTH"
 BUNDLE="BLFS-ca-bundle-${VERSION}.crt"
-CONVERTSCRIPT="/bin/make-cert.pl"
+CONVERTSCRIPT="/usr/bin/make-cert.pl"
 SSLDIR="/etc/ssl"
 mkdir "${TEMPDIR}/certs"
-# Get a list of staring lines for each cert
+# Get a list of starting lines for each cert
 CERTBEGINLIST=$(grep -n "^# Certificate" "${certdata}" | cut -d ":" -f1)
 # Get a list of ending lines for each cert
 CERTENDLIST=`grep -n "^CKA_TRUST_STEP_UP_APPROVED" "${certdata}" | cut -d ":" -f 1`
@@ -164,7 +164,7 @@
   # Dump to a temp file with the name of the file as the beginning line number
   sed -n "${certbegin},${certend}p" "${certdata}" > "${TEMPDIR}/certs/${certbegin}.tmp"
 done
-unset CERTBEGINLIST CERTDATA CERTENDLIST certebegin certend
+unset CERTBEGINLIST CERTDATA CERTENDLIST certbegin certend
 mkdir -p certs
 rm -f certs/*      # Make sure the directory is clean
 for tempfile in ${TEMPDIR}/certs/*.tmp; do
@@ -199,7 +199,7 @@
 cat certs/*.pem >  ${BUNDLE}
 rm -r "${TEMPDIR}"</literal>
 EOF
-chmod +x /bin/make-ca.sh</userinput>
+chmod +x /usr/bin/make-ca.sh</userinput>
 </screen>
    <para>Ajoutez un script bref pour supprimer les certificats expirés d'un
    répertoire. Créez de nouveau ce script en tant qu'utilisateur
@@ -207,9 +207,9 @@
    class="username">root</systemitem> :</para>
   
 <screen role="root">
-<userinput>cat > /bin/remove-expired-certs.sh << "EOF"
+<userinput>cat > /usr/bin/remove-expired-certs.sh << "EOF"
 <literal>#!/bin/sh
-# Begin /bin/remove-expired-certs.sh
+# Begin /usr/bin/remove-expired-certs.sh
 #
 # Version 20120211
 # Make sure the date is parsed correctly on all systems
@@ -253,7 +253,7 @@
   fi
 done</literal>
 EOF
-chmod +x /bin/remove-expired-certs.sh</userinput>
+chmod +x /usr/bin/remove-expired-certs.sh</userinput>
 </screen>
    <para>Les commandes suivantes récupèreront les certificats et les convertiront
    dans le bon format.  Si vous le désirez, vous pouvez utiliser un navigateur
@@ -263,22 +263,21 @@
    les Certificats CA.</para>
    
 <screen>
-<userinput>certhost='http://mxr.mozilla.org'                        &&
-certdir='/mozilla/source/security/nss/lib/ckfw/builtins' &&
-url="$certhost$certdir/certdata.txt?raw=1"               &&
-wget --output-document certdata.txt $url &&
-unset certhost certdir url               &&
-make-ca.sh                               &&
-remove-expired-certs.sh certs</userinput>
+<userinput>URL=&sources-anduin-other-http;/certdata.txt &&
+rm -f certdata.txt &&
+wget $URL          &&
+make-ca.sh         &&
+remove-expired-certs.sh certs &&
+unset URL</userinput>
 </screen>
    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>SSLDIR=/etc/ssl                                             &&
-install -d ${SSLDIR}/certs                                  &&
-cp -v certs/*.pem ${SSLDIR}/certs                           &&
-c_rehash                                                    &&
-install BLFS-ca-bundle*.crt ${SSLDIR}/ca-bundle.crt         &&
-ln -sv ../ca-bundle.crt ${SSLDIR}/certs/ca-certificates.crt &&
+<userinput>SSLDIR=/etc/ssl                                              &&
+install -d ${SSLDIR}/certs                                   &&
+cp -v certs/*.pem ${SSLDIR}/certs                            &&
+c_rehash                                                     &&
+install BLFS-ca-bundle*.crt ${SSLDIR}/ca-bundle.crt          &&
+ln -sfv ../ca-bundle.crt ${SSLDIR}/certs/ca-certificates.crt &&
 unset SSLDIR</userinput>
 </screen>
    <para>Enfin, nettoyez le répertoire courant :</para>

Modified: trunk/blfs/postlfs/security/cyrus-sasl.xml
===================================================================
--- trunk/blfs/postlfs/security/cyrus-sasl.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/security/cyrus-sasl.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -85,18 +85,14 @@
 <para>Installez <application>Cyrus SASL</application> en lançant les 
     commandes suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../cyrus-sasl-&cyrus-sasl-version;-fixes-1.patch &&
+<userinput>patch -Np1 -i ../cyrus-sasl-&cyrus-sasl-version;-fixes-3.patch &&
 autoreconf -fi &&
-pushd saslauthd &&
-autoreconf -fi &&
-popd &&
 ./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --enable-auth-sasldb \
             --with-dbpath=/var/lib/sasl/sasldb2 \
-            --with-saslauthd=/var/run/saslauthd \
-            CFLAGS=-fPIC &&
-make -j1</userinput>
+            --with-saslauthd=/var/run/saslauthd &&
+make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests. Si vous envisagez
     d'utiliser le mécanisme d'authentification GSSAPI, il est recommandé de le

Modified: trunk/blfs/postlfs/security/gnupg2.xml
===================================================================
--- trunk/blfs/postlfs/security/gnupg2.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/security/gnupg2.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -76,7 +76,9 @@
     <para>Installez <application>GnuPG</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --enable-symcryptrun             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &&
+<userinput>./configure --prefix=/usr \
+            --enable-symcryptrun \
+            --docdir=/usr/share/doc/gnupg-&gnupg2-version; &&
 make &&
 makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &&
 makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput>
@@ -92,33 +94,32 @@
     <application>GnuPG</application>, les instructions ci-dessous écraseront
     <filename>/usr/share/man/man1/gpg-zip.1</filename>. Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make install               &&
-ln -sv gpg2  /usr/bin/gpg  &&
-ln -sv gpgv2 /usr/bin/gpgv &&
+<userinput>make install &&
 install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html       &&
-install -v -m644    doc/gnupg_nochunks.html                     /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &&
-install -v -m644    doc/*.texi doc/gnupg.txt                     /usr/share/doc/gnupg-&gnupg2-version;</userinput>
+install -v -m644    doc/gnupg_nochunks.html \
+                    /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &&
+install -v -m644    doc/*.texi doc/gnupg.txt \
+                    /usr/share/doc/gnupg-&gnupg2-version;</userinput>
 </screen>
-
     <para>Nous recommandons la création de liens symboliques pour la compatibilité avec la première
     version de gnuPG, car certains programmes ou scripts en ont besoin. Tapez, en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
-<screen role="root"><userinput>for f in gpg gpgv
+<screen role="root">
+<userinput>for f in gpg gpgv
 do
-  ln -svf ${f}2.1 /usr/share/man/man1/${f}.1 &&
-  ln -svf ${f}2   /usr/bin/${f}
+  ln -svf ${f}2.1 /usr/share/man/man1/$f.1 &&
+  ln -svf ${f}2   /usr/bin/$f
 done
-unset f</userinput></screen>
-
-
-
-
+unset f</userinput>
+</screen>
 <para>Si vous avez créé des formats alternatifs de la documentation, installez les
     en utilisant la commande suivante en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -m644 doc/gnupg.html/*                  /usr/share/doc/gnupg-&gnupg2-version;/html &&
-install -v -m644 doc/gnupg.{pdf,dvi,ps}                  /usr/share/doc/gnupg-&gnupg2-version;</userinput>
+<userinput>install -v -m644 doc/gnupg.html/* \
+                 /usr/share/doc/gnupg-&gnupg2-version;/html &&
+install -v -m644 doc/gnupg.{pdf,dvi,ps} \
+                 /usr/share/doc/gnupg-&gnupg2-version;</userinput>
 </screen>
  
   </sect2>
@@ -195,8 +196,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-
       <varlistentry id="gpg">
         <term><command>gpg</command></term>
         <listitem>
@@ -207,8 +206,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-
       <varlistentry id="gpg2">
         <term><command>gpg2</command></term>
         <listitem>
@@ -279,7 +276,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="gpgv2">
         <term><command>gpgv2</command></term>
         <listitem>

Modified: trunk/blfs/postlfs/security/gnutls.xml
===================================================================
--- trunk/blfs/postlfs/security/gnutls.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/security/gnutls.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -88,16 +88,19 @@
   </sect2>
   <sect2 role="installation">
     <title>Installation de GnuTLS</title>
-    <para><!-- Only for 3.3.7, remove for next versions -->
+    <para>
       en premier corrigez un bogue dans une des bibliothèques:
     </para>
-<screen><userinput>sed -i -e '201 i#ifdef ENABLE_PKCS11' \
+<screen>
+<userinput>sed -i -e '201 i#ifdef ENABLE_PKCS11' \
        -e '213 i#endif'               \
-       lib/gnutls_privkey.c</userinput></screen>
+       lib/gnutls_privkey.c</userinput>
+</screen>
     <para>Installez <application>GnuTLS</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &&
+<userinput>./configure --prefix=/usr \
+            --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/postlfs/security/mitkrb.xml
===================================================================
--- trunk/blfs/postlfs/security/mitkrb.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/security/mitkrb.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -83,16 +83,16 @@
 		<filename>krb5-&mitkrb-version;.tar.gz.asc</filename>.
     </para>
 <screen>
-<userinput>gpg --verify krb5-&mitkrb-version;.tar.gz.asc krb5-&mitkrb-version;.tar.gz</userinput>
+<userinput>gpg2 --verify krb5-&mitkrb-version;.tar.gz.asc krb5-&mitkrb-version;.tar.gz</userinput>
 </screen>
     <para>Vous verrez probablement une sortie similaire à :</para>
 <screen>
-gpg: Signature made Wed Aug  8 22:29:58 2012 GMT using RSA key ID F376813D
-gpg: Can't check signature: public key not found
+<literal>gpg: Signature made Mon Aug 11 22:53:10 2014 GMT using RSA key ID 749D7889
+gpg: Can't check signature: No public key</literal>
 </screen>
     <para>Vous pouvez importer la clef publique avec :</para>
 <screen>
-<userinput>gpg --keyserver pgp.mit.edu --recv-keys 0xF376813D</userinput>
+<userinput>gpg2 --pgp2 --keyserver pgp.mit.edu --recv-keys 0x749D7889</userinput>
 </screen>
     <para>Maintenant revérifiez le paquet avec la première commande susmentionnée. Vous devriez 
     obtenir une indication de bonne signature, mais la clef ne sera toujours pas certifiée 
@@ -103,13 +103,20 @@
 		commandes suivantes :
     </para>
 <screen>
-<userinput>patch -Np1 -i ../mitkrb-&mitkrb-version;-db2_fix-1.patch &&
-cd src &&
-sed -e "s at python2.5/Python.h@& python2.7/Python.h at g"     -e "s at -lpython2.5]@&,n  AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g"     -i configure.in &&
-sed -e "s at interp->result at Tcl_GetStringResult(interp)@g"     -i kadmin/testing/util/tcl_kadm5.c &&
-sed -e 's@^u}@^u cols 300}@'     -i tests/dejagnu/config/default.exp &&
+<userinput>cd src &&
+sed -e "s at python2.5/Python.h@& python2.7/Python.h at g" \
+    -e "s at -lpython2.5]@&,\n  AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \
+    -i configure.in &&
+sed -e 's@\^u}@^u cols 300}@' \
+    -i tests/dejagnu/config/default.exp &&
 autoconf &&
-./configure --prefix=/usr                        --sysconfdir=/etc                    --localstatedir=/var/lib             --with-system-et                     --with-system-ss                     --enable-dns-for-realm &&
+./configure --prefix=/usr            \
+            --sysconfdir=/etc        \
+            --localstatedir=/var/lib \
+            --with-system-et         \
+            --with-system-ss         \
+            --with-system-verto=no   \
+            --enable-dns-for-realm &&
 make</userinput>
 </screen>
     <para>
@@ -123,8 +130,9 @@
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
-for LIBRARY in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv                kdb5 kdb_ldap krad krb5 krb5support verto ; do
-    [ -e  /usr/lib/lib$LIBRARY.so ] && chmod -v 755 /usr/lib/lib$LIBRARY.so
+for LIBRARY in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \
+               kdb5 kdb_ldap krad krb5 krb5support verto ; do
+    chmod -v 755 /usr/lib/lib$LIBRARY.so
 done &&
 mv -v /usr/lib/libkrb5.so.3*        /lib &&
 mv -v /usr/lib/libk5crypto.so.3*    /lib &&
@@ -160,16 +168,12 @@
     conséquence que la construction utilise les versions installées sur le 
     système du logiciel support du logiciel d'interface en ligne de commandes du
     sous-système.</para>
-
      <para>
       <parameter>--with-system-verto=no</parameter>: ce paramètre corrige un dans le paquet:
       il ne reconnait pas sa propre bibliothèque verto installé précédement. Ce n'est pas un problème, à la réinstallation
       de la même version, mais si vous mettez à jour, l'ancienne bibliothèque est utilisée comme celle
       du système, au lien d'installer la nouvelle version.
     </para>
-
-
-
     <para>
      <parameter>--enable-dns-for-realm</parameter>: Ce paramètre permet à
       realms d'être résolu en utilisant le serveur DNS.</para>

Modified: trunk/blfs/postlfs/security/nss.xml
===================================================================
--- trunk/blfs/postlfs/security/nss.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/security/nss.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,16 +3,11 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!-- for when .0 is not part of the new tarball name -->
   <!ENTITY nss-url "ftp.mozilla.org/pub/mozilla.org/security/nss/releases">
   <!ENTITY nss-download-http
            "http://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
   <!ENTITY nss-download-ftp
            "ftp://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
-<!-- normal versions
-  <!ENTITY nss-download-http
-           "http://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">
--->
   <!ENTITY nss-md5sum        "081dd99afa12af589c09e2d7cb5f5c6d">
   <!ENTITY nss-size          "6.2 Mo">
   <!ENTITY nss-buildsize     "79 Mo">
@@ -91,7 +86,12 @@
 <screen>
 <userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch &&
 cd nss &&
-make BUILD_OPT=1                        NSPR_INCLUDE_DIR=/usr/include/nspr    USE_SYSTEM_ZLIB=1                     ZLIB_LIBS=-lz                         $([ $(uname -m) = x86_64 ] && echo USE_64=1)   $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) -j1</userinput>
+make BUILD_OPT=1                      \
+  NSPR_INCLUDE_DIR=/usr/include/nspr  \
+  USE_SYSTEM_ZLIB=1                   \
+  ZLIB_LIBS=-lz                       \
+  $([ $(uname -m) = x86_64 ] && echo USE_64=1) \
+  $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) -j1</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/postlfs/security/openssh.xml
===================================================================
--- trunk/blfs/postlfs/security/openssh.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/security/openssh.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -179,9 +179,7 @@
       </para>
 <screen>
 <userinput>ssh-keygen &&
-public_key="$(cat ~/.ssh/id_rsa.pub)" &&
-ssh REMOTE_HOSTNAME "echo ${public_key} >> ~/.ssh/authorized_keys" &&
-unset public_key</userinput>
+ssh-copy-id -i ~/.ssh/id_rsa.pub <replaceable>REMOTE_USERNAME</replaceable>@<replaceable>REMOTE_HOSTNAME</replaceable></userinput>
 </screen>
      <para>
         Une fois que vous avez configuré un accès sans mot de passe, c'est actuellement plus sécurisant

Modified: trunk/blfs/postlfs/shells/zsh.xml
===================================================================
--- trunk/blfs/postlfs/shells/zsh.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/shells/zsh.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -84,11 +84,17 @@
 <para>Installez <application>ZSH</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -e '/attr.mdh/ d' -e '/attr.pro/ d'                                            -e '/include <sys/xattr.h>/ a\n#include "attr.mdh"n#include "attr.pro"'     -i Src/Modules/attr.c                             &&
-./configure --prefix=/usr                     --bindir=/bin                     --sysconfdir=/etc/zsh             --enable-etcdir=/etc/zsh                  &&
+<userinput>sed -e '/attr.mdh/ d' -e '/attr.pro/ d'                                        \
+    -e '/include <sys\/xattr.h>/ a\\n#include "attr.mdh"\n#include "attr.pro"' \
+    -i Src/Modules/attr.c                             &&
+./configure --prefix=/usr         \
+            --bindir=/bin         \
+            --sysconfdir=/etc/zsh \
+            --enable-etcdir=/etc/zsh                  &&
 make                                                  &&
 makeinfo  Doc/zsh.texi --html      -o Doc/html        &&
-makeinfo  Doc/zsh.texi --html --no-split --no-headers                                    -o Doc/zsh.html    &&
+makeinfo  Doc/zsh.texi --html --no-split --no-headers \
+                                   -o Doc/zsh.html    &&
 makeinfo  Doc/zsh.texi --plaintext -o Doc/zsh.txt</userinput>
 </screen>
     <para>Si vous avez installé <xref linkend="texlive"/>, vous pouvez
@@ -104,8 +110,10 @@
 <userinput>make install &&
 make infodir=/usr/share/info install.info
 install -v -m755 -d /usr/share/doc/zsh-&zsh-version;/html &&
-install -v -m644    Doc/html/*                     /usr/share/doc/zsh-&zsh-version;/html &&
-install -v -m644    Doc/zsh.{html,txt}                     /usr/share/doc/zsh-&zsh-version;</userinput>
+install -v -m644    Doc/html/* \
+                    /usr/share/doc/zsh-&zsh-version;/html &&
+install -v -m644    Doc/zsh.{html,txt} \
+                    /usr/share/doc/zsh-&zsh-version;</userinput>
 </screen>
     <para>Si vous avez téléchargé la documentation facultative, installez-la
     en exécutant les commandes suivantes en tant qu'utilisateur
@@ -118,7 +126,8 @@
    , installez-le en exécutant la commande suivante en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -m644 Doc/zsh.pdf         /usr/share/doc/zsh-&zsh-version;</userinput>
+<userinput>install -v -m644 Doc/zsh.pdf \
+        /usr/share/doc/zsh-&zsh-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/postlfs/virtualization/qemu.xml
===================================================================
--- trunk/blfs/postlfs/virtualization/qemu.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/postlfs/virtualization/qemu.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -156,7 +156,7 @@
     </para>
 <screen role="root">
 <userinput>cat > /lib/udev/rules.d/65-kvm.rules << "EOF"
-<literal>KERNEL=="kvm", NAME="%k", GROUP="kvm", MODE="0660"</literal>
+<literal>KERNEL=="kvm", GROUP="kvm", MODE="0660"</literal>
 EOF</userinput>
 </screen>
     <note>

Modified: trunk/blfs/pst/printing/cups-filters.xml
===================================================================
--- trunk/blfs/pst/printing/cups-filters.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/pst/printing/cups-filters.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -102,7 +102,14 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                                           --sysconfdir=/etc                                       --localstatedir=/var                                    --docdir=/usr/share/doc/cups-filters-&cups-filters-version;             --without-rcdir                                         --with-gs-path=/usr/bin/gs                              --with-pdftops-path=/usr/bin/gs                         --disable-static                            &&
+<userinput>./configure --prefix=/usr                               \
+            --sysconfdir=/etc                           \
+            --localstatedir=/var                        \
+            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; \
+            --without-rcdir                             \
+            --with-gs-path=/usr/bin/gs                  \
+            --with-pdftops-path=/usr/bin/gs             \
+            --disable-static                            &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/pst/ps/psutils.xml
===================================================================
--- trunk/blfs/pst/ps/psutils.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/pst/ps/psutils.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -5,7 +5,6 @@
   %general-entities;
   <!ENTITY psutils-download-http "http://pkgs.fedoraproject.org/repo/pkgs/psutils/psutils-p17.tar.gz/&psutils-md5sum;/psutils-&psutils-version;.tar.gz">
   <!ENTITY psutils-download-ftp  " ">
-<!--  <!ENTITY psutils-download-ftp  "ftp://ftp.knackered.org/pub/psutils/psutils-&psutils-version;.tar.gz">-->
   <!ENTITY psutils-md5sum        "b161522f3bd1507655326afa7db4a0ad">
   <!ENTITY psutils-size          "68 Ko">
   <!ENTITY psutils-buildsize     "740 Ko">

Modified: trunk/blfs/pst/typesetting/biber.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/pst/typesetting/texlive.xml
===================================================================
--- trunk/blfs/pst/typesetting/texlive.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/pst/typesetting/texlive.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -132,26 +132,32 @@
     --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
     --disable-native-texlive-build                  \
     --disable-static --enable-shared                \
-    --with-system-libgs                             \
-    --with-system-poppler                           \
+    --with-system-cairo                             \
+    --with-system-fontconfig                        \
     --with-system-freetype2                         \
-    --with-system-fontconfig                        \
-    --with-system-libpng                            \
-    --with-system-icu                               \
     --with-system-graphite2                         \
     --with-system-harfbuzz                          \
+    --with-system-icu                               \
+    --with-system-libgs                             \
+    --with-system-libpng                            \
+    --with-system-pixman                            \
+    --with-system-poppler                           \
     --with-system-xpdf                              \
-    --with-system-poppler                           \
-    --with-system-cairo                             \
-    --with-system-pixman                            \
     --with-system-zlib                              \
-    --with-banner-add=" - BLFS" &&</userinput></screen>
+    --with-banner-add=" - BLFS"                     \
+    --enable-xindy                                  \
+    --enable-xindy-rules                            \
+    --enable-xindy-doc                              \
+    --with-clisp-runtime=system</userinput>
+</screen>
     <para>Asymptote a été configuré séparément. Il arrive avec sa propre copie des sources de gc, et utilisera seulement
     la version système si les sources locales sont supprimées.
     </para>
-<screen><userinput>pushd ../utils/asymptote &&
-    echo "ac_cv_lib_m_sqrt=yes"     >config.cache &&
-    echo "ac_cv_lib_z_deflate=yes" >>config.cache &&
+<screen>
+<userinput>pushd ../utils/asymptote &&
+rm -v gc-7.4.0.tar.gz &&
+echo "ac_cv_lib_m_sqrt=yes"     >config.cache &&
+echo "ac_cv_lib_z_deflate=yes" >>config.cache &&
 ./configure LIBS="-ltirpc "                         \
     --prefix=/opt/texlive/&texlive-year;/                     \
     --bindir=/opt/texlive/&texlive-year;/bin/x86_64-linux     \
@@ -172,10 +178,8 @@
 <userinput role="root">make install &&
 make -C ../utils/asymptote install</userinput>
 </screen>
-
     <para>une partie du paquet demande à être reconstruite:
     <xref linkend="biber"/>.</para>
-
 </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>

Modified: trunk/blfs/pst/typesetting/tl-installer.xml
===================================================================
--- trunk/blfs/pst/typesetting/tl-installer.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/pst/typesetting/tl-installer.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -75,8 +75,6 @@
       supporter le viewer PDF de votre choix, 
       par exemple <xref linkend="epdfview"/>.
     </para>
-
-
     <para>
       La bibliothèque facultative ncurses pour les caractères non large (pour "seulement quelques applications
       binaire") du haut de la page <application>Ncurses</application>
@@ -91,8 +89,6 @@
       après avoir lancé <command>configure</command> et <command>make</command>
       et ensuite lié symboliquement en tant que <filename>libreadline.so.5</filename>.
     </para>
-
-
     <para>
       <xref linkend="python2"/> est utilisé par de nombreux scripts,
     </para>
@@ -121,8 +117,8 @@
     </para></note>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem>
     :</para>
-<screen>
-<userinput role="root">TEXLIVE_INSTALL_PREFIX=/opt/texlive ./install-tl</userinput>
+<screen role="root">
+<userinput>TEXLIVE_INSTALL_PREFIX=/opt/texlive ./install-tl</userinput>
 </screen>
     <para>Cette commande est intéractive et permet la sélection ou la modificationtion de la plateforme,
     des paquets, des répertoires, et d'autres options. L'installation complète demandera environ
@@ -135,14 +131,16 @@
     Les programmes sont toujours installés dans un sous répertoire <ARCH>-linux
     et en 32-bit x86 c'est toujours i386-linux. Pour x86_64 et i?86 vouis pouvez le générer avec $TEXARCH:
     </para>
-<screen>
-<userinput role="root">cat >> /etc/profile.d/extrapaths.sh << "EOF"
+<screen role="root">
+<userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &&
+cat >> /etc/profile.d/extrapaths.sh << EOF
 pathappend /usr/share/man                        MANPATH
 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/man  MANPATH
 pathappend /usr/share/info                       INFOPATH
 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/info INFOPATH
-pathappend /opt/texlive/&texlive-year;/bin/<ARCH>-linux
-EOF</userinput>
+pathappend /opt/texlive/&texlive-year;/bin/$TEXARCH
+EOF
+unset TEXARCH</userinput>
 </screen>
     <note><para>Les chemins standards MANPATH et INFOPATH sont spécifiés pour s'assurer qu'ils sont
     inclus. S'ils sont déjà initialisés dans la procédure des scripts de démarrage, la fonction
@@ -162,7 +160,6 @@
       http://ctan.org/mirrors.
     </para>
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/pst/typesetting/typesetting.xml
===================================================================
--- trunk/blfs/pst/typesetting/typesetting.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/pst/typesetting/typesetting.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -12,5 +12,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tl-installer.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texlive.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="biber.xml"/>
-
 </chapter>

Modified: trunk/blfs/server/databases/mariadb.xml
===================================================================
--- trunk/blfs/server/databases/mariadb.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/server/databases/mariadb.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -114,11 +114,28 @@
       Installez <application>MariaDB</application> en lançant la suite  
     </para>
 <screen>
-<userinput>sed -i "s at data/test@${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
+<userinput>sed -i "s at data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
 sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc &&
 mkdir build &&
 cd build &&
-cmake -DCMAKE_BUILD_TYPE=Release       -DCMAKE_INSTALL_PREFIX=/usr       -DINSTALL_DOCDIR=share/doc/mysql       -DINSTALL_DOCREADMEDIR=share/doc/mysql       -DINSTALL_MANDIR=share/man       -DINSTALL_MYSQLSHAREDIR=share/mysql       -DINSTALL_MYSQLTESTDIR=share/mysql/test       -DINSTALL_PLUGINDIR=lib/mysql/plugin       -DINSTALL_SBINDIR=sbin       -DINSTALL_SCRIPTDIR=bin       -DINSTALL_SQLBENCHDIR=share/mysql/bench       -DINSTALL_SUPPORTFILESDIR=share/mysql       -DMYSQL_DATADIR=/srv/mysql       -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock       -DWITH_EXTRA_CHARSETS=complex       -DWITH_EMBEDDED_SERVER=ON       -DTOKUDB_OK=0       .. &&
+cmake -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DINSTALL_DOCDIR=share/doc/mysql \
+      -DINSTALL_DOCREADMEDIR=share/doc/mysql \
+      -DINSTALL_MANDIR=share/man \
+      -DINSTALL_MYSQLSHAREDIR=share/mysql \
+      -DINSTALL_MYSQLTESTDIR=share/mysql/test \
+      -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+      -DINSTALL_SBINDIR=sbin \
+      -DINSTALL_SCRIPTDIR=bin \
+      -DINSTALL_SQLBENCHDIR=share/mysql/bench \
+      -DINSTALL_SUPPORTFILESDIR=share/mysql \
+      -DMYSQL_DATADIR=/srv/mysql \
+      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+      -DWITH_EXTRA_CHARSETS=complex \
+      -DWITH_EMBEDDED_SERVER=ON \
+      -DTOKUDB_OK=0 \
+      .. &&
 make</userinput>
 </screen>
     <para>
@@ -269,7 +286,7 @@
         class="username">root</systemitem> pour l'initialiser. 
       </para>
 <screen role="root">
-<userinput>mysqladmin -u root password </userinput>
+<userinput>mysqladmin -u root password</userinput>
 </screen>
       <para>
         La configuration du serveur est maintenant terminée. Arrêtez le serveur

Modified: trunk/blfs/server/databases/sqlite.xml
===================================================================
--- trunk/blfs/server/databases/sqlite.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/server/databases/sqlite.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -85,10 +85,13 @@
     <para>Installer <application>SQLite</application> en exécutant les commandes
     suivantes:</para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-static                    CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1             -DSQLITE_ENABLE_COLUMN_METADATA=1                 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1                   -DSQLITE_SECURE_DELETE=1" &&
+<userinput>./configure --prefix=/usr --disable-static        \
+            CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1 \
+            -DSQLITE_ENABLE_COLUMN_METADATA=1     \
+            -DSQLITE_ENABLE_UNLOCK_NOTIFY=1       \
+            -DSQLITE_SECURE_DELETE=1" &&
 make</userinput>
 </screen>
-
     <para>Ce paquet n'est pas livré avec une suite de tests.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
@@ -102,8 +105,6 @@
 <userinput>install -v -m755 -d /usr/share/doc/sqlite-&sqlite-version; &&
 cp -v -R sqlite-doc-&sqlite-doc-version;/* /usr/share/doc/sqlite-&sqlite-version;</userinput>
 </screen>
-
-
  </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>

Modified: trunk/blfs/server/mail/exim.xml
===================================================================
--- trunk/blfs/server/mail/exim.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/server/mail/exim.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -94,8 +94,11 @@
     <para>Installez <application>Exim</application> avec les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'     -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,'     -e 's,^EXIM_USER.*$,EXIM_USER=exim,'     -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &&
-echo -e "USE_GDBM = yesnDBMLIB = -lgdbm" >> Local/Makefile &&
+<userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' \
+    -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
+    -e 's,^EXIM_USER.*$,EXIM_USER=exim,' \
+    -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &&
+echo -e "USE_GDBM = yes\nDBMLIB = -lgdbm" >> Local/Makefile &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/server/mail/sendmail.xml
===================================================================
--- trunk/blfs/server/mail/sendmail.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/server/mail/sendmail.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -196,7 +196,7 @@
 <literal>postmaster: root
 MAILER-DAEMON: root</literal>
 EOF
-newaliases -v</userinput>
+newaliases</userinput>
 </screen>
       <para>Le fichier de configuration primitif de <application>sendmail</application>,
       <filename>/etc/mail/sendmail.cf</filename>, est complexe et n'est pas

Modified: trunk/blfs/server/major/bind.xml
===================================================================
--- trunk/blfs/server/major/bind.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/server/major/bind.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -221,8 +221,8 @@
 <userinput>cd /srv/named &&
 mkdir -p dev etc/namedb/{slave,pz} usr/lib/engines var/run/named &&
 mknod /srv/named/dev/null c 1 3 &&
-mknod /srv/named/dev/random c 1 8 &&
-chmod 666 /srv/named/dev/{null,random} &&
+mknod /srv/named/dev/urandom c 1 9 &&
+chmod 666 /srv/named/dev/{null,urandom} &&
 cp /etc/localtime etc &&
 touch /srv/named/managed-keys.bind &&
 cp /usr/lib/engines/libgost.so usr/lib/engines &&

Modified: trunk/blfs/server/other/xinetd.xml
===================================================================
--- trunk/blfs/server/other/xinetd.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/server/other/xinetd.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,8 +3,8 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!-- Development seems to be over and the xinetd.og site does not seem to exist any more. -->
-  <!-- <!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz"> -->
+  
+  
   <!ENTITY xinetd-download-http " ">
   <!ENTITY xinetd-download-ftp  "&sources-anduin-ftp;/x/xinetd-&xinetd-version;.tar.gz">
   <!ENTITY xinetd-md5sum        "77358478fd58efa6366accae99b8b04c">
@@ -60,7 +60,7 @@
     <para>Installez <application>xinetd</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -i -e "s/exec_server/child_process/" xinetd/builtins.c        &&
+<userinput>sed -i -e "s/exec_server/child_process/" xinetd/builtins.c       &&
 sed -i -e "/register unsigned count/s/register//" xinetd/itox.c  &&
 ./configure --prefix=/usr --mandir=/usr/share/man --with-loadavg &&
 make</userinput>

Modified: trunk/blfs/x/installing/mesalib.xml
===================================================================
--- trunk/blfs/x/installing/mesalib.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/mesalib.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -6,8 +6,6 @@
   <!ENTITY mesalib-download-http " ">
   <!ENTITY mesalib-download-ftp
   "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
-<!--  <!ENTITY mesalib-download-ftp
-  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">-->
   <!ENTITY mesalib-md5sum        "b54b793d5b60b9da31ba1f86a6f82bf8">
   <!ENTITY mesalib-size          "6.8 Mo">
   <!ENTITY mesalib-buildsize     "297 Mo (additional 2 Mo for the docs)">
@@ -61,7 +59,6 @@
         </para>
       </listitem>
       <listitem>
-
         <para>
             Correctif recommandé :
          <ulink url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
@@ -124,7 +121,22 @@
      Installez <application>MesaLib</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"               --prefix=$XORG_PREFIX                      --sysconfdir=/etc                          --enable-texture-float                     --enable-gles1                             --enable-gles2                             --enable-openvg                            --enable-osmesa                            --enable-xa                                --enable-gbm                               --enable-gallium-egl                       --enable-gallium-gbm                       --enable-glx-tls                           --with-egl-platforms="drm,x11"             --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
+<userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-upstream_fixes-1.patch &&
+./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
+            --prefix=$XORG_PREFIX          \
+            --sysconfdir=/etc              \
+            --enable-texture-float         \
+            --enable-gles1                 \
+            --enable-gles2                 \
+            --enable-openvg                \
+            --enable-osmesa                \
+            --enable-xa                    \
+            --enable-gbm                   \
+            --enable-gallium-egl           \
+            --enable-gallium-gbm           \
+            --enable-glx-tls               \
+            --with-egl-platforms="drm,x11" \
+            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/installing/x7driver-ati.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-ati.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-ati.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -116,12 +116,12 @@
       demande aussi le firmware :
      </para>
 <screen>
-<literal>CONFIG_EXTRA_FIRMWARE="radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin radeon/CAICOS_pfp.bin radeon/CAICOS_smc.bin rtl_nic/rtl8168e-3.fw"
+<literal>CONFIG_EXTRA_FIRMWARE="radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin
+radeon/CAICOS_pfp.bin radeon/CAICOS_smc.bin rtl_nic/rtl8168e-3.fw"
 CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"</literal>
 </screen>
      <note><para>CONFIG_EXTRA_FIRMWARE doit être en une seule ligne. Il est montré
      sur deux lignes pour la présentation seulement.</para></note>
-
       <tip>
         <para>
            Vous pouvez vérifier la sortie de <command>dmesg</command> après le démarrage pour voir
@@ -139,7 +139,9 @@
          
       </para>
 <screen>
-<userinput>./configure $XORG_CONFIG &&
+<userinput>sed -i -e '/ac_cv_header_glamor/s/\$ac_includes_default/#include \\"xorg-server.h\\"/' \
+       -e '/GLAMOR_NO_DRI3/s/\(#include \)/\1\\"xorg-server.h\\"\n\1/' configure &&
+./configure $XORG_CONFIG &&
 make</userinput>
 </screen>
       <para>
@@ -161,7 +163,6 @@
         <application>glibc</application> recent.
       </para>
     </sect3>
-
     <sect3>
       <title>Accélération Glamor</title>
       <para>

Modified: trunk/blfs/x/installing/x7driver-intel.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-intel.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-intel.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -92,7 +92,10 @@
          
       </para>
 <screen>
-<userinput>./configure $XORG_CONFIG                  --enable-kms-only             --with-default-accel=sna &&
+<userinput>./configure $XORG_CONFIG      \
+            --enable-kms-only \
+            --enable-uxa      \
+            --enable-glamor   &&
 make</userinput>
 </screen>
       <para>

Modified: trunk/blfs/x/installing/x7driver-nouveau.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-nouveau.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-nouveau.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -71,7 +71,6 @@
           Notez que les editeurs de BLFS n'ont pas testé ce matériel.
         </para>
       </note>
-
       <para condition="html" role="usernotes">
         Notes utilisateur : <ulink url="&blfs-wiki;/xorg-nouveau-driver"/>
       </para>
@@ -124,18 +123,16 @@
         , créez le fichier suivant en tant qu'utilisateur
        <systemitem class="username">root</systemitem>:
       </para>
-<screen role="root"><userinput>cat >> /etc/X11/xorg.conf.d/nvidia.conf << "EOF"
+<screen role="root">
+<userinput>cat >> /etc/X11/xorg.conf.d/nvidia.conf << "EOF"
 <literal>Section "Device"
         Identifier "nvidia"
         Driver "nouveau"
         Option "AccelMethod" "glamor"
 EndSection</literal>
-EOF</userinput></screen>
+EOF</userinput>
+</screen>
     </sect3>
-
-
-
-
     <sect3 role="content">
       <title>Contenu</title>
       <segmentedlist>

Modified: trunk/blfs/x/installing/x7driver-openchrome.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-openchrome.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-openchrome.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -88,7 +88,8 @@
          
       </para>
 <screen>
-<userinput>./configure $XORG_CONFIG &&
+<userinput>sed -i "/via_3d.h/i #include <xorg-server.h>" src/via_3d.c &&
+./configure $XORG_CONFIG &&
 make</userinput>
 </screen>
       <para>
@@ -101,7 +102,6 @@
 <userinput>make install</userinput>
 </screen>
     </sect3>
-
     <sect3>
       <title>Explications des commandes</title>
       <para>
@@ -109,9 +109,6 @@
         <application>Glibc</application>.
       </para>
     </sect3>
-
-
-
     <sect3 role="content">
       <title>Contenu</title>
       <segmentedlist>

Modified: trunk/blfs/x/installing/x7driver-synaptics.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-synaptics.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-synaptics.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -76,7 +76,8 @@
          
       </para>
 <screen>
-<userinput>./configure $XORG_CONFIG &&
+<userinput>sed -i '/_H_/ a#include <xorg-server.h>' src/{eventcomm,ps2comm,synproto}.h &&
+./configure $XORG_CONFIG &&
 make</userinput>
 </screen>
       <para>

Modified: trunk/blfs/x/installing/x7driver-tdfx.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-tdfx.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-tdfx.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -109,8 +109,6 @@
         <application>Xorg Server</application> 1.14.0 et plus.
       </para>
     </sect3>
-
-
     <sect3 role="content">
       <title>Contenu</title>
       <segmentedlist>

Modified: trunk/blfs/x/installing/x7driver-vmmouse.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-vmmouse.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-vmmouse.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -68,7 +68,6 @@
           </para>
         </listitem>
       </itemizedlist>
-
       <bridgehead renderas="sect4">Dépendances de Xorg VMMouse Driver</bridgehead>
       <bridgehead renderas="sect5">Requises</bridgehead>
       <para role="required">
@@ -85,10 +84,11 @@
          
       </para>
 <screen>
-<userinput>./configure $XORG_CONFIG \
-            --with-udev-rules-dir=/lib/udev/rules.d \
+<userinput>patch -Np1 -i ../xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &&
+./configure $XORG_CONFIG               \
+            --without-hal-fdi-dir      \
             --without-hal-callouts-dir \
-            --without-hal-fdi-dir &&
+            --with-udev-rules-dir=/lib/udev/rules.d &&
 make</userinput>
 </screen>
       <para>

Modified: trunk/blfs/x/installing/x7driver-vmware.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-vmware.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/x7driver-vmware.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -73,9 +73,10 @@
   </para>
 <screen>
 <literal>Device Drivers  --->
-  Graphics support --->
-    DRM driver for VMware Virtual GPU: Y or M
-      Enable framebuffer console under vmwgfx by default: Y</literal>
+  Graphics support  --->
+    Direct Rendering Manager  --->
+      DRM driver for VMware Virtual GPU: Y or M
+        Enable framebuffer console under vmwgfx by default: Y</literal>
 </screen>
       <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
         <primary sortas="d-xorg-vmware-driver">xorg-vmware-driver</primary>
@@ -88,7 +89,8 @@
          
       </para>
 <screen>
-<userinput>./configure $XORG_CONFIG &&
+<userinput>sed -i "/xf86xv.h/i #include <xorg-server.h>" vmwgfx/vmwgfx_overlay.c &&
+./configure $XORG_CONFIG &&
 make</userinput>
 </screen>
       <para>

Modified: trunk/blfs/x/installing/xorg-server.xml
===================================================================
--- trunk/blfs/x/installing/xorg-server.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/xorg-server.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -75,7 +75,6 @@
       <xref linkend="libepoxy"/> (requise pour glamor, voir l'explication des commandes
       dessous)
     </para>
-
     <bridgehead renderas="sect4">Facultatives</bridgehead>
     <para role="optional">
       <xref linkend="acpid"/> (exécution),
@@ -92,10 +91,10 @@
      <para>
       Si vous avez activé glamor, appliquez le correctif recommandé en lançant la commande suivante:
     </para>
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch</userinput></screen>
+<screen>
+<userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch</userinput>
+</screen>
  
-
-
 <para>
       Si vous avez chargé le correctif facultatif, appliquez le en lançant la commande suivante :
     </para>
@@ -104,9 +103,11 @@
 <userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput>
 </screen>
 <screen>
-<userinput>./configure $XORG_CONFIG                    \
+<userinput>sed -i "/scrnintstr/i #include <xorg-server.h>" exa/exa.h glamor/glamor.h &&
+./configure $XORG_CONFIG                    \
            --with-xkb-output=/var/lib/xkb   \
            --enable-dmx                     \
+           --enable-glamor                  \
            --enable-install-setuid          \
            --enable-suid-wrapper            &&
 make</userinput>
@@ -128,7 +129,6 @@
         <command>sed -i ...</command>: Ce sed corrige deux fichiers d'entête qui sont cassés avec Glibc 2.20 et donc les
         pilotes les utilisant échoueront à se construire.
       </para>
-
      <para>
       <parameter>--enable-dmx</parameter>: construit le serveur DMX (Distributed Multihead X).
     </para>
@@ -138,9 +138,6 @@
       graphiques Southern Islands et Sea Islands radeon , facultatif pour les autres radeons, et
       également facultatif pour les autres pilotes intel. 
     </para>
-
-
-
     <para><parameter>--enable-install-setuid</parameter> : Le binaire
     Xorg doit se lancer en tant qu'utilisateur root. Ce paramètre assure que le
     binaire est installé avec setuid quand <command>make</command> est lancé

Modified: trunk/blfs/x/installing/xorg7.xml
===================================================================
--- trunk/blfs/x/installing/xorg7.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/installing/xorg7.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -70,13 +70,10 @@
   
   <sect2 id="xorg-env" xreflabel="Environnement de construction de Xorg">
     <title>Paramétrer l'environnement de construction de Xorg</title>
-
     <note><para>Les intructions suivantes considèrent que les fichiers de démarrage
     du shell sont configurés comme décrit dans
     <xref linkend="postlfs-config-profile" />.
     </para></note>
-
-
     <para>Tout d'abord, vous devrez créer un répertoire de travail :</para>
 <screen>
 <userinput>mkdir xc &&

Modified: trunk/blfs/x/lib/libepoxy.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/x/lib/webkitgtk2.xml
===================================================================
--- trunk/blfs/x/lib/webkitgtk2.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/x/lib/webkitgtk2.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -84,7 +84,6 @@
       3</application> est utilisé), afin de pouvoir faire fonctionner
       les greffons NPAPI comme Adobe Flash.
     </para></note>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="enchant"/>,
@@ -111,10 +110,9 @@
       qui fera échouer <command>make install</command>:
     </para>
 <screen>
-<userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput>
+<userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' \
+                           GNUmakefile.in</userinput>
 </screen>
-
-
      <para>
       Maintenant le standard des developpeurs est de lier ce paquet contre <application>GTK+
       3</application>. Cependant,
@@ -125,17 +123,17 @@
       Ici, les deux méthodes de constructions sont présentées et recommandées d'être construite, mais
       si vous savez celle que vous voulez, allez juste à la partie correspondante.
     </para>
-<!-- ==== WebKitGTK+ against GTK+ 3 ====== -->
     <bridgehead renderas="sect3">Construction et installation de <application>WebKitGTK+
       </application> contre <application>GTK+
       3</application></bridgehead>
-
-
     <para>
       Installez <application>WebKitGTK+</application> en lançant les commandes suivantes
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                      --enable-introspection &&
+<userinput>mkdir -vp build-3           &&
+cp -a Documentation build-3 &&
+cd build-3                  &&
+../configure --prefix=/usr --enable-introspection &&
 make</userinput>
 </screen>
     <para>
@@ -157,33 +155,38 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make install                                    &&
-rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0    &&
-mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</userinput>
+<userinput>make install</userinput>
 </screen>
     <para>
       Finallement, quittez le répertoire de construction:
     </para>
-<screen><userinput>cd ..</userinput></screen>
-<!-- ==== WebKitGTK+ against GTK+ 2 ====== -->
+<screen>
+<userinput>cd ..</userinput>
+</screen>
     <bridgehead renderas="sect3">Construction et installation de  <application>WebKitGTK+ </application> contre
      <application>GTK+
       2</application></bridgehead>
     <para>
       Installez <application>WebKitGTK+</application> en lançant les commandes suivantes:
     </para>
-<screen><userinput>mkdir -vp build-1</userinput></screen>
+<screen>
+<userinput>mkdir -vp build-1</userinput>
+</screen>
     <para>
       Si vous avez construit et installé le paquet contre  <application>GTK+ 3 </application>, sautez les commandes suivantes, car
       la documentation précédantes les applique déjà :
     </para>
-<screen><userinput>cp -a Documentation build-1</userinput></screen>
+<screen>
+<userinput>cp -a Documentation build-1</userinput>
+</screen>
     <para>
       Maintenant, allez dans le répertoire de construction et commencer la construction et l'installation:
     </para>
-<screen><userinput>cd build-1 &&
+<screen>
+<userinput>cd build-1 &&
 ../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &&
-make</userinput></screen>
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests fonctionnelle. Cependant, il y a un
       navigateur web graphique basique dans le répertoire de construction
@@ -201,15 +204,15 @@
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem>:
     </para>
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
     <para>
       Finallement, quittez le répertoire de construction:
     </para>
-<screen><userinput>cd ..</userinput></screen>
-
-
-
-
+<screen>
+<userinput>cd ..</userinput>
+</screen>
   </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>
@@ -304,7 +307,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="libjavascriptcoregtk-3">
         <term><filename
         class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
@@ -332,7 +334,6 @@
            </indexterm>
          </listitem>
        </varlistentry>
-
       <varlistentry id="libwebkitgtk-3">
         <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
         <listitem>

Modified: trunk/blfs/xfce/core/xfce4-power-manager.xml
===================================================================
--- trunk/blfs/xfce/core/xfce4-power-manager.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xfce/core/xfce4-power-manager.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -101,7 +101,8 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make docdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;      imagesdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;/images install</userinput>
+<userinput>make docdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version; \
+     imagesdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;/images install</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/blfs/xsoft/graphweb/firefox.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xsoft/graphweb/firefox.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -3,8 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY firefox-download-http
-           "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">-->
   <!ENTITY firefox-download-http
            "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!ENTITY firefox-download-ftp
@@ -154,11 +152,6 @@
 ac_add_options --disable-pulseaudio
 # If you have not installed Yasm then uncomment this line:
 #ac_add_options --disable-webm
-# If you have installed xulrunner uncomment the next two ac_add_options lines
-# and check that the sdk will be set by running pkg-config in a subshell
-# and has not become hardcoded or empty when you created this file
-#ac_add_options --with-system-libxul
-#ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
 # Comment out following options if you have not installed
 # recommended dependencies:
 ac_add_options --enable-system-sqlite
@@ -200,7 +193,8 @@
     </para></note>
  
 <screen>
-<userinput>make -f client.mk</userinput>
+<userinput>test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&
+make -f client.mk</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
     <para>
@@ -214,15 +208,12 @@
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>
-
      <para>
       <command>test $(uname -m) = "i686" && sed ...</command>:
       Dans cette version de firefox, un vieux bogue est réapparu dans les constructions 32 bits.
       Avec l'optimisation, l'installation échoue avec une erreur Python. Cette commande
       corrigera la construction i686 et préservera l'optimisation pour x86_64.
     </para>
-
-
     <para>
      <command>make -f client.mk ...</command> : Les produits Mozilla
     sont enpaquetés pour permettre l'utilisation d'un fichier de configuration qui peut
@@ -281,7 +272,8 @@
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 StartupNotify=true</literal>
 EOF
-ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png         /usr/share/pixmaps/firefox.png</userinput>
+ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
+        /usr/share/pixmaps/firefox.png</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/xsoft/graphweb/seamonkey.xml
===================================================================
--- trunk/blfs/xsoft/graphweb/seamonkey.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xsoft/graphweb/seamonkey.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -158,8 +158,7 @@
       mozconfig (aprés) pour le répertoire des objets (MOZ_OBJDIR):
     </para>
 <screen>
-<userinput>mkdir -vp mozilla/moz-build-dir &&
-sed -e 's/$(MOZ_ZLIB_CFLAGS)/$(MOZ_ZLIB_CFLAGS) $(MOZ_PIXMAN_CFLAGS)/'     -i config/config.mk</userinput>
+<userinput>mkdir -vp mozilla/moz-build-dir</userinput>
 </screen>
     <para>Compilez <application>SeaMonkey</application> en lançant la commande
     suivante :</para>
@@ -269,7 +268,8 @@
 StartupNotify=true
 Terminal=false
 EOF
-ln -sfv /usr/lib/seamonkey-&seamonkey-version;/chrome/icons/default/seamonkey.png         /usr/share/pixmaps</userinput>
+ln -sfv /usr/lib/seamonkey-&seamonkey-version;/chrome/icons/default/seamonkey.png \
+        /usr/share/pixmaps</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/xsoft/office/libreoffice.xml
===================================================================
--- trunk/blfs/xsoft/office/libreoffice.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xsoft/office/libreoffice.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -16,20 +16,11 @@
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
   <!ENTITY libreoffice-translations-md5sum        "b8d3445100c10bb4f21f6c8f25c5c600">
   <!ENTITY libreoffice-translations-size          "121 Mo">
-  <!-- This package has some peculiarities, some discussed in the text.
-  Two values for SBU and buildsize are given due to the large difference
-  measured by editors, depending on architecture and sometimes installé
-  dependencies (with-system... -->
+  
   <!ENTITY libreoffice-buildsize          "8.1 Go (535 Mo installé), with translations">
   <!ENTITY libreoffice-time               "200 SBU, with translations">
-  <!-- [fo] For version 4.3.1.2 I've got, for i686, statistcs over the upper
-  boundaries for x86_64 of previous versions, thus, temporarily, decided to use
-  single statistcs, instead of a range.
-  -->
-  <!-- This package has some peculiarities, some discussed in the text.
-  Two values for SBU and buildsize are given due to the large difference
-  measured by editors, depending on architecture and sometimes installé
-  dependencies (with-system... -->
+  
+  
 ]>
 <sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;">
   <?dbhtml filename="libreoffice.html"?>
@@ -155,7 +146,6 @@
         (souvent ancienne).</para>
     </note>
     <para role="recommended">
-
       <xref linkend="boost"/>,
        <xref linkend="clucene"/>,
        <xref linkend="cups"/>,
@@ -242,7 +232,6 @@
        <command>chroot</command> ou <command>ssh</command>.
       </para>
     </note>
-
     <note>
       <para>
       Contrairement aux autres paquets, nous supposons que vous n'avez pas encore
@@ -251,9 +240,7 @@
       <systemitem class="username">root</systemitem>.
       </para>
     </note>
-
-
-<screen role="root">
+<screen>
 <userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &&
 cd libreoffice-&libreoffice-dlversion;</userinput>
 </screen>
@@ -264,16 +251,20 @@
       de déballer les archives de l'aide et des traductions):
      </para>
 <screen>
-<userinput>install -dm755 src &&
-tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrite-dir --strip-components=1 &&
-ln -sv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz src/ &&
-ln -sv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz src/</userinput>
+<userinput>install -dm755 external/tarballs &&
+tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
+        --no-overwrite-dir --strip-components=1    &&
+ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
+       external/tarballs/ &&
+ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz \
+       external/tarballs/</userinput>
 </screen>
     <para>
       Si vous avez chargé l'archive des traductions, créez un lien symbolique:
     </para>
 <screen>
-<userinput>ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput>
+<userinput>ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz \
+       external/tarballs/</userinput>
 </screen>
       <note>
       <para>
@@ -311,11 +302,51 @@
       suivantes:
     </para>
 <screen>
-<userinput>sed -e "/gzip -f/d"       -e "s|.1.gz|.1|g"     -i bin/distro-install-desktop-integration        &&
+<userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &&
+sed -e "/gzip -f/d"   \
+    -e "s|.1.gz|.1|g" \
+    -i bin/distro-install-desktop-integration        &&
 sed -e "/distro-install-file-lists/d" -i Makefile.in &&
 chmod -v +x bin/unpack-sources                     &&
-sed -e "s/target.mk/langlist.mk/"                    -e "s/tar -xf/tar -x --strip-components=1 -f/"     -e "/tar -x/s/lo_src_dir/start_dir/"               -i bin/unpack-sources                          &&
-./autogen.sh --prefix=$LO_PREFIX                      --sysconfdir=/etc                        --with-vendor="BLFS"                     --with-lang="en-US pt-BR"                --with-help                              --with-alloc=system                      --without-java                           --disable-gconf                          --disable-odk                            --disable-postgresql-sdbc                --enable-release-build=yes               --enable-python=system                   --with-system-boost                      --with-system-clucene                    --with-system-cairo                      --with-system-curl                       --with-system-expat                      --with-system-graphite                   --with-system-harfbuzz                   --with-system-icu                        --with-system-jpeg                       --with-system-lcms2                      --with-system-libpng                     --with-system-libxml                     
 --with-system-mesa-headers               --with-system-neon                       --with-system-npapi-headers              --with-system-nss                        --with-system-odbc                       --with-system-openldap                   --with-system-openssl                    --with-system-poppler                    --with-system-redland                    --with-system-zlib                       --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput>
+sed -e "s/target\.mk/langlist\.mk/"                \
+    -e "s/tar -xf/tar -x --strip-components=1 -f/" \
+    -e "/tar -x/s/lo_src_dir/start_dir/"           \
+    -i bin/unpack-sources                          &&
+./autogen.sh --prefix=$LO_PREFIX         \
+             --sysconfdir=/etc           \
+             --with-vendor="BLFS"        \
+             --with-lang="en-US pt-BR"   \
+             --with-help                 \
+             --with-alloc=system         \
+             --without-java              \
+             --disable-gconf             \
+             --disable-odk               \
+             --disable-postgresql-sdbc   \
+             --enable-release-build=yes  \
+             --enable-python=system      \
+             --with-system-boost         \
+             --with-system-clucene       \
+             --with-system-cairo         \
+             --with-system-curl          \
+             --with-system-expat         \
+             --with-system-graphite      \
+             --with-system-harfbuzz      \
+             --with-system-icu           \
+             --with-system-jpeg          \
+             --with-system-lcms2         \
+             --with-system-libpng        \
+             --with-system-libxml        \
+             --with-system-mesa-headers  \
+             --with-system-neon          \
+             --with-system-npapi-headers \
+             --with-system-nss           \
+             --with-system-odbc          \
+             --with-system-openldap      \
+             --with-system-openssl       \
+             --with-system-poppler       \
+             --with-system-redland       \
+             --with-system-zlib          \
+             --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput>
 </screen>
 <para>
    Les instructions suivantes vont seulement construire le paquet sans lancer aucune
@@ -334,7 +365,8 @@
 <screen role="root">
 <userinput>make distro-pack-install                                  &&
 install -v -m755 -d $LO_PREFIX/share/appdata              &&
-install -v -m644    sysui/desktop/appstream-appdata/*.xml                     $LO_PREFIX/share/appdata</userinput>
+install -v -m644    sysui/desktop/appstream-appdata/*.xml \
+                    $LO_PREFIX/share/appdata</userinput>
 </screen>
     <para>
        Si les dictionnaires ont été construits, de nouveau en tant qu'utilisateur
@@ -360,7 +392,8 @@
 <userinput>mkdir -pv /usr/share/pixmaps &&
 for i in writer base calc draw impress math startcenter writer
 do
-  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png           /usr/share/pixmaps/
+  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
+          /usr/share/pixmaps/
 done
 unset i</userinput>
 </screen>

Modified: trunk/blfs/xsoft/other/gimp.xml
===================================================================
--- trunk/blfs/xsoft/other/gimp.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xsoft/other/gimp.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -5,7 +5,6 @@
   %general-entities;
   <!ENTITY gimp-download-http "http://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
   <!ENTITY gimp-download-ftp  " ">
-<!--  <!ENTITY gimp-download-ftp  "ftp://mirrors.xmission.com/gimp/gimp/v2.8/gimp-&gimp-version;.tar.bz2">-->
   <!ENTITY gimp-md5sum        "233c948203383fa078434cc3f8f925cb">
   <!ENTITY gimp-size          "20 Mo">
   <!ENTITY gimp-buildsize     "642 Mo (additional 553 Mo to run the test suite,
@@ -132,8 +131,7 @@
         Installez <application>Gimp</application> en lançant 
     les commandes suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../gimp-&gimp-version;-freetype-1.patch              &&
-./configure --prefix=/usr --sysconfdir=/etc --without-gvfs &&
+<userinput>./configure --prefix=/usr --sysconfdir=/etc --without-gvfs &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, (demande un terminal X), lancez : <command>make check</command>.</para>
@@ -146,7 +144,8 @@
     <para>Si vous avez téléchargé l'archive <filename>gimp-help</filename>, décompressez-la
     et changer dans la racine de l'arbre source nouvellement créé.Préparez la construction avec la commande suivante:</para>
 <screen>
-<userinput>ALL_LINGUAS="ca da de el en en_GB es fr it ja ko nl nn pt_BR ru sl sv zh_CN" ./configure --prefix=/usr &&</userinput>
+<userinput>ALL_LINGUAS="ca da de el en en_GB es fr it ja ko nl nn pt_BR ru sl sv zh_CN" \
+./configure --prefix=/usr &&</userinput>
 </screen>
     <para>Effacez de <envar>ALL_LINGUAS</envar> les codes de toutes les langues que vous ne souhaitez
     pas installer. Sinon, enlevez la ligne commençant par

Modified: trunk/blfs/xsoft/other/icedtea-web.xml
===================================================================
--- trunk/blfs/xsoft/other/icedtea-web.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xsoft/other/icedtea-web.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -80,7 +80,10 @@
     <para>Installer <application>IcedTea-Web</application> en exécutant les commandes
 	suivantes:</para>
 <screen>
-<userinput>./configure --prefix=${JAVA_HOME}/jre                --with-jdk-home=${JAVA_HOME}             --disable-docs                           --mandir=${JAVA_HOME}/man &&
+<userinput>./configure --prefix=${JAVA_HOME}/jre    \
+            --with-jdk-home=${JAVA_HOME} \
+            --disable-docs               \
+            --mandir=${JAVA_HOME}/man &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de tests.</para>
@@ -93,10 +96,11 @@
     <para>si vous le souhaitez, vous pouvez installer un fichier .desktop 
 correspondant à une entrée dans un menu de bureau pour <command>policyeditor</command>,
 en tant qu'utilisateur <systemitem class="username">root</systemitem>:</para>
-<screen role="root"><userinput>install -v -Dm0644 itweb-settings.desktop /usr/share/applications/itweb-settings.desktop 
-install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
+<screen role="root">
+<userinput>install -v -Dm0644 itweb-settings.desktop /usr/share/applications/itweb-settings.desktop &&
+install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput>
+</screen>
  
-
   </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>
@@ -167,8 +171,6 @@
         </listitem>
       </varlistentry>
       
-
-
       <varlistentry id="IcedTeaPlugin">
         <term><filename class='libraryfile'>IcedTeaPlugin.so</filename></term>
         <listitem>

Modified: trunk/blfs/xsoft/other/pidgin.xml
===================================================================
--- trunk/blfs/xsoft/other/pidgin.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xsoft/other/pidgin.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -91,7 +91,6 @@
       <ulink url="http://silcnet.org/software/">SILC Client</ulink>,
       <ulink url="http://silcnet.org/software/">SILC Toolkit</ulink>,
       <ulink url="http://packages.debian.org/stable/source/zephyr">Zephyr</ulink>, et
-
       <xref linkend="mitkrb"/> (requis pour le support de Kerberos dans le module Zephyr),
     </para>
     <para condition="html" role="usernotes">Notes utilisateur :

Modified: trunk/blfs/xsoft/other/thunderbird.xml
===================================================================
--- trunk/blfs/xsoft/other/thunderbird.xml	2014-10-01 20:12:30 UTC (rev 6564)
+++ trunk/blfs/xsoft/other/thunderbird.xml	2014-10-01 21:28:43 UTC (rev 6565)
@@ -122,10 +122,11 @@
     commande suivante :</para>
 <screen>
 <userinput>cat > mozconfig << "EOF"
-# If you have a multicore machine you can speed up the build by running
-# several jobs at once by uncommenting the following line and setting the
-# value to number of CPU cores:
-#mk_add_options MOZ_MAKE_FLAGS="-j4"
+<literal># If you have a multicore machine, the build may be faster if using parallel
+# jobs. The build system automatically adds -jN to the "make" flags, where N
+# is the number of CPU cores. The option below is therefore useless, unless
+# you want to use a smaller number of jobs:
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
 # If you have installed DBus-Glib comment out this line:
 ac_add_options --disable-dbus
 # If you have installed wireless-tools comment out this line:
@@ -175,7 +176,7 @@
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbuild
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbuild</literal>
 EOF</userinput>
 </screen>
      <para>
@@ -284,7 +285,8 @@
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
 StartupNotify=true</literal>
 EOF
-ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png         /usr/share/pixmaps/thunderbird.png</userinput>
+ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
+        /usr/share/pixmaps/thunderbird.png</userinput>
 </screen>
     </sect3>
   </sect2>



More information about the lfs-traducfr mailing list