[lfs-fr] r6830 - in trunk/blfs: general/genlib general/genutils general/graphlib general/prog general/sysutils gnome/applications gnome/platform introduction/welcome multimedia/libdriv multimedia/videoutils networking/connect networking/netlibs networking/netprogs networking/netutils postlfs/config postlfs/editors postlfs/filesystems postlfs/security postlfs/virtualization pst/printing pst/ps server/databases server/mail server/major server/other x/installing x/lib xincludes xsoft/graphweb xsoft/office xsoft/other

myou72 at orange.fr myou72 at orange.fr
Ven 10 Avr 04:13:20 PDT 2015


Author: myou72
Date: 2015-04-10 04:13:20 -0700 (Fri, 10 Apr 2015)
New Revision: 6830

Modified:
   trunk/blfs/general/genlib/aspell.xml
   trunk/blfs/general/genlib/enchant.xml
   trunk/blfs/general/genutils/hicolor-icon-theme.xml
   trunk/blfs/general/genutils/imagemagick.xml
   trunk/blfs/general/genutils/pinentry.xml
   trunk/blfs/general/graphlib/lcms.xml
   trunk/blfs/general/graphlib/librsvg.xml
   trunk/blfs/general/prog/apache-ant.xml
   trunk/blfs/general/prog/dejagnu.xml
   trunk/blfs/general/prog/git.xml
   trunk/blfs/general/prog/openjdk.xml
   trunk/blfs/general/prog/php.xml
   trunk/blfs/general/prog/pygobject3.xml
   trunk/blfs/general/prog/subversion.xml
   trunk/blfs/general/prog/tcl.xml
   trunk/blfs/general/sysutils/bluez.xml
   trunk/blfs/general/sysutils/dbus.xml
   trunk/blfs/general/sysutils/mc.xml
   trunk/blfs/general/sysutils/udisks2.xml
   trunk/blfs/general/sysutils/upower.xml
   trunk/blfs/general/sysutils/which.xml
   trunk/blfs/gnome/applications/evince.xml
   trunk/blfs/gnome/applications/gnome-terminal.xml
   trunk/blfs/gnome/applications/nautilus.xml
   trunk/blfs/gnome/applications/seahorse.xml
   trunk/blfs/gnome/platform/dconf.xml
   trunk/blfs/gnome/platform/gvfs.xml
   trunk/blfs/gnome/platform/notification-daemon.xml
   trunk/blfs/gnome/platform/vte.xml
   trunk/blfs/introduction/welcome/changelog.xml
   trunk/blfs/multimedia/libdriv/alsa-plugins.xml
   trunk/blfs/multimedia/libdriv/libdvdread.xml
   trunk/blfs/multimedia/libdriv/libmusicbrainz.xml
   trunk/blfs/multimedia/libdriv/pulseaudio.xml
   trunk/blfs/multimedia/videoutils/vlc.xml
   trunk/blfs/networking/connect/dhcp.xml
   trunk/blfs/networking/connect/dhcpcd.xml
   trunk/blfs/networking/netlibs/glib-networking.xml
   trunk/blfs/networking/netlibs/libpcap.xml
   trunk/blfs/networking/netprogs/samba.xml
   trunk/blfs/networking/netprogs/wpa_supplicant.xml
   trunk/blfs/networking/netutils/wireshark.xml
   trunk/blfs/postlfs/config/lsb-release.xml
   trunk/blfs/postlfs/editors/joe.xml
   trunk/blfs/postlfs/filesystems/lvm2.xml
   trunk/blfs/postlfs/filesystems/ntfs-3g.xml
   trunk/blfs/postlfs/security/gnutls.xml
   trunk/blfs/postlfs/security/nss.xml
   trunk/blfs/postlfs/security/openssl.xml
   trunk/blfs/postlfs/security/stunnel.xml
   trunk/blfs/postlfs/security/sudo.xml
   trunk/blfs/postlfs/virtualization/qemu.xml
   trunk/blfs/pst/printing/gs.xml
   trunk/blfs/pst/ps/epdfview.xml
   trunk/blfs/server/databases/db.xml
   trunk/blfs/server/databases/mariadb.xml
   trunk/blfs/server/mail/dovecot.xml
   trunk/blfs/server/mail/postfix.xml
   trunk/blfs/server/major/bind.xml
   trunk/blfs/server/other/openldap.xml
   trunk/blfs/server/other/unbound.xml
   trunk/blfs/x/installing/libva.xml
   trunk/blfs/x/installing/mesalib.xml
   trunk/blfs/x/installing/x7lib.xml
   trunk/blfs/x/installing/xterm.xml
   trunk/blfs/x/lib/at-spi2-core.xml
   trunk/blfs/x/lib/gtk+3.xml
   trunk/blfs/x/lib/qt5.xml
   trunk/blfs/x/lib/webkitgtk.xml
   trunk/blfs/x/lib/webkitgtk2.xml
   trunk/blfs/xincludes/setqt.xml
   trunk/blfs/xsoft/graphweb/firefox.xml
   trunk/blfs/xsoft/graphweb/seamonkey.xml
   trunk/blfs/xsoft/office/libreoffice.xml
   trunk/blfs/xsoft/other/fontforge.xml
   trunk/blfs/xsoft/other/gparted.xml
   trunk/blfs/xsoft/other/thunderbird.xml
   trunk/blfs/xsoft/other/tigervnc.xml
Log:
synchro screen

Modified: trunk/blfs/general/genlib/aspell.xml
===================================================================
--- trunk/blfs/general/genlib/aspell.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/genlib/aspell.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -76,6 +76,7 @@
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
+ln -svfn aspell-0.60 /usr/lib/aspell &&
 install -v -m755 -d /usr/share/doc/aspell-&aspell-version;/aspell{,-dev}.html &&
 install -v -m644 manual/aspell.html/* \
     /usr/share/doc/aspell-&aspell-version;/aspell.html &&
@@ -101,7 +102,6 @@
       <xref linkend="enchant"/>.
      </para>
   </sect2>
-
   <sect2 role="configuration">
     <title>Configuration d'Aspell</title>
     <sect3>

Modified: trunk/blfs/general/genlib/enchant.xml
===================================================================
--- trunk/blfs/general/genlib/enchant.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/genlib/enchant.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -64,7 +64,7 @@
     <para>Installez <application>enchant</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr --disable-static &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -78,8 +78,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
   </sect2>
-
-
   <sect2 role="configuration">
     <title>Configuration d'enchant</title>
     <sect3 id="enchant-config">
@@ -95,23 +93,26 @@
       </indexterm>
     </sect3>
     <sect3><title>Informations de configuration</title>
-
       <para>
         Si vous souhaitez utiliser le moteur <xref linkend="aspell"/>, créez un lien symbolique,
         en tant qu'utilisateur <systemitem class="username">root</systemitem> :
       </para>
-<screen role="root"><userinput>ln -svfn ../../lib/aspell /usr/share/enchant/aspell</userinput></screen>
+<screen role="root">
+<userinput>ln -svfn ../../lib/aspell /usr/share/enchant/aspell</userinput>
+</screen>
       <para>
         Vous pouvez tester votre installation et votre configuration en créant un fichier test
         et en lançant les commandes suivantes (vous pouvez remplacer le dictionnaire en_GB par n'importe quel autre que vous avez
        téléchargé à l'installation de <xref linkend="aspell"/>):
       </para>
-<screen><userinput>cat > /tmp/test-enchant.txt << "EOF" &&
+<screen>
+<userinput>cat > /tmp/test-enchant.txt << "EOF" && 
 <literal>Tel me more abot linux
 Ther ar so many commads</literal>
 EOF
 enchant -d en_GB -l /tmp/test-enchant.txt &&
-enchant -d en_GB -a /tmp/test-enchant.txt</userinput></screen>
+enchant -d en_GB -a /tmp/test-enchant.txt</userinput>
+</screen>
       <para>
        Vous verrez une liste des mots mal 
        orthographié suivi par une liste des alternatives pour veux.

Modified: trunk/blfs/general/genutils/hicolor-icon-theme.xml
===================================================================
--- trunk/blfs/general/genutils/hicolor-icon-theme.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/genutils/hicolor-icon-theme.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -5,7 +5,7 @@
   %general-entities;
   <!ENTITY hicolor-icon-theme-download-http "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz">
   <!ENTITY hicolor-icon-theme-download-ftp  " ">
-  <!--<!ENTITY hicolor-icon-theme-download-ftp  "&gentoo-ftp-repo;/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">-->
+  
   <!ENTITY hicolor-icon-theme-md5sum        "6aa2b3993a883d85017c7cc0cfc0fb73">
   <!ENTITY hicolor-icon-theme-size          "52 Ko">
   <!ENTITY hicolor-icon-theme-buildsize     "320 Ko">

Modified: trunk/blfs/general/genutils/imagemagick.xml
===================================================================
--- trunk/blfs/general/genutils/imagemagick.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/genutils/imagemagick.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -159,7 +159,12 @@
     suivantes :</para>
  
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --enable-hdri                 --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/pinentry.xml
===================================================================
--- trunk/blfs/general/genutils/pinentry.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/genutils/pinentry.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -73,8 +73,7 @@
     <para>Installez <application>PIN-Entry</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -i 's:../../../s/pinentry/qt4/::' qt4/*.moc &&
-./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/general/graphlib/lcms.xml
===================================================================
--- trunk/blfs/general/graphlib/lcms.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/graphlib/lcms.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -47,7 +47,6 @@
         <para>Estimation du temps de construction : &lcms-time;</para>
       </listitem>
     </itemizedlist>
-
    
     <bridgehead renderas="sect3">Dépendances de little cms</bridgehead>
     <bridgehead renderas="sect4">Facultatives</bridgehead>
@@ -55,7 +54,6 @@
     <xref linkend="libjpeg"/> et
     <xref linkend="python2"/> (avec
     <xref linkend="swig"/> également)</para>
-
      <bridgehead renderas="sect3">Téléchargements supplémentaires</bridgehead>
      <itemizedlist spacing="compact">
        <listitem>
@@ -65,9 +63,6 @@
         </para>
        </listitem>
     </itemizedlist>
-
-
-
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/lcms"/></para>
   </sect2>
@@ -76,7 +71,8 @@
     <para>Installez <application>little cms</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-static &&
+<userinput>patch -Np1 -i ../lcms-&lcms-version;-cve_2013_4276-1.patch &&
+./configure --prefix=/usr --disable-static       &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/general/graphlib/librsvg.xml
===================================================================
--- trunk/blfs/general/graphlib/librsvg.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/graphlib/librsvg.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -72,7 +72,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/prog/apache-ant.xml
===================================================================
--- trunk/blfs/general/prog/apache-ant.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/apache-ant.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -167,10 +167,12 @@
        <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>cat >> /etc/profile.d/extrapaths.sh << EOF
-<literal># Begin Apache-ant addition
+<literal>
+# Begin Apache-ant addition
 pathappend /opt/ant/bin
 export ANT_HOME=/opt/ant
-# End Apache-ant addition</literal>
+# End Apache-ant addition
+</literal>
 EOF</userinput>
 </screen>
       <para>Les instructions précédentes considèrent que vous avez configuré votre système comme décrit

Modified: trunk/blfs/general/prog/dejagnu.xml
===================================================================
--- trunk/blfs/general/prog/dejagnu.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/dejagnu.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -76,7 +76,8 @@
 <screen role="root">
 <userinput>make install &&
 install -v -dm755   /usr/share/doc/dejagnu-&dejagnu-version; &&
-install -v -m644    doc/dejagnu.{html,txt}                     /usr/share/doc/dejagnu-&dejagnu-version;</userinput>
+install -v -m644    doc/dejagnu.{html,txt} \
+                    /usr/share/doc/dejagnu-&dejagnu-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/general/prog/git.xml
===================================================================
--- trunk/blfs/general/prog/git.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/git.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -146,15 +146,17 @@
     <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 -vp   /usr/share/doc/git-&git-version; &&
-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>
+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>

Modified: trunk/blfs/general/prog/openjdk.xml
===================================================================
--- trunk/blfs/general/prog/openjdk.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/openjdk.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -34,10 +34,6 @@
   <!ENTITY nashorn-size              "1.9 Mo">
   <!ENTITY jtreg-version             "4.1-b11">
   <!ENTITY jtreg-download            "https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastStableBuild/artifact/jtreg&jtreg-version;.tar.gz">
-<!--
-  <!ENTITY jtreg-md5sum              "2e112b5863c777426fbbbadeeb9972e1">
-The md5sum varies, because people at adopt-openjdk rebuild the package
-without changing the name of the tarball -->
   <!ENTITY jtreg-size                "7.3 Mo">
   <!ENTITY icedtea-web-download      "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
   <!ENTITY ojdk-buildsize           "3.1 Go (additional 350 Mo for tests)">
@@ -262,7 +258,9 @@
       Corrigez un problème avec la nouvelle API de giflib (depuis 5.1.0):
     </para>
 <screen>
-<userinput>sed -e 's/DGifCloseFile(gif/&, NULL/'     -e '/DGifOpen/s/c)/c, NULL)/'         -i jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c</userinput>
+<userinput>sed -e 's/DGifCloseFile(gif/&, NULL/' \
+    -e '/DGifOpen/s/c)/c, NULL)/'     \
+    -i jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c</userinput>
 </screen>
     <para>
       corrigez un bogue dans un script shell utilisé pour initialisé les drapeaux pour
@@ -269,7 +267,8 @@
       <command>make</command>:
     </para>
 <screen>
-<userinput>sed 's/([ t])]([^])/1I]2/g'     -i hotspot/make/linux/makefiles/adjust-mflags.sh</userinput>
+<userinput>sed 's/\([ \t]\)\]\([^\]\)/\1I]\2/g' \
+    -i hotspot/make/linux/makefiles/adjust-mflags.sh</userinput>
 </screen>
     <note>
       <para>
@@ -288,7 +287,13 @@
     (la valeur --with-milestone peut être modifiée selon les préférences de l'utilisateur):</para>
 <screen>
 <userinput>unset JAVA_HOME               &&
-sh ./configure                   --with-update-version=&ojdk-upd;      --with-build-number=&ojdk-bd;       --with-milestone=BLFS         --enable-unlimited-crypto     --with-zlib=system            --with-giflib=system       &&
+sh ./configure                \
+   --with-update-version=&ojdk-upd;   \
+   --with-build-number=&ojdk-bd;    \
+   --with-milestone=BLFS      \
+   --enable-unlimited-crypto  \
+   --with-zlib=system         \
+   --with-giflib=system       &&
 make DEBUG_BINARIES=true all</userinput>
 </screen>
     <para>
@@ -302,10 +307,13 @@
   OLD_DISP=$DISPLAY
 fi
 export DISPLAY=:20
-nohup Xvfb $DISPLAY                                         -fbdir $(pwd)                                    -pixdepths 8 16 24 32 > Xvfb.out 2>&1 &
+nohup Xvfb $DISPLAY                              \
+           -fbdir $(pwd)                         \
+           -pixdepths 8 16 24 32 > Xvfb.out 2>&1 &
 echo $! > Xvfb.pid
 echo Waiting for Xvfb to initialize; sleep 1
-nohup twm -display $DISPLAY           -f /dev/null > twm.out 2>&1            &
+nohup twm -display $DISPLAY \
+          -f /dev/null > twm.out 2>&1            &
 echo $! > twm.pid
 echo Waiting for twm to initialize; sleep 1
 xhost +</userinput>
@@ -315,18 +323,19 @@
     </para>
 <screen role='nodump'>
 <userinput>echo -e "
-jdk_all = :jdk_core           \
-          :jdk_svc            \
-          :jdk_beans          \
-          :jdk_imageio        \
-          :jdk_sound          \
-          :jdk_sctp           \
-          com/sun/awt         \
-          javax/accessibility \
-          javax/print         \
-          sun/pisces          \
+jdk_all = :jdk_core           \\
+          :jdk_svc            \\
+          :jdk_beans          \\
+          :jdk_imageio        \\
+          :jdk_sound          \\
+          :jdk_sctp           \\
+          com/sun/awt         \\
+          javax/accessibility \\
+          javax/print         \\
+          sun/pisces          \\
           com/sun/java/swing" >> jdk/test/TEST.groups &&
-sed -e 's/all:.*jck.*/all: jtreg/'     -i langtools/test/Makefile</userinput>
+sed -e 's/all:.*jck.*/all: jtreg/' \
+    -i langtools/test/Makefile</userinput>
 </screen>
     <para>
       Quelques variables doivent être initialisée:
@@ -340,8 +349,15 @@
       Les tests sont lancé comme la suite:
     </para>
 <screen role='nodump'>
-<userinput>LANG=C make -k -C test                                  JT_HOME=${JT_HOME}                          JT_JAVA=${JT_JAVA}                          PRODUCT_HOME=${PRODUCT_HOME} all
-LANG=C ${JT_HOME}/linux/bin/jtreg -a -v:fail,error                 -dir:$(pwd)/hotspot/test                    -k:!ignore                                 -jdk:${PRODUCT_HOME}                        :jdk</userinput>
+<userinput>LANG=C make -k -C test                      \
+            JT_HOME=${JT_HOME}              \
+            JT_JAVA=${JT_JAVA}              \
+            PRODUCT_HOME=${PRODUCT_HOME} all
+LANG=C ${JT_HOME}/linux/bin/jtreg -a -v:fail,error \
+                -dir:$(pwd)/hotspot/test    \
+                -k:\!ignore                 \
+                -jdk:${PRODUCT_HOME}        \
+                :jdk</userinput>
 </screen>
     <para>
       Les résultats des tests peuvent être comparé avec ces 
@@ -360,10 +376,10 @@
 <para>Installez le paquet avec les commandes suivantes en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>find build/*/images/j2sdk-image -iname *.jar -exec chmod a+r {} ; &&
+<userinput>find build/*/images/j2sdk-image -iname \*.jar -exec chmod a+r {} \; &&
 chmod a+r build/*/images/j2sdk-image/lib/ct.sym &&
-find build/*/images/j2sdk-image -iname *.diz -delete &&
-find build/*/images/j2sdk-image -iname *.debuginfo -delete &&
+find build/*/images/j2sdk-image -iname \*.diz -delete &&
+find build/*/images/j2sdk-image -iname \*.debuginfo -delete &&
 cp -R build/*/images/j2sdk-image /opt/OpenJDK-&openjdk-version; &&
 chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput>
 </screen>
@@ -381,7 +397,9 @@
 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>
-<userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz          icedtea-web-&icedtea-web-version;/javaws.png         --strip-components=1</userinput>
+<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
@@ -598,31 +616,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
@@ -664,7 +682,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
@@ -686,7 +708,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>
     <para>Utilisez les commandes suivantes pour vérifier si le fichier
     <filename>cacerts</filename> a été installé avec succès:</para>

Modified: trunk/blfs/general/prog/php.xml
===================================================================
--- trunk/blfs/general/prog/php.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/php.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -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,7 +288,8 @@
       <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
@@ -271,13 +296,17 @@
       <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/pygobject3.xml
===================================================================
--- trunk/blfs/general/prog/pygobject3.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/pygobject3.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -84,7 +84,7 @@
          suivante pour corriger un test invalide:
       </para>
 <screen>
-<userinput>sed -i '/test_out_glist/ i    @unittest.expectedFailure'        tests/test_atoms.py</userinput>
+<userinput>sed -i '/d =.*MUSIC/d' tests/test_glib.py</userinput>
 </screen>
         <para>
         Pour construire <application>PyGObject3</application> en tant que module

Modified: trunk/blfs/general/prog/subversion.xml
===================================================================
--- trunk/blfs/general/prog/subversion.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/subversion.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -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  " ">
@@ -95,7 +94,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
@@ -136,7 +137,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>
 .
@@ -147,8 +150,6 @@
     <para>
     Les tests des liaisons Java, <command>make check-javahl</command>,échouent à cause d'erreurs dans la suite de tests.
     </para>
-
-
     <para>Pour tester les résultats de certaines des
     liaisons <application>SWIG</application>, vous pouvez utiliser 
     les commandes suivantes :
@@ -158,15 +159,12 @@
     <para>
     Les tests des liaisons Ruby, <command>make check-swig-rb</command>,échouent  à cause d'erreurs dans la suite de tests.
     </para>
-
-
-
-
       <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <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
@@ -189,7 +187,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	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/prog/tcl.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -95,7 +95,7 @@
 sed -e "s#$SRCDIR/unix/pkgs/tdbc&tdbc-ver;#/usr/lib/tdbc&tdbc-ver;#" \
     -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/generic#/usr/include#"    \
     -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/library#/usr/lib/tcl8.6#" \
-    -e "s#$SRCDIR/pkgs/&tdbc-ver;#/usr/include#"            \
+    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;#/usr/include#"            \
     -i pkgs/tdbc&tdbc-ver;/tdbcConfig.sh                        &&
 sed -e "s#$SRCDIR/unix/pkgs/itcl&itcl-ver;#/usr/lib/itcl&itcl-ver;#" \
     -e "s#$SRCDIR/pkgs/itcl&itcl-ver;/generic#/usr/include#"    \

Modified: trunk/blfs/general/sysutils/bluez.xml
===================================================================
--- trunk/blfs/general/sysutils/bluez.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/sysutils/bluez.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -117,7 +117,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>

Modified: trunk/blfs/general/sysutils/dbus.xml
===================================================================
--- trunk/blfs/general/sysutils/dbus.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/sysutils/dbus.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -112,9 +112,10 @@
       <command>dbus-daemon-launch-helper</command> demande à être corrigé. Tapez
       en tant qu'utilisateur <systemitem class="username">root</systemitem>
     </para>
-<screen role="root"><userinput>chown -v root:messagebus /usr/libexec/dbus-daemon-launch-helper &&
-chmod -v      4750       /usr/libexec/dbus-daemon-launch-helper</userinput></screen>
-
+<screen role="root">
+<userinput>chown -v root:messagebus /usr/libexec/dbus-daemon-launch-helper &&
+chmod -v      4750       /usr/libexec/dbus-daemon-launch-helper</userinput>
+</screen>
 <para>
       Si vous construisez votre système en chroot ou que vous n'avez pas encore lancé 
       le démon, mais que vous souhaitez compiler certains paquets dépendant de 

Modified: trunk/blfs/general/sysutils/mc.xml
===================================================================
--- trunk/blfs/general/sysutils/mc.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/sysutils/mc.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -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/udisks2.xml
===================================================================
--- trunk/blfs/general/sysutils/udisks2.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/sysutils/udisks2.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -93,7 +93,10 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                    --sysconfdir=/etc                --localstatedir=/var             --disable-static &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/sysutils/upower.xml
===================================================================
--- trunk/blfs/general/sysutils/upower.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/sysutils/upower.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -82,7 +82,7 @@
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --enable-deprecated  \
-            --disable-static &&
+            --disable-static     &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/general/sysutils/which.xml
===================================================================
--- trunk/blfs/general/sysutils/which.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/general/sysutils/which.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY which-download-http "http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz">-->
   <!ENTITY which-download-http "http://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
   <!ENTITY which-download-ftp  "ftp://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
   <!ENTITY which-md5sum        "097ff1a324ae02e0a3b0369f07a7544a">

Modified: trunk/blfs/gnome/applications/evince.xml
===================================================================
--- trunk/blfs/gnome/applications/evince.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/applications/evince.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -85,7 +85,9 @@
     <para>Installez <application>Evince</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                       --enable-introspection              --disable-static        &&
+<userinput>./configure --prefix=/usr           \
+            --enable-introspection  \
+            --disable-static        &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas une suite de tests fonctionnelle</para>

Modified: trunk/blfs/gnome/applications/gnome-terminal.xml
===================================================================
--- trunk/blfs/gnome/applications/gnome-terminal.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/applications/gnome-terminal.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -86,7 +86,10 @@
       suivantes :  
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                         --disable-static                      --disable-migration                   --disable-search-provider &&
+<userinput>./configure --prefix=/usr             \
+            --disable-static          \
+            --disable-migration       \
+            --disable-search-provider &&
 make</userinput>
 </screen>
     <para>
@@ -97,7 +100,8 @@
     </para>
 <screen role="root">
 <userinput>make install &&
-sed -e 's/System/Utility/'     -i /usr/share/applications/gnome-terminal.desktop</userinput>
+sed -e 's/System/Utility/' \
+    -i /usr/share/applications/gnome-terminal.desktop</userinput>
 </screen>
     <note><para>Pour lancer <application>GNOME Terminal</application>, la variable d'environnement
     <envar>LANG></envar> doit être initialisée sur une locale UTF-8.</para></note>

Modified: trunk/blfs/gnome/applications/nautilus.xml
===================================================================
--- trunk/blfs/gnome/applications/nautilus.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/applications/nautilus.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -95,7 +95,10 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                    --sysconfdir=/etc                --disable-tracker                --disable-packagekit &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --disable-tracker    \
+            --disable-packagekit &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/applications/seahorse.xml
===================================================================
--- trunk/blfs/gnome/applications/seahorse.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/applications/seahorse.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -82,7 +82,9 @@
     <para>Installez <application>Seahorse</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                 --bindir=/usr/bin             --disable-static  &&
+<userinput>./configure --prefix=/usr     \
+            --bindir=/usr/bin \
+            --disable-static  &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/gnome/platform/dconf.xml
===================================================================
--- trunk/blfs/gnome/platform/dconf.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/platform/dconf.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!-- DConf -->
   <!ENTITY dconf-download-http "&gnome-download-http;/dconf/0.24/dconf-&dconf-version;.tar.xz">
   <!ENTITY dconf-download-ftp  "&gnome-download-ftp;/dconf/0.24/dconf-&dconf-version;.tar.xz">
   <!ENTITY dconf-md5sum        "5459a539ffc483f9c002ddeab626a64e">
@@ -10,7 +9,6 @@
   <!ENTITY dconf-size          "216 Ko">
   <!ENTITY dconf-buildsize     "12 Mo">
   <!ENTITY dconf-time          "0.1 SBU">
-<!-- DConf-Editor -->
   <!ENTITY dconf-editor-download-http "&gnome-download-http;/dconf-editor/&gnome-minor-16;/dconf-editor-&dconf-editor-version;.tar.xz">
   <!ENTITY dconf-editor-download-ftp  "&gnome-download-ftp;/dconf-editor/&gnome-minor-16;/dconf-editor-&dconf-editor-version;.tar.xz">
   <!ENTITY dconf-editor-md5sum        "fd0b398d21274b5412c0f0bd3643fab6">
@@ -34,7 +32,6 @@
     configuration de bas niveau. Son but principal est d'offrir une fondation à
     GSettings sur des plate-formes qui n'ont pas déjà de systèmes pour stocker la
     configuration.</para>
-
     <para>
       <application>DConf-Editor</application>, comme son nom le suggère, est un éditeur graphique pour
       la base de données <application>DConf</application>.
@@ -41,8 +38,6 @@
       L'installation est optionnelle, car <command>gsettings</command> de <xref
       linkend="glib2"/> fournit une fonctionnalité similaire en ligne de commandes.
     </para>
-
-
    &lfs77_checked;
     <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
     <itemizedlist spacing="compact">
@@ -65,7 +60,6 @@
         <para>Estimation du temps de construction : &dconf-time;</para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Information sur le paquet supplémentaire</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -99,8 +93,6 @@
         </para>
       </listitem>
     </itemizedlist>
-
-
     <bridgehead renderas="sect3">Dépendances de Dconf</bridgehead>
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required"><xref linkend="dbus"/>, 
@@ -107,7 +99,6 @@
       <xref linkend="glib2"/>,
       <xref linkend="gtk3"/> (pour l'éditeur), et
       <xref linkend="libxml2"/> (pour l'éditeur)
-
     </para>
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
@@ -125,7 +116,7 @@
     <para>Installez <application>Dconf</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc &&
+<userinput>./configure --prefix=/usr --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -133,22 +124,19 @@
 <screen role="root">
 <userinput>make install</userinput>
 </screen>
-
     <para>Maintenant, installez facultativement l'éditeur:</para>
-
-<screen><userinput>tar -xf ../dconf-editor-3.16.0.tar.xz &&
+<screen>
+<userinput>tar -xf ../dconf-editor-3.16.0.tar.xz &&
 cd dconf-editor-3.16.0 &&
-
 ./configure --prefix=/usr --sysconfdir=/etc &&
-make</userinput></screen>
-
+make</userinput>
+</screen>
     <para>
       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>
   </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>
@@ -216,9 +204,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-
-
       <varlistentry id="libdconf">
         <term><filename class="libraryfile">libdconf.so</filename></term>
        <listitem>
@@ -240,5 +225,4 @@
       </varlistentry>
     </variablelist>
   </sect2>
-
 </sect1>

Modified: trunk/blfs/gnome/platform/gvfs.xml
===================================================================
--- trunk/blfs/gnome/platform/gvfs.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/platform/gvfs.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -115,7 +115,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/gnome/platform/notification-daemon.xml
===================================================================
--- trunk/blfs/gnome/platform/notification-daemon.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/platform/notification-daemon.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -81,7 +81,9 @@
       suivantes  
     </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/gnome/platform/vte.xml
===================================================================
--- trunk/blfs/gnome/platform/vte.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/gnome/platform/vte.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -9,7 +9,7 @@
   <!ENTITY vte-size          "904 Ko">
   <!ENTITY vte-buildsize     "18 Mo (additional 2 Mo for the tests)">
   <!ENTITY vte-time          "0.2 SBU">
-  <!-- For "Contents" and "Short Descriptions" sections -->
+  
   <!ENTITY vte-nano          "91">
 ]>
 <sect1 id="vte" xreflabel="VTE-&vte-version;">
@@ -72,7 +72,10 @@
     <para>Installez <application>VTE</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                      --sysconfdir=/etc                  --disable-static                   --enable-introspection &&
+<userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --disable-static       \
+            --enable-introspection &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make check</command>.</para>

Modified: trunk/blfs/introduction/welcome/changelog.xml
===================================================================
--- trunk/blfs/introduction/welcome/changelog.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/introduction/welcome/changelog.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -69,7 +69,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>31 Mars 2015</para>
       <itemizedlist>
@@ -112,7 +111,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
   <listitem>
       <para>30 Mars 2015</para>
       <itemizedlist>
@@ -184,10 +182,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
-
-
     <listitem>
       <para>28 Mars 2015</para>
       <itemizedlist>
@@ -318,7 +312,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>26 Mars 2015</para>
       <itemizedlist>
@@ -419,8 +412,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
    <listitem>
       <para>24 Mars 2015</para>
       <itemizedlist>
@@ -564,9 +555,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
-
     <listitem>
       <para>21 Mars 2015</para>
       <itemizedlist>

Modified: trunk/blfs/multimedia/libdriv/alsa-plugins.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/alsa-plugins.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/multimedia/libdriv/alsa-plugins.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -67,7 +67,7 @@
     <para>Installez <application>ALSA Plugins</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>sed -i "/speex_preprocess/i#include <stdint.h>" speex/pcm_speex.c &&
+<userinput>sed -i "/speex_preprocess.h/i#include <stdint.h>" speex/pcm_speex.c &&
 ./configure &&
 make</userinput>
 </screen>

Modified: trunk/blfs/multimedia/libdriv/libdvdread.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libdvdread.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/multimedia/libdriv/libdvdread.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -54,7 +54,9 @@
     <para>Installez <application>libdvdread</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-static             --docdir=/usr/share/doc/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/libmusicbrainz.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libmusicbrainz.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/multimedia/libdriv/libmusicbrainz.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -73,7 +73,7 @@
     commandes suivantes :</para>
 <screen>
 <userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch &&
-./configure --prefix=/usr &&
+./configure --prefix=/usr --disable-static &&
 make</userinput>
 </screen>
     <para>Si <application>Python</application> est installé, construisez les
@@ -104,9 +104,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
   </sect2>
-
-
-
   <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/multimedia/libdriv/pulseaudio.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/pulseaudio.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/multimedia/libdriv/pulseaudio.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -98,8 +98,11 @@
    <para>Installez <application>PulseAudio</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>find . -name "Makefile.in" | xargs sed -i "s|(libdir)/@PACKAGE@|(libdir)/pulse|" &&
-./configure --prefix=/usr                    --sysconfdir=/etc                --localstatedir=/var             --disable-bluez4                 --disable-rpath                  --with-module-dir=/usr/lib/pulse/modules &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-bluez4     \
+            --disable-rpath      &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>
@@ -175,7 +178,8 @@
         <systemitem class="username">root</systemitem>:
      </para>
 <screen role="root">
-<userinput>sed '/load-module module-console-kit/s/^/#/'                     -i /etc/pulse/default.pa</userinput>
+<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

Modified: trunk/blfs/multimedia/videoutils/vlc.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/vlc.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/multimedia/videoutils/vlc.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -5,7 +5,6 @@
   %general-entities;
   <!ENTITY vlc-download-http "http://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
       <!ENTITY vlc-download-ftp " ">
-<!--  <!ENTITY vlc-download-ftp "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">-->
   <!ENTITY vlc-md5sum        "faeceb614bf3946e5f90ef0d1f51db45">
   <!ENTITY vlc-size          "20 Mo">
   <!ENTITY vlc-buildsize     "652 Mo">
@@ -172,10 +171,10 @@
 <screen>
 <userinput>sed -i 's:libsmbclient.h:samba-4.0/&:' modules/access/smb.c &&
 ./bootstrap &&
-sed "s:< 56:< 57:g" -i configure &&
 ./configure --prefix=/usr        &&
 sed -i 's/luaL_optint/(int)&eger/'         modules/lua/libs/{net,osd,volume}.c             &&
-sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/'        modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c &&
+sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
+       modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c &&
 make</userinput>
 </screen>
     <para>Pour tester le résultat, tapez : <command>make check</command></para>

Modified: trunk/blfs/networking/connect/dhcp.xml
===================================================================
--- trunk/blfs/networking/connect/dhcp.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/networking/connect/dhcp.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -99,7 +99,16 @@
     les commandes suivantes :</para>
 <screen>
 <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 &&
+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/connect/dhcpcd.xml
===================================================================
--- trunk/blfs/networking/connect/dhcpcd.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/networking/connect/dhcpcd.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -5,7 +5,7 @@
   %general-entities;
   <!ENTITY dhcpcd-download-http "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
   <!ENTITY dhcpcd-download-ftp  "ftp://roy.marples.name/pub/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
-  <!--<!ENTITY dhcpcd-download-ftp  "ftp://ftp.osuosl.org/pub/gentoo/distfiles/dhcpcd-&dhcpcd-version;.tar.bz2">-->
+  
   <!ENTITY dhcpcd-md5sum        "2a60bd16cf04c9479b895d3f9223bc95">
   <!ENTITY dhcpcd-size          "172 Ko">
   <!ENTITY dhcpcd-buildsize     "2.4 Mo">
@@ -62,7 +62,8 @@
     <para>Installez <application>dhcpcd</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --libexecdir=/lib/dhcpcd             --dbdir=/var/tmp         &&
+<userinput>./configure --libexecdir=/lib/dhcpcd \
+            --dbdir=/var/tmp         &&
 make</userinput>
 </screen>
     <para>Ce paquet est fourni sans suite de tests.</para>

Modified: trunk/blfs/networking/netlibs/glib-networking.xml
===================================================================
--- trunk/blfs/networking/netlibs/glib-networking.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/networking/netlibs/glib-networking.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -68,7 +68,9 @@
     <para>Installez <application>glib-networking</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                                             --with-ca-certificates=/etc/ssl/ca-bundle.crt             --disable-static                              &&
+<userinput>./configure --prefix=/usr                                 \
+            --with-ca-certificates=/etc/ssl/ca-bundle.crt \
+            --disable-static                              &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make -k check</command>. Quelques tests échouent pour des raisons inconnues.

Modified: trunk/blfs/networking/netlibs/libpcap.xml
===================================================================
--- trunk/blfs/networking/netlibs/libpcap.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/networking/netlibs/libpcap.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -84,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/netprogs/samba.xml
===================================================================
--- trunk/blfs/networking/netprogs/samba.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/networking/netprogs/samba.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -87,8 +87,6 @@
       <ulink url="https://tevent.samba.org/">tevent</ulink>, et
       <ulink url="https://tdb.samba.org/">tdb</ulink>
     </para>
-
-
       <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url="&blfs-wiki;/samba4"/></para>
     </sect2>
@@ -108,12 +106,19 @@
 	suivantes :</para>
       
 <screen>
-<userinput>./configure                                 --prefix=/usr                           --sysconfdir=/etc                       --localstatedir=/var                    --with-piddir=/run/samba                --with-pammodulesdir=/lib/security      --without-systemd                       --enable-fhs                            --enable-nss-wrapper                &&
+<userinput>./configure                             \
+    --prefix=/usr                       \
+    --sysconfdir=/etc                   \
+    --localstatedir=/var                \
+    --with-piddir=/run/samba            \
+    --with-pammodulesdir=/lib/security  \
+    --without-systemd                   \
+    --enable-fhs                        &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem>:</para>
 <screen>
-<userinput>sed -i "/samba3.blackbox.failure.failure/i ^samba3.raw.eas" selftest/knownfail</userinput>
+<userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput>
 </screen>
     <para>Selon les développeurs de <application>Samba</application>, la limitation
     de 108 caractères de la longueur du chemin d'un socket tunnel unix nommé peut causer des erreurs, et donc plus
@@ -132,13 +137,17 @@
 ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so    &&
 install -v -m644    examples/smb.conf.default /etc/samba &&
 mkdir -pv /etc/openldap/schema                        &&
-install -v -m644    examples/LDAP/README                                  /etc/openldap/schema/README.LDAP  &&
+install -v -m644    examples/LDAP/README              \
+                    /etc/openldap/schema/README.LDAP  &&
                     
-install -v -m644    examples/LDAP/samba*                                  /etc/openldap/schema              &&
+install -v -m644    examples/LDAP/samba*              \
+                    /etc/openldap/schema              &&
                     
-install -v -m755    examples/LDAP/{get*,ol*}                     /etc/openldap/schema              &&
+install -v -m755    examples/LDAP/{get*,ol*} \
+                    /etc/openldap/schema              &&
 install -v -m755 -d /usr/share/doc/samba-&samba-version; &&
-install -v -m644    lib/ntdb/doc/design.pdf                     /usr/share/doc/samba-&samba-version;</userinput>
+install -v -m644    lib/ntdb/doc/design.pdf \
+                    /usr/share/doc/samba-&samba-version;</userinput>
 </screen>
     <para>Pour tester les résultats, en tant qu'utilisateur
     <systemitem class="username">root</systemitem>, tapez:
@@ -159,12 +168,9 @@
     <application>systemd</application>, qui ne fait pas parti de 
     LFS/BLFS. Si vous utilisez <application>systemd</application>, remplacez par
     <parameter>--with-systemd</parameter>.</para>
-
     <para><option>--with-selftest-prefix=SELFTEST_PREFIX</option>: Cette option spécifie le répertoire
      de travail de la suite de tests (par défaut=./st).
      </para>
-
-
         <para><command>mv -v /usr/lib/libnss_win{s,bind}.so* /lib</command>:
 	  Les bibliothèques nss sont installées dans /usr/lib par défaut. Déplacez les dans /lib.</para>
 	<para><command>ln -v -sf ../../lib/libnss_winbind.so.2 /usr/lib/libnss_winbind.so</command>
@@ -381,7 +387,8 @@
 		
 <screen role="root">
 <userinput>groupadd -g 99 nogroup &&
-useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup     -s /bin/false -u 99 nobody</userinput>
+useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
+    -s /bin/false -u 99 nobody</userinput>
 </screen>
 		<para>Installez le script <filename>samba</filename> avec
 		  la commande suivante effectuée en tant qu'utilisateur 
@@ -430,10 +437,6 @@
           et l'ensemble des caractères assorties, les modules de système de fichiers et de support
           sous /usr/lib/{python&python2-majorver;,samba}
         </seg>
-
-
-
-
         <seg>/etc/samba, /run/samba, /usr/include/samba-4.0,
         /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/{Samba{3,4},Wireshark},
         /usr/lib/python&python2-majorver;/site-packages/samba, /usr/lib/samba,

Modified: trunk/blfs/networking/netprogs/wpa_supplicant.xml
===================================================================
--- trunk/blfs/networking/netprogs/wpa_supplicant.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/networking/netprogs/wpa_supplicant.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -177,8 +177,10 @@
       qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>install -v -m644 dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service                  /usr/share/dbus-1/system-services/ &&
-install -v -m644 dbus/dbus-wpa_supplicant.conf                  /etc/dbus-1/system.d/wpa_supplicant.conf</userinput>
+<userinput>install -v -m644 dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
+                 /usr/share/dbus-1/system-services/ &&
+install -v -m644 dbus/dbus-wpa_supplicant.conf \
+                 /etc/dbus-1/system.d/wpa_supplicant.conf</userinput>
 </screen>
     <para>
       Si vous avez construit l'interface graphique de <application>WPA Supplicant</application>,

Modified: trunk/blfs/networking/netutils/wireshark.xml
===================================================================
--- trunk/blfs/networking/netutils/wireshark.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/networking/netutils/wireshark.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -27,7 +27,6 @@
     Ceci est utile pour analyser les données capturées <quote>hors connexion</quote>
     à partir d'une connexion réseau en direct ou de données lues à partir 
     d'un fichier de capture.</para>
-
    <para> <application>Wireshark</application> fournit 
     à la fois un mode graphique et un front-end TTY-mode pour examiner les 
     paquets réseau capturés de plus de 500 protocoles, ainsi que la capacité 
@@ -100,7 +99,6 @@
       <xref linkend="qt4"/> ou
       <xref linkend="qt5"/>
     </para>
-
     <note>
       <para>
         L'interface <application>GTK+</application> demande soit <xref linkend=
@@ -121,10 +119,6 @@
         l'interface GTK+3.
       </para>
     </note>
-
-
-
-
      <para condition="html" role="usernotes">Notes d'utilisateur :
     <ulink url="&blfs-wiki;/wireshark"/></para>
   </sect2>
@@ -151,12 +145,12 @@
     titre et le second écrase un script qui réinitialise la version à
     to <quote>unknown</quote> (inconnue).</para>
 <screen>
-<userinput>cat > svnversion.h << "EOF"
+<userinput>cat > svnversion.h << "EOF" &&
 #define SVNVERSION "BLFS"
 #define SVNPATH "source"
 EOF
 cat > make-version.pl << "EOF"
-#!/usr/bin/perl
+<literal>#!/usr/bin/perl</literal>
 EOF</userinput>
 </screen>
     <para><application>Wireshark</application> est une application très grosse et
@@ -185,7 +179,10 @@
     les commandes suivantes :</para>
 <screen>
 <userinput>patch -Np1 -i ../wireshark-&wireshark-version;-lua_5_3_0-1.patch  &&
-./configure --prefix=/usr                 --with-gtk3=yes               --with-qt=no                  --sysconfdir=/etc &&
+./configure --prefix=/usr     \
+            --with-gtk3       \
+            --without-qt      \
+            --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de test</para>
@@ -194,15 +191,20 @@
 <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>
+unset FILENAME
+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">
@@ -276,15 +278,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/lsb-release.xml
===================================================================
--- trunk/blfs/postlfs/config/lsb-release.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/config/lsb-release.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -79,9 +79,10 @@
         Ajoutez la version du paquet courant dans le fichier <filename>/etc/lsb-release</filename>.
         En tant qu'utilisateur <systemitem class="username">root</systemitem>:
       </para>
-<screen><userinput>echo 'LSB_VERSION="&lsb-release-version;"' >> /etc/lsb-release</userinput></screen>
+<screen>
+<userinput>echo 'LSB_VERSION="&lsb-release-version;"' >> /etc/lsb-release</userinput>
+</screen>
 </sect2>
-
  <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/postlfs/editors/joe.xml
===================================================================
--- trunk/blfs/postlfs/editors/joe.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/editors/joe.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -55,7 +55,9 @@
     <para>Installez <application>JOE</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --docdir=/usr/share/doc/joe-&joe-version; &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/joe-&joe-version; &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/postlfs/filesystems/lvm2.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/lvm2.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/filesystems/lvm2.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -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/ntfs-3g.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/ntfs-3g.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/filesystems/ntfs-3g.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -98,7 +98,7 @@
       
     </para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-static &&
+<userinput>./configure --prefix=/usr --disable-static --with-fuse=external &&
 make</userinput>
 </screen>
     <para>
@@ -110,7 +110,7 @@
 <screen role="root">
 <userinput>make install &&
 ln -sv ../bin/ntfs-3g /sbin/mount.ntfs &&
-ln -sv /usr/share/man/man8/{ntfs-3g,mount.ntfs}.8</userinput>
+ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</userinput>
 </screen>
     <para>
       Si vous voulez que les utilisateurs ordinaires puissent monter des partitions NTFS vous avez besoin

Modified: trunk/blfs/postlfs/security/gnutls.xml
===================================================================
--- trunk/blfs/postlfs/security/gnutls.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/security/gnutls.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -91,7 +91,8 @@
     <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/nss.xml
===================================================================
--- trunk/blfs/postlfs/security/nss.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/security/nss.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -3,11 +3,7 @@
    "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 "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">
-  <!ENTITY nss-download-ftp "ftp://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz"> -->
-<!-- no micro versions -->
   <!ENTITY nss-download-http "https://&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">
   <!ENTITY nss-md5sum        "17551e94e260967abe8918cf7ccdf863">
@@ -88,7 +84,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/openssl.xml
===================================================================
--- trunk/blfs/postlfs/security/openssl.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/security/openssl.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -75,7 +75,7 @@
     <para>Installez <application>OpenSSL</application> avec les
     commandes suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../openssl-&openssl-version;-fix_parallel_build-1.patch &&
+<userinput>patch -Np1 -i ../openssl-&openssl-version;-fix_parallel_build-2.patch &&
 ./config --prefix=/usr         \
          --openssldir=/etc/ssl \
          --libdir=lib          \

Modified: trunk/blfs/postlfs/security/stunnel.xml
===================================================================
--- trunk/blfs/postlfs/security/stunnel.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/security/stunnel.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -74,7 +74,8 @@
     tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>groupadd -g 51 stunnel &&
-useradd -c "stunnel Daemon" -d /var/lib/stunnel         -g stunnel -s /bin/false -u 51 stunnel</userinput>
+useradd -c "stunnel Daemon" -d /var/lib/stunnel \
+        -g stunnel -s /bin/false -u 51 stunnel</userinput>
 </screen>
     <note>
       <para>Un certificat SSL signé et une clé privée sont nécessaires pour lancer
@@ -110,7 +111,10 @@
     <command>./configure ... </command> avec <command>CC=clang
     ./configure ... </command> dans la première commande dessous.</para></note>
 <screen>
-<userinput>./configure --prefix=/usr                    --sysconfdir=/etc                --localstatedir=/var             --disable-systemd    &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-systemd    &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/postlfs/security/sudo.xml
===================================================================
--- trunk/blfs/postlfs/security/sudo.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/security/sudo.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -72,7 +72,13 @@
     <para>Installez <application>sudo</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                          --libexecdir=/usr/lib                  --with-secure-path                     --with-all-insults                     --with-env-editor                      --docdir=/usr/share/doc/sudo-&sudo-version;             --with-passprompt="[sudo] password for %p" &&
+<userinput>./configure --prefix=/usr              \
+            --libexecdir=/usr/lib      \
+            --with-secure-path         \
+            --with-all-insults         \
+            --with-env-editor          \
+            --docdir=/usr/share/doc/sudo-&sudo-version; \
+            --with-passprompt="[sudo] password for %p" &&
 make</userinput>
 </screen>
     <para> Pour tester les résultats, tapez: <command>env LC_ALL=C make check  2>&1

Modified: trunk/blfs/postlfs/virtualization/qemu.xml
===================================================================
--- trunk/blfs/postlfs/virtualization/qemu.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/postlfs/virtualization/qemu.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -121,8 +121,10 @@
     <para>Installez <application>qemu</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>sed -i '/resource/ i#include <sys/xattr.h>' fsdev/virtfs-proxy-helper.c &&
-./configure --prefix=/usr             --sysconfdir=/etc             --docdir=/usr/share/doc/qemu-&qemu-version;             --target-list=x86_64-softmmu &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/qemu-&qemu-version; \
+            --target-list=x86_64-softmmu &&
 make</userinput>
 </screen>
     <para>Pour lancer la construction en tests, lancez <command>make V=1 check</command>.</para>
@@ -195,7 +197,10 @@
     <filename>Fedora-16-x86_64-Live-LXDE.iso</filename> dans le répertoire courant.
     Exécutez les commandes suivantes :</para>
 <screen>
-<userinput>qemu -enable-kvm -hda vdisk.img                 -cdrom Fedora-16-x86_64-Live-LXDE.iso      -boot d                                    -m 384</userinput>
+<userinput>qemu -enable-kvm -hda vdisk.img            \
+     -cdrom Fedora-16-x86_64-Live-LXDE.iso \
+     -boot d                               \
+     -m 384</userinput>
 </screen>
     <para>Suivre la procédure d'installation normal pour la distribution choisie.
     L'option boot spécifie l'ordre de démarrage des disques comme une chaîne de lettres de

Modified: trunk/blfs/pst/printing/gs.xml
===================================================================
--- trunk/blfs/pst/printing/gs.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/pst/printing/gs.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -131,12 +131,13 @@
       <application>libjpeg</application> et de <application>libpng</application> :</para>
 <screen>
 <userinput>sed -i 's/ZLIBDIR=src/ZLIBDIR=$includedir/' configure.ac configure &&
-rm -rf expat freetype lcms2 jpeg libpng</userinput>
+rm -rf freetype lcms2 jpeg libpng</userinput>
 </screen>
     <para>Compilez <application>Ghostscript</application> :</para>
 <screen>
-<userinput>rm -rf zlib &&
-./configure --prefix=/usr --disable-compile-inits  --enable-dynamic --with-system-libtiff &&
+<userinput>rm -rf zlib expat &&
+./configure --prefix=/usr --disable-compile-inits \
+ --enable-dynamic --with-system-libtiff &&
 make</userinput>
 </screen>
     <note>
@@ -153,9 +154,6 @@
     <para>Ce paquet n'est pas fourni avec une suite de tests. Un ensemble e fichiers d'exemples peuvent être utilisées
      pour tester, mais c'est seulement possible après l'installation du paquet.
      </para> 
-
-
-
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install</userinput>
@@ -181,16 +179,14 @@
 <userinput>tar -xvf ../<replaceable><font-tarball></replaceable> -C /usr/share/ghostscript --no-same-owner &&
 fc-cache -v /usr/share/ghostscript/fonts/</userinput>
 </screen>
-
     <para>
       Vous pouvez maintenant tester le rendu de différents fichiers postscript et pdf depuis
       <filename class="directory">/usr/share/ghostscript/&gs-version;/examples
       </filename>, pour exemple (vous avez besoin d'un affichage de fenêtrage X):
     </para>
-<screen><userinput>gs -q -dBATCH /usr/share/ghostscript/&gs-version;/examples/tiger.eps</userinput></screen>
-
-
-
+<screen>
+<userinput>gs -q -dBATCH /usr/share/ghostscript/&gs-version;/examples/tiger.eps</userinput>
+</screen>
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>

Modified: trunk/blfs/pst/ps/epdfview.xml
===================================================================
--- trunk/blfs/pst/ps/epdfview.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/pst/ps/epdfview.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -65,7 +65,6 @@
       <xref linkend="desktop-file-utils"/> et
       <xref linkend="hicolor-icon-theme"/>
     </para>
-
     <bridgehead renderas="sect4">Facultatives</bridgehead>
     <para role="optional"><xref linkend="cups"/></para>
     <para condition="html" role="usernotes">Notes utilisateur :
@@ -90,14 +89,15 @@
       nécéssaire pour affichier proprement <filename>epdfview.desktop</filename> dans le menu.
       En tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-<screen role="root"><userinput>for size in 24 32 48; do
+<screen role="root">
+<userinput>for size in 24 32 48; do
   ln -svf ../../../../epdfview/pixmaps/icon_epdfview-$size.png \
           /usr/share/icons/hicolor/${size}x${size}/apps
 done &&
 unset size &&
 update-desktop-database &&
-gtk-update-icon-cache -t -f --include-image-data /usr/share/icons/hicolor</userinput></screen>
-
+gtk-update-icon-cache -t -f --include-image-data /usr/share/icons/hicolor</userinput>
+</screen>
   </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>

Modified: trunk/blfs/server/databases/db.xml
===================================================================
--- trunk/blfs/server/databases/db.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/server/databases/db.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -65,13 +65,21 @@
     commandes suivantes :</para>
 <screen>
 <userinput>cd build_unix                        &&
-../dist/configure --prefix=/usr                        --enable-compat185                   --enable-dbm                         --disable-static                     --enable-cxx       &&
+../dist/configure --prefix=/usr      \
+                  --enable-compat185 \
+                  --enable-dbm       \
+                  --disable-static   \
+                  --enable-cxx       &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make docdir=/usr/share/doc/db-&db-version; install &&
-chown -v -R root:root                              /usr/bin/db_*                                /usr/include/db{,_185,_cxx}.h                /usr/lib/libdb*.{so,la}                      /usr/share/doc/db-&db-version;</userinput>
+chown -v -R root:root                        \
+      /usr/bin/db_*                          \
+      /usr/include/db{,_185,_cxx}.h          \
+      /usr/lib/libdb*.{so,la}                \
+      /usr/share/doc/db-&db-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/server/databases/mariadb.xml
===================================================================
--- trunk/blfs/server/databases/mariadb.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/server/databases/mariadb.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -121,11 +121,27 @@
       Installez <application>MariaDB</application> en lançant la suite  
     </para>
 <screen>
-<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 &&
+<userinput>sed -i "s at data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
 mkdir build &&
 cd build    &&
-cmake -DCMAKE_BUILD_TYPE=Release                             -DCMAKE_INSTALL_PREFIX=/usr                            -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;             -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version;       -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/mariadb-&mariadb-version;       \
+      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
+      -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>

Modified: trunk/blfs/server/mail/dovecot.xml
===================================================================
--- trunk/blfs/server/mail/dovecot.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/server/mail/dovecot.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -90,9 +90,11 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 42 dovecot &&
-useradd -c "Dovecot unprivileged user" -d /dev/null -u 42         -g dovecot -s /bin/false dovecot &&
+useradd -c "Dovecot unprivileged user" -d /dev/null -u 42 \
+        -g dovecot -s /bin/false dovecot &&
 groupadd -g 43 dovenull &&
-useradd -c "Dovecot login user" -d /dev/null -u 43         -g dovenull -s /bin/false dovenull</userinput>
+useradd -c "Dovecot login user" -d /dev/null -u 43 \
+        -g dovenull -s /bin/false dovenull</userinput>
 </screen>
     <para>
       Installez <application>Dovecot</application> en lançant les commandes suivantes :
@@ -99,7 +101,11 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --localstatedir=/var             --docdir=/usr/share/doc/dovecot-&dovecot-version;             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make -k check</command>. Un test échoue pour une raison
@@ -181,7 +187,7 @@
         <application>Linux PAM</application>.
       </para>
 <screen role="root">
-<userinput>sed -i '/^!include / s/^/#/' /etc/dovecot/dovecot.conf &&
+<userinput>sed -i '/^\!include / s/^/#/' /etc/dovecot/dovecot.conf &&
 chmod -v 1777 /var/mail &&
 cat > /etc/dovecot/local.conf << "EOF"
 <literal>protocols = imap

Modified: trunk/blfs/server/mail/postfix.xml
===================================================================
--- trunk/blfs/server/mail/postfix.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/server/mail/postfix.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -115,9 +115,9 @@
         Si vous avec un noyau linux-4.x, appliquer le sed suivant pour permettre au script
         <command>makedefs</command> de le reconnaitre:
       </para>
-<screen><userinput>sed -i 's/Linux.3\*/Linux.[34]\*/' makedefs</userinput></screen>
-
-
+<screen>
+<userinput>sed -i 's/Linux.3\*/Linux.[34]\*/' makedefs</userinput>
+</screen>
       <para>
         L'arborescence des sources de <application>Postfix</application> ne contient pas
         de script <filename>configure</filename>, mais le makefile du répertoire

Modified: trunk/blfs/server/major/bind.xml
===================================================================
--- trunk/blfs/server/major/bind.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/server/major/bind.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -94,7 +94,14 @@
     <para>Installez <application>BIND</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                       --sysconfdir=/etc                   --localstatedir=/var                --mandir=/usr/share/man             --enable-threads                    --with-libtool                      --disable-static                    --with-randomdev=/dev/urandom &&
+<userinput>./configure --prefix=/usr           \
+            --sysconfdir=/etc       \
+            --localstatedir=/var    \
+            --mandir=/usr/share/man \
+            --enable-threads        \
+            --with-libtool          \
+            --disable-static        \
+            --with-randomdev=/dev/urandom &&
 make</userinput>
 </screen>
     <para>Exécutez les commandes suivantes pour lancer la suite de tests complète.
@@ -121,8 +128,11 @@
 <userinput>make install &&
 chmod -v 0755 /usr/lib/lib{bind9,dns,isc{,cc,cfg},lwres}.so &&
 install -v -m755 -d /usr/share/doc/bind-&bind-version;/{arm,misc} &&
-install -v -m644    doc/arm/*.html                     /usr/share/doc/bind-&bind-version;/arm &&
-install -v -m644     doc/misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb}     /usr/share/doc/bind-&bind-version;/misc</userinput>
+install -v -m644    doc/arm/*.html \
+                    /usr/share/doc/bind-&bind-version;/arm &&
+install -v -m644 \
+    doc/misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb} \
+    /usr/share/doc/bind-&bind-version;/misc</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/server/other/openldap.xml
===================================================================
--- trunk/blfs/server/other/openldap.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/server/other/openldap.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -71,9 +71,6 @@
       <ulink url="http://www.openslp.org/">OpenSLP</ulink>, et
       <xref linkend="db"/> (pas recommandée par les développeurs)
     </para>
-
-
-
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/openldap"/></para>
   </sect2>
@@ -86,11 +83,14 @@
 	  installation comme <quote>client-seul</quote>), taper ces commandes
 	  au lieu des autres suivantes (pas de suite de test disponible):</para>
 <screen>
-<userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &&
-patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &&
+<userinput>patch -Np1 -i ../openldap-&openldap-version;-consolidated-1.patch &&
 autoconf &&
-sed -i '/6.0.20/ a\t__db_version_compat' configure &&
-./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --enable-dynamic              --disable-debug               --disable-slapd &&
+./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-dynamic  \
+            --disable-debug   \
+            --disable-slapd &&
 make depend &&
 make</userinput>
 </screen>
@@ -101,8 +101,6 @@
 <userinput>make install</userinput>
 </screen>
             </note>
-
-
     <warning>
       <para>Pour une mise à jour depuis une installation précédente qui utilise Berkely DB comme
       moteur, vous devrez copier le(s) base(s) de données utilisant l'utilitaire
@@ -114,10 +112,6 @@
        <command>slapadd</command> après que l'installation soit terminée.
       </para>
     </warning>
-
-
-
-
     <para>
       Il doit y avoir un utilisateur et un groupe dédié pour prendre le contrôle
       du démon <command>slapd</command> après qu'il soit démarré.
@@ -126,17 +120,35 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 83 ldap &&
-useradd -c "OpenLDAP Daemon Owner" -d /var/lib/openldap -u 83         -g ldap -s /bin/false ldap</userinput>
+useradd -c "OpenLDAP Daemon Owner" -d /var/lib/openldap -u 83 \
+        -g ldap -s /bin/false ldap</userinput>
 </screen>
     <para>
      Installez <application>OpenLDAP</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &&
-patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &&
+<userinput>patch -Np1 -i ../openldap-&openldap-version;-consolidated-1.patch &&
 autoconf &&
-sed -i '/6.0.20/ a\t__db_version_compat' configure &&
-./configure --prefix=/usr                     --sysconfdir=/etc                 --localstatedir=/var              --libexecdir=/usr/lib             --disable-static                  --disable-debug                   --enable-dynamic                  --enable-crypt                    --enable-spasswd                  --enable-modules                  --enable-rlookups                 --enable-backends=mod             --enable-overlays=mod             --disable-ndb                     --disable-sql &&
+./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
+            --libexecdir=/usr/lib \
+            --disable-static      \
+            --disable-debug       \
+            --with-tls=openssl    \
+            --with-cyrus-sasl     \
+            --enable-dynamic      \
+            --enable-crypt        \
+            --enable-spasswd      \
+            --enable-slapd        \
+            --enable-modules      \
+            --enable-backends=mod \
+            --disable-ndb         \
+            --disable-sql         \
+            --disable-shell       \ 
+            --disable-bdb         \ 
+            --disable-hdb         \ 
+            --enable-overlays=mod &&
 make depend &&
 make</userinput>
 </screen>
@@ -144,15 +156,12 @@
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
-chmod -v 700 /var/lib/openldap                                         &&
-chown -v -R ldap:ldap /var/lib/openldap                                &&
-chmod -v 640 /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}       &&
-chown -v root:ldap /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} &&
-install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d                &&
-install -v -dm755  /usr/share/doc/openldap-&openldap-version; &&
-cp -vfr doc/drafts /usr/share/doc/openldap-&openldap-version; &&
-cp -vfr doc/rfc    /usr/share/doc/openldap-&openldap-version; &&
-cp -vfr doc/guide  /usr/share/doc/openldap-&openldap-version;</userinput>
+install -v -dm700 -o ldap -g ldap /var/lib/openldap     &&
+install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d &&
+chmod -v 640       /etc/openldap/slapd.{conf,ldif}      &&
+chown -v root:ldap /etc/openldap/slapd.{conf,ldif}      &&
+install -v -dm755              /usr/share/doc/openldap-&openldap-version; &&
+cp -vfr doc/{drafts,rfc,guide} /usr/share/doc/openldap-&openldap-version;</userinput>
 </screen>
     <para>
       Avoir les fichiers de configuration sldap et les bases de données ldap dans /var/lib/openldap
@@ -201,9 +210,6 @@
     <para><option>--enable-slp</option> : Ce paramètre active le support
     SLPv2. Utilisez ce paramètre si vous avez installé
     <ulink url="http://www.openslp.org/">OpenSLP</ulink>.</para>
-
-
-
 <note>
       <para>Vous pouvez lancer <command>./configure --help</command> pour
       voir s'il y a d'autres paramètres que vous pouvez passer à la commande 
@@ -210,8 +216,6 @@
       <command>configure</command> pour activer d'autres options ou d'autres
       paquets de dépendance.</para>
     </note>
-
-
     <para>
       <command>install ...</command>, <command>chown ...</command>,
       et <command>chmod ...</command>:
@@ -222,8 +226,6 @@
       ldap, pour que le groupe à qui appartient le démon slapd puisse lire mais pas modifier
       le fichier dans le cas d'une faille de sécurité.
     </para>
-
-
   </sect2>
   <sect2 role="configuration">
     <title>Configuration de OpenLDAP</title>
@@ -319,7 +321,7 @@
 <computeroutput># extended LDIF
 #
 # LDAPv3
-# base <> with scope base
+# base <> with scope baseObject
 # filter: (objectclass=*)
 # requesting: namingContexts
 #

Modified: trunk/blfs/server/other/unbound.xml
===================================================================
--- trunk/blfs/server/other/unbound.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/server/other/unbound.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -90,7 +90,8 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 88 unbound &&
-useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88         -g unbound -s /bin/false unbound</userinput>
+useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88 \
+        -g unbound -s /bin/false unbound</userinput>
 </screen>
     <para>
       Installez <application>Unbound</application> en lançant les commandes suivantes :
@@ -97,7 +98,10 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --with-pidfile=/run/unbound.pid &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --with-pidfile=/run/unbound.pid &&
 make</userinput>
 </screen>
     <para>
@@ -165,7 +169,8 @@
          <systemitem class="username">root</systemitem>:
       </para>
 <screen role="root">
-<userinput>sed -i '/request /isupersede domain-name-servers 127.0.0.1;'        /etc/dhcp/dhclient.conf</userinput>
+<userinput>sed -i '/request /i\supersede domain-name-servers 127.0.0.1;' \
+       /etc/dhcp/dhclient.conf</userinput>
 </screen>
       <para>
         Pour une configuration avancée, regardez le fichier <filename>/etc/unbound/unbound.conf</filename>

Modified: trunk/blfs/x/installing/libva.xml
===================================================================
--- trunk/blfs/x/installing/libva.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/installing/libva.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -123,9 +123,7 @@
        
     </para>
 <screen>
-<userinput>mkdir -p m4              &&
-autoreconf   -fi         &&
-./configure $XORG_CONFIG &&
+<userinput>./configure $XORG_CONFIG &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/installing/mesalib.xml
===================================================================
--- trunk/blfs/x/installing/mesalib.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/installing/mesalib.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -113,7 +113,18 @@
     suivantes :</para>
 <screen>
 <userinput>autoreconf -f -i &&
-./configure CFLAGS='-O2' CXXFLAGS='-O2'                --prefix=$XORG_PREFIX                      --sysconfdir=/etc                          --enable-texture-float                     --enable-gles1                             --enable-gles2                             --enable-osmesa                            --enable-xa                                --enable-gbm                               --enable-glx-tls                           --with-egl-platforms="drm,x11"             --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
+./configure CFLAGS='-O2' CXXFLAGS='-O2'    \
+            --prefix=$XORG_PREFIX          \
+            --sysconfdir=/etc              \
+            --enable-texture-float         \
+            --enable-gles1                 \
+            --enable-gles2                 \
+            --enable-osmesa                \
+            --enable-xa                    \
+            --enable-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/x7lib.xml
===================================================================
--- trunk/blfs/x/installing/x7lib.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/installing/x7lib.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -169,7 +169,8 @@
 <screen>
 <userinput>mkdir lib &&
 cd lib &&
-grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c     -B http://xorg.freedesktop.org/releases/individual/lib/ &&
+grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
+    -B http://xorg.freedesktop.org/releases/individual/lib/ &&
 md5sum -c ../lib-&xorg-version;.md5</userinput>
 </screen>
   </sect2>
@@ -207,7 +208,8 @@
       ./configure $XORG_CONFIG --disable-devel-docs
     ;;
     libXt-[0-9]* )
-      ./configure $XORG_CONFIG                   --with-appdefaultdir=/etc/X11/app-defaults
+      ./configure $XORG_CONFIG \
+                  --with-appdefaultdir=/etc/X11/app-defaults
     ;;
     * )
       ./configure $XORG_CONFIG

Modified: trunk/blfs/x/installing/xterm.xml
===================================================================
--- trunk/blfs/x/installing/xterm.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/installing/xterm.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -64,8 +64,10 @@
     les commandes suivantes :</para>
 <screen>
 <userinput>sed -i '/v0/{n;s/new:/new:kb=^?:/}' termcap &&
-printf 'tkbs=\177,n' >> terminfo &&
-TERMINFO=/usr/share/terminfo ./configure $XORG_CONFIG         --with-app-defaults=/etc/X11/app-defaults &&
+printf '\tkbs=\\177,\n' >> terminfo &&
+TERMINFO=/usr/share/terminfo \
+./configure $XORG_CONFIG     \
+    --with-app-defaults=/etc/X11/app-defaults &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/x/lib/at-spi2-core.xml
===================================================================
--- trunk/blfs/x/lib/at-spi2-core.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/lib/at-spi2-core.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -92,7 +92,8 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/lib/gtk+3.xml
===================================================================
--- trunk/blfs/x/lib/gtk+3.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/lib/gtk+3.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -108,7 +108,11 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                         --sysconfdir=/etc                     --enable-broadway-backend             --enable-x11-backend                  --disable-wayland-backend &&
+<userinput>./configure --prefix=/usr             \
+            --sysconfdir=/etc         \
+            --enable-broadway-backend \
+            --enable-x11-backend      \
+            --disable-wayland-backend &&
 make</userinput>
 </screen>
      <para>

Modified: trunk/blfs/x/lib/qt5.xml
===================================================================
--- trunk/blfs/x/lib/qt5.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/lib/qt5.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -3,7 +3,7 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!-- Change for new minor releases !!! -->
+  
   <!ENTITY qt5-major "5.4">
   <!ENTITY qt5-url   "http://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
@@ -144,7 +144,24 @@
     </para>
 <screen>
 <userinput>export QT5LINK=/usr
-./configure -prefix         /usr                           -sysconfdir     /etc/xdg                       -bindir         /usr/bin                       -headerdir      /usr/include/qt5               -archdatadir    /usr/lib/qt5                   -datadir        /usr/share/qt5                 -docdir         /usr/share/doc/qt5             -translationdir /usr/share/qt5/translations             -examplesdir    /usr/share/doc/qt5/examples             -confirm-license               -opensource                    -dbus-linked                   -openssl-linked                -system-sqlite                 -no-nis                        -skip qtwebengine              -nomake examples               -optimized-qmake   &&
+./configure -prefix         /usr               \
+            -sysconfdir     /etc/xdg           \
+            -bindir         /usr/bin           \
+            -headerdir      /usr/include/qt5   \
+            -archdatadir    /usr/lib/qt5       \
+            -datadir        /usr/share/qt5     \
+            -docdir         /usr/share/doc/qt5 \
+            -translationdir /usr/share/qt5/translations \
+            -examplesdir    /usr/share/doc/qt5/examples \
+            -confirm-license   \
+            -opensource        \
+            -dbus-linked       \
+            -openssl-linked    \
+            -system-sqlite     \
+            -no-nis            \
+            -skip qtwebengine  \
+            -nomake examples   \
+            -optimized-qmake   &&
 make</userinput>
 </screen>
     <para>
@@ -155,7 +172,7 @@
       en lançant la commande suivante:
     </para>
 <screen>
-<userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?S+,,g" {} ;</userinput>
+<userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput>
 </screen>
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
@@ -169,8 +186,10 @@
       <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>sed -e "s:$PWD/qtbase:/usr/lib/qt5:g"     -i /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &&
-find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r      '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/1/' {} ;</userinput>
+<userinput>sed -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
+    -i /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &&
+find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r \
+     '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput>
 </screen>
  <bridgehead renderas="sect3">Methode 2: Installation dans /opt/qt-&qt5-version;</bridgehead>
     <para>
@@ -180,7 +199,17 @@
 <screen>
 <userinput>export QT5DIR=/opt/qt-&qt5-version; &&
 export QT5LINK=/opt/qt5 &&
-./configure -prefix     $QT5DIR              -sysconfdir /etc/xdg             -confirm-license                 -opensource                      -dbus-linked                     -openssl-linked                  -system-sqlite                   -no-nis                          -nomake examples                 -skip qtwebengine                -optimized-qmake     &&
+./configure -prefix     $QT5DIR  \
+            -sysconfdir /etc/xdg \
+            -confirm-license     \
+            -opensource          \
+            -dbus-linked         \
+            -openssl-linked      \
+            -system-sqlite       \
+            -no-nis              \
+            -nomake examples     \
+            -skip qtwebengine    \
+            -optimized-qmake     &&
 make</userinput>
 </screen>
     <para>
@@ -196,8 +225,10 @@
       <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>find $QT5DIR -name qt_lib_bootstrap_private.pri    -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} ; &&
-find $QT5DIR -name *.prl    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} ;</userinput>
+<userinput>find $QT5DIR -name qt_lib_bootstrap_private.pri \
+   -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} \; &&
+find $QT5DIR -name \*.prl \
+   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput>
 </screen>
     <bridgehead renderas="sect3">Suite pour les deux méthodes</bridgehead>
     <para>
@@ -208,10 +239,14 @@
     </para>
 <screen role="root">
 <userinput>install -v -dm755 /usr/share/pixmaps/                  &&
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png                   /usr/share/pixmaps/assistant-qt5.png &&
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png                   /usr/share/pixmaps/designer-qt5.png  &&
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png                   /usr/share/pixmaps/linguist-qt5.png  &&
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png                   /usr/share/pixmaps/qdbusviewer-qt5.png &&
+install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
+                  /usr/share/pixmaps/assistant-qt5.png &&
+install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
+                  /usr/share/pixmaps/designer-qt5.png  &&
+install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
+                  /usr/share/pixmaps/linguist-qt5.png  &&
+install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+                  /usr/share/pixmaps/qdbusviewer-qt5.png &&
 install -dm755 /usr/share/applications &&
 cat > /usr/share/applications/assistant-qt5.desktop << EOF
 <literal>[Desktop Entry]
@@ -455,7 +490,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="linguist-qt5">
         <term><command>linguist</command></term>
         <listitem>

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

Modified: trunk/blfs/x/lib/webkitgtk2.xml
===================================================================
--- trunk/blfs/x/lib/webkitgtk2.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/x/lib/webkitgtk2.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -109,13 +109,16 @@
       Si vous n'avez pas installé <xref linkend="gtk-doc"/>, corrigez un bogue
       qui fera échouer <command>make install</command>:
     </para>
-<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
-
+<screen>
+<userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput>
+</screen>
     <para>Corrigez le code pour constuire avec glib-2.44 et supérieur:</para>
-<screen><userinput>pushd Source/WebCore/platform/graphics/gstreamer &&
+<screen>
+<userinput>pushd Source/WebCore/platform/graphics/gstreamer &&
   sed -i 's/GMutexLocker /WebCore::&/' \
           VideoSinkGStreamer.cpp WebKitWebSourceGStreamer.cpp &&
-popd</userinput></screen>
+popd</userinput>
+</screen>
      <para>
       Maintenant le standard des developpeurs est de lier ce paquet contre <application>GTK+
       3</application>. Cependant,

Modified: trunk/blfs/xincludes/setqt.xml
===================================================================
--- trunk/blfs/xincludes/setqt.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/xincludes/setqt.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -11,7 +11,7 @@
     <systemitem class="username">root</systemitem>, creez les scripts suivants:</para>
 <screen role="root">
 <userinput>cat > /usr/bin/setqt4 << 'EOF'
-<literal>if [ "x$QT5DIR" != "x/usr" ]; then pathremove  $QT5DIR/bin; fi
+<literal>if [ "x$QT5DIR" != "x/usr" ] && [ "x$QT5DIR" != "x" ]; then pathremove  $QT5DIR/bin; fi
 if [ "x$QT4DIR" != "x/usr" ]; then pathprepend $QT4DIR/bin; fi
 echo $PATH</literal>
 EOF</userinput>
@@ -18,7 +18,7 @@
 </screen>
 <screen role="root">
 <userinput>cat > /usr/bin/setqt5 << 'EOF'
-<literal>if [ "x$QT4DIR" != "x/usr" ]; then pathremove  $QT4DIR/bin; fi
+<literal>if [ "x$QT4DIR" != "x/usr" ] && [ "x$QT4DIR" != "x" ]; then pathremove  $QT4DIR/bin; fi
 if [ "x$QT5DIR" != "x/usr" ]; then pathprepend $QT5DIR/bin; fi
 echo $PATH</literal>
 EOF</userinput>

Modified: trunk/blfs/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/blfs/xsoft/graphweb/firefox.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/xsoft/graphweb/firefox.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -268,7 +268,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	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/xsoft/graphweb/seamonkey.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -306,7 +306,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	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/xsoft/office/libreoffice.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -16,22 +16,13 @@
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
   <!ENTITY libreoffice-translations-md5sum        "85c9224cc524b8882e98568e4e7acf3a">
   <!ENTITY libreoffice-translations-size          "122 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          "6.5 Go (572 Mo installé)">
   <!ENTITY libreoffice-time               "38 SBU (using parallelism=12) estimated 170 SBU with one core">
-  <!-- [bdubbs]  For version 4.3.2.2 Built on x86_64 using -\-with-parallelism=4 -->
-  <!-- [bdubbs]  For version 4.4.2.1 Built on x86_64 using -\-with-parallelism=12 -->
-  <!-- [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-dlversion;">
   <?dbhtml filename="libreoffice.html"?>
@@ -306,11 +297,50 @@
       suivantes:
     </para>
 <screen>
-<userinput>sed -e "/gzip -f/d"       -e "s|.1.gz|.1|g"     -i bin/distro-install-desktop-integration &&
+<userinput>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 &&
-sed -e "/ustrbuf/a #include <algorithm>"     -i svl/source/misc/gridprinter.cxx   &&
+sed -e "/ustrbuf/a #include <algorithm>" \
+    -i svl/source/misc/gridprinter.cxx   &&
 chmod -v +x bin/unpack-sources &&
-./autogen.sh --prefix=$LO_PREFIX                      --sysconfdir=/etc                        --with-vendor="BLFS"                     --with-lang="en-US pt-BR"                --with-help                              --with-myspell-dicts                     --with-alloc=system                      --without-java                           --without-system-dicts                   --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>
+./autogen.sh --prefix=$LO_PREFIX         \
+             --sysconfdir=/etc           \
+             --with-vendor="BLFS"        \
+             --with-lang="en-US pt-BR"   \
+             --with-help                 \
+             --with-myspell-dicts        \
+             --with-alloc=system         \
+             --without-java              \
+             --without-system-dicts      \
+             --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
@@ -329,7 +359,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 vous avez installé dans <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
@@ -340,21 +371,21 @@
 <screen role="root">
 <userinput>if [ "$LO_PREFIX" != "/usr" ]; then
   # This symlink is necessary for the desktop menu entries
-  ln -sv -f $LO_PREFIX/lib/libreoffice/program/soffice             /usr/bin/libreoffice &&
+  ln -svf $LO_PREFIX/lib/libreoffice/program/soffice /usr/bin/libreoffice &&
   # Icons
   for i in $LO_PREFIX/share/icons/hicolor/32x32/apps/*; do
     ln -svf $i /usr/share/pixmaps
-  done; unset i &&
+  done &&
   # Desktop menu entries
-  pushd $LO_PREFIX/lib/libreoffice/share/xdg &&
-  for i in *; do
-    ln -svf $LO_PREFIX/lib/libreoffice/share/xdg/$i             /usr/share/applications/libreoffice-$i
-  done; unset i &&
-  popd &&
+  for i in $LO_PREFIX/lib/libreoffice/share/xdg/*; do
+    ln -svf $i /usr/share/applications/libreoffice-$(basename $i)
+  done &&
   # Man pages
   for i in $LO_PREFIX/share/man/man1/*; do
-     ln -svf $i /usr/share/man/man1/
-  done; unset i
+    ln -svf $i /usr/share/man/man1/
+  done 
+  
+  unset i
 fi</userinput>
 </screen>
     <para>

Modified: trunk/blfs/xsoft/other/fontforge.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/xsoft/other/gparted.xml
===================================================================
--- trunk/blfs/xsoft/other/gparted.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/xsoft/other/gparted.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -85,7 +85,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-doc                --disable-static &&
+<userinput>./configure --prefix=/usr    \
+            --disable-doc    \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>
@@ -166,8 +168,10 @@
           configurez <xref linkend="gparted"/> et <xref linkend="polkit"/> avec les commandes suivantes:
         </para>
 <screen role="root">
-<userinput>cp -v /usr/share/applications/gparted.desktop                                      /usr/share/applications/gparted.desktop.back &&
-sed -i 's:/usr/sbin/gparted:/usr/sbin/gparted_polkit:'                                      /usr/share/applications/gparted.desktop      &&
+<userinput>cp -v /usr/share/applications/gparted.desktop \
+                                     /usr/share/applications/gparted.desktop.back &&
+sed -i 's:/usr/sbin/gparted:/usr/sbin/gparted_polkit:' \
+                                     /usr/share/applications/gparted.desktop      &&
 cat > /usr/sbin/gparted_polkit << "EOF" &&
 <literal>#!/bin/bash
 pkexec /usr/sbin/gparted $@</literal>

Modified: trunk/blfs/xsoft/other/thunderbird.xml
===================================================================
--- trunk/blfs/xsoft/other/thunderbird.xml	2015-04-10 05:31:12 UTC (rev 6829)
+++ trunk/blfs/xsoft/other/thunderbird.xml	2015-04-10 11:13:20 UTC (rev 6830)
@@ -279,7 +279,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>

Modified: trunk/blfs/xsoft/other/tigervnc.xml
===================================================================
(Binary files differ)



Plus d'informations sur la liste de diffusion lfs-traducfr