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

myou72 at orange.fr myou72 at orange.fr
Dim 17 Nov 09:33:52 PST 2013


Author: myou72
Date: 2013-11-17 18:33:52 +0100 (Sun, 17 Nov 2013)
New Revision: 5119

Modified:
   trunk/blfs/general/genlib/icu.xml
   trunk/blfs/general/genlib/nspr.xml
   trunk/blfs/general/genutils/imagemagick.xml
   trunk/blfs/general/graphlib/poppler.xml
   trunk/blfs/general/prog/cmake.xml
   trunk/blfs/general/prog/gcc.xml
   trunk/blfs/general/prog/git.xml
   trunk/blfs/general/prog/openjdk.xml
   trunk/blfs/general/prog/other-tools.xml
   trunk/blfs/general/prog/php.xml
   trunk/blfs/general/prog/subversion.xml
   trunk/blfs/general/sysutils/colord.xml
   trunk/blfs/general/sysutils/dbus.xml
   trunk/blfs/general/sysutils/pciutils.xml
   trunk/blfs/general/sysutils/sysstat.xml
   trunk/blfs/general/sysutils/upower.xml
   trunk/blfs/gnome/applications/evince.xml
   trunk/blfs/gnome/applications/file-roller.xml
   trunk/blfs/gnome/applications/gnome-terminal.xml
   trunk/blfs/gnome/applications/nautilus.xml
   trunk/blfs/gnome/applications/network-manager-applet.xml
   trunk/blfs/gnome/platform/gjs.xml
   trunk/blfs/gnome/platform/gnome-keyring.xml
   trunk/blfs/gnome/platform/gvfs.xml
   trunk/blfs/introduction/welcome/changelog.xml
   trunk/blfs/kde/add/ark.xml
   trunk/blfs/kde/add/gwenview.xml
   trunk/blfs/kde/add/kate.xml
   trunk/blfs/kde/add/kdepim-runtime.xml
   trunk/blfs/kde/add/kdepim.xml
   trunk/blfs/kde/add/kdeplasma-addons.xml
   trunk/blfs/kde/add/kmix.xml
   trunk/blfs/kde/add/konsole.xml
   trunk/blfs/kde/add/libkcddb.xml
   trunk/blfs/kde/add/libkexiv2.xml
   trunk/blfs/kde/add/okular.xml
   trunk/blfs/kde/core/akonadi.xml
   trunk/blfs/kde/core/kactivities.xml
   trunk/blfs/kde/core/kde-baseapps.xml
   trunk/blfs/kde/core/kde-runtime.xml
   trunk/blfs/kde/core/kde-workspace.xml
   trunk/blfs/kde/core/kdelibs.xml
   trunk/blfs/kde/core/kdepimlibs.xml
   trunk/blfs/kde/core/nepomuk-core.xml
   trunk/blfs/kde/core/nepomuk-widgets.xml
   trunk/blfs/kde/core/phonon-backend-gstreamer.xml
   trunk/blfs/kde/core/phonon-backend-vlc.xml
   trunk/blfs/kde/core/phonon.xml
   trunk/blfs/lxde/apps/apps.xml
   trunk/blfs/lxde/apps/gpicview.xml
   trunk/blfs/lxde/apps/lxappearance-obconf.xml
   trunk/blfs/lxde/apps/lxinput.xml
   trunk/blfs/lxde/apps/lxrandr.xml
   trunk/blfs/lxde/apps/lxshortcut.xml
   trunk/blfs/lxde/apps/lxtask.xml
   trunk/blfs/lxde/apps/lxterminal.xml
   trunk/blfs/lxde/desktop/lxappearance.xml
   trunk/blfs/lxde/desktop/lxde-common.xml
   trunk/blfs/multimedia/audioutils/audacious.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml
   trunk/blfs/multimedia/libdriv/gstreamer10.xml
   trunk/blfs/multimedia/libdriv/libvpx.xml
   trunk/blfs/multimedia/libdriv/x264.xml
   trunk/blfs/multimedia/videoutils/ffmpeg.xml
   trunk/blfs/networking/mailnews/mutt.xml
   trunk/blfs/networking/netlibs/glib-networking.xml
   trunk/blfs/networking/netlibs/libnl.xml
   trunk/blfs/networking/netprogs/nfs-utils.xml
   trunk/blfs/networking/netprogs/samba.xml
   trunk/blfs/networking/netutils/avahi.xml
   trunk/blfs/networking/netutils/wireshark.xml
   trunk/blfs/postlfs/filesystems/initramfs.xml
   trunk/blfs/postlfs/filesystems/lvm2.xml
   trunk/blfs/postlfs/security/gnutls.xml
   trunk/blfs/postlfs/security/libcap.xml
   trunk/blfs/postlfs/security/nss.xml
   trunk/blfs/postlfs/security/openssh.xml
   trunk/blfs/pst/printing/cups-filters.xml
   trunk/blfs/pst/printing/cups.xml
   trunk/blfs/server/databases/mariadb.xml
   trunk/blfs/server/mail/dovecot.xml
   trunk/blfs/server/mail/exim.xml
   trunk/blfs/server/major/bind.xml
   trunk/blfs/server/other/openldap.xml
   trunk/blfs/x/installing/libxcb.xml
   trunk/blfs/x/installing/mesalib.xml
   trunk/blfs/x/installing/x7driver-glamor.xml
   trunk/blfs/x/installing/x7driver-intel.xml
   trunk/blfs/x/installing/x7driver-nouveau.xml
   trunk/blfs/x/installing/x7lib.xml
   trunk/blfs/x/installing/x7proto.xml
   trunk/blfs/x/installing/xorg-server.xml
   trunk/blfs/x/lib/at-spi2-core.xml
   trunk/blfs/x/lib/gtk+3.xml
   trunk/blfs/x/lib/pango.xml
   trunk/blfs/x/lib/qt4.xml
   trunk/blfs/x/lib/qt5.xml
   trunk/blfs/x/lib/webkitgtk2.xml
   trunk/blfs/x/lib/xulrunner.xml
   trunk/blfs/x/wm/icewm.xml
   trunk/blfs/xsoft/graphweb/firefox.xml
   trunk/blfs/xsoft/graphweb/seamonkey.xml
   trunk/blfs/xsoft/office/abiword.xml
   trunk/blfs/xsoft/office/libreoffice.xml
   trunk/blfs/xsoft/other/gimp.xml
   trunk/blfs/xsoft/other/thunderbird.xml
Log:
synchro screen

Modified: trunk/blfs/general/genlib/icu.xml
===================================================================
--- trunk/blfs/general/genlib/icu.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/genlib/icu.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -64,7 +64,7 @@
     suivantes :</para>
 <screen>
 <userinput>cd source &&
-./configure --prefix=/usr &&
+CXX=g++ ./configure --prefix=/usr &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/general/genlib/nspr.xml
===================================================================
--- trunk/blfs/general/genlib/nspr.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/genlib/nspr.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -58,9 +58,12 @@
     suivantes :</para>
 <screen>
 <userinput>cd nspr                                                     &&
-sed -ri 's#^(RELEASE_BINS =).*#1#' pr/src/misc/Makefile.in &&
+sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in &&
 sed -i 's#$(LIBRARY) ##' config/rules.mk                    &&
-./configure --prefix=/usr             --with-mozilla             --with-pthreads             $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
+./configure --prefix=/usr \
+            --with-mozilla \
+            --with-pthreads \
+            $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/general/genutils/imagemagick.xml
===================================================================
--- trunk/blfs/general/genutils/imagemagick.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/genutils/imagemagick.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -4,13 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
   <!ENTITY imagemagick-patch-version "5">
-  <!-- Not sure what to do here as ImageMagick is one of the fastest-moving
-       targets in all of open-source. One solution is to always use the last
-       version of a specific major-minor from the 'legacy' subdirectory of
-       the path in these URL's. Otherwise these links are broken within days
-       after updates :-(  Unfortunately, versions always roll on after patch
-       version 10, whether or not significant changes occur, and it takes
-       time before versions migrate to legacy/  -->
+  
   <!ENTITY imagemagick-download-http " ">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
   <!ENTITY imagemagick-md5sum        "4914b153efee0d54da84a73d3abc3154">
@@ -172,7 +166,11 @@
       dans la ligne de configure.
     </para></note>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --with-modules                --with-perl                   --disable-static  &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --with-modules    \
+            --with-perl       \
+            --disable-static  &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/graphlib/poppler.xml
===================================================================
--- trunk/blfs/general/graphlib/poppler.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/graphlib/poppler.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -106,7 +106,10 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --enable-xpdf-headers &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-xpdf-headers &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/general/prog/cmake.xml
===================================================================
--- trunk/blfs/general/prog/cmake.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/prog/cmake.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -71,7 +71,10 @@
     <para>Installez <application>CMake</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./bootstrap --prefix=/usr                   --system-libs                   --mandir=/share/man             --docdir=/share/doc/cmake-&cmake-version; &&
+<userinput>./bootstrap --prefix=/usr       \
+            --system-libs       \
+            --mandir=/share/man \
+            --docdir=/share/doc/cmake-&cmake-version; &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/prog/gcc.xml
===================================================================
--- trunk/blfs/general/prog/gcc.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/prog/gcc.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -10,9 +10,7 @@
   <!ENTITY gcc-buildsize      "~2.9 Go (build, test and install all compilers except GNAT)">
   <!ENTITY gcc-time           "80 SBU (build, test and install all compilers except GNAT)">
   <!ENTITY gnat-download-http "https://libre.adacore.com/download/">
-  <!-- We don't know what platform, so this is commented out
-  <!ENTITY gnat-md5sum        "6425f2c7cabbdee4595b4b7c0d47237f">
-  <!ENTITY gnat-size          "110 Mo"> -->
+  
 ]>
 <sect1 id="gcc" xreflabel="GCC-&gcc-version;">
   <?dbhtml filename="gcc.html" ?>
@@ -153,8 +151,8 @@
 export PATH=/opt/gnat/bin:$PATH_HOLD</userinput>
 </screen>
 <screen>
-<userinput>find /opt/gnat -name ld -exec mv -v {} {}.old ;
-find /opt/gnat -name as -exec mv -v {} {}.old ;</userinput>
+<userinput>find /opt/gnat -name ld -exec mv -v {} {}.old \;
+find /opt/gnat -name as -exec mv -v {} {}.old \;</userinput>
 </screen>
     
 <para>Cela présente l'inconvénient que les exécutables de <application>GCC</application>
@@ -166,16 +164,29 @@
     <command>ld</command> et <command>as</command> dépassés
     sont utilisés tout du long. Pour utiliser les outils LFS, tapez:</para>
 <screen>
-<userinput>sed -i 's/(install.*:) install-.*recursive/1/' libffi/Makefile.in         &&
-sed -i 's/(install-data-am:).*/1/'             libffi/include/Makefile.in &&
+<userinput>sed -i 's/\(install.*:\) install-.*recursive/\1/' libffi/Makefile.in         &&
+sed -i 's/\(install-data-am:\).*/\1/'             libffi/include/Makefile.in &&
 sed -i 's/install_to_$(INSTALL_DEST) //'          libiberty/Makefile.in      &&
-sed -i 's at ./fixinc.sh at -c true@'                 gcc/Makefile.in            &&
+sed -i 's@\./fixinc\.sh at -c true@'                 gcc/Makefile.in            &&
 case `uname -m` in
       i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;;
 esac &&
 mkdir ../gcc-build &&
 cd    ../gcc-build &&
-../gcc-&gcc-version;/configure              --prefix=/usr                   --libdir=/usr/lib               --libexecdir=/usr/lib           --enable-shared                 --enable-threads=posix          --enable-__cxa_atexit           --disable-multilib              --disable-bootstrap             --disable-install-libiberty     --with-system-zlib              --enable-clocale=gnu            --enable-lto                    --enable-languages=c,c++,fortran,ada,go,java,objc,obj-c++ &&
+../gcc-&gcc-version;/configure          \
+    --prefix=/usr               \
+    --libdir=/usr/lib           \
+    --libexecdir=/usr/lib       \
+    --enable-shared             \
+    --enable-threads=posix      \
+    --enable-__cxa_atexit       \
+    --disable-multilib          \
+    --disable-bootstrap         \
+    --disable-install-libiberty \
+    --with-system-zlib          \
+    --enable-clocale=gnu        \
+    --enable-lto                \
+    --enable-languages=c,c++,fortran,ada,go,java,objc,obj-c++ &&
 make
 </userinput>
 </screen>
@@ -222,7 +233,9 @@
 <userinput>make install &&
 ln -v -sf ../usr/bin/cpp /lib &&
 ln -v -sf gcc /usr/bin/cc     &&
-chown -v -R root:root     /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}     /usr/lib/gcc/*linux-gnu/&gcc-version;/ada{lib,include}</userinput>
+chown -v -R root:root \
+    /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed} \
+    /usr/lib/gcc/*linux-gnu/&gcc-version;/ada{lib,include}</userinput>
 </screen>
     
 <para>Vous devriez maintenant 

Modified: trunk/blfs/general/prog/git.xml
===================================================================
--- trunk/blfs/general/prog/git.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/prog/git.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -100,7 +100,9 @@
     <para>Installez <application>Git</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --libexecdir=/usr/lib             --with-gitconfig=/etc/gitconfig &&
+<userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib \
+            --with-gitconfig=/etc/gitconfig &&
 make</userinput>
 </screen>
     <para>Si vous avez installé <ulink
@@ -149,9 +151,10 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
-tar -xf  ../git-htmldocs-&git-version;.tar.gz     -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 {} ;     &&
+tar -xf  ../git-htmldocs-&git-version;.tar.gz \
+    -C   /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &&
+find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;     &&
+find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;     &&
 mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &&
 mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &&
 mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &&

Modified: trunk/blfs/general/prog/openjdk.xml
===================================================================
--- trunk/blfs/general/prog/openjdk.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/prog/openjdk.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -287,7 +287,12 @@
 <screen>
 <userinput>unset JAVA_HOME                                               &&
 ./autogen.sh                                                  &&
-./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin                     --with-version-suffix=blfs                                    --enable-nss                                                  --enable-pulse-java                                           --disable-system-kerberos                                     --with-parallel-jobs=$(getconf _NPROCESSORS_ONLN) &&
+./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin         \
+            --with-version-suffix=blfs                        \
+            --enable-nss                                      \
+            --enable-pulse-java                               \
+            --disable-system-kerberos                         \
+            --with-parallel-jobs=$(getconf _NPROCESSORS_ONLN) &&
 make</userinput>
 </screen>
     <note><para>Si vous n'avez pas installé l'archive spécifiée précédemment,
@@ -530,31 +535,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
@@ -596,7 +601,8 @@
     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
@@ -617,7 +623,8 @@
     Pour créer le nouveau, en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen>
-<userinput>/opt/jdk/bin/mkcacerts -d "/etc/ssl/certs/"  -k "/opt/jdk/bin/keytool"                        -s "/usr/bin/openssl" -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
+<userinput>/opt/jdk/bin/mkcacerts -d "/etc/ssl/certs/"  -k "/opt/jdk/bin/keytool" \
+                       -s "/usr/bin/openssl" -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
 </screen>
     </sect3> 
   </sect2>

Modified: trunk/blfs/general/prog/other-tools.xml
===================================================================
--- trunk/blfs/general/prog/other-tools.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/prog/other-tools.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -1938,7 +1938,6 @@
         </listitem>
       </itemizedlist>
     </sect3>
-
     <sect3 role="package">
       <title>strace</title>
       <para><application>strace</application> est un traqueur d'appels systèmes,

Modified: trunk/blfs/general/prog/php.xml
===================================================================
--- trunk/blfs/general/prog/php.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/prog/php.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -153,7 +153,8 @@
     <para>Installez <application>PHP</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                \
+<userinput>sed -i -e 's/2.6.5 2.7/& 3.0/' configure &&
+./configure --prefix=/usr                \
             --sysconfdir=/etc            \
             --mandir=/usr/share/man      \
             --with-apxs2                 \

Modified: trunk/blfs/general/prog/subversion.xml
===================================================================
--- trunk/blfs/general/prog/subversion.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/prog/subversion.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -97,7 +97,9 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-static             --with-apache-libexecdir=$(/usr/bin/apxs -q libexecdir) &&
+<userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --with-apache-libexecdir=$(/usr/bin/apxs -q libexecdir) &&
 make</userinput>
 </screen>
     <para>Si vous avez installé <xref linkend="doxygen"/> et si vous souhaitez construire la
@@ -127,7 +129,8 @@
       commandes suivantes :</para>
 <screen>
 <userinput>make swig-pl &&
-make swig-py &&
+make swig-py swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn      &&
 make swig-rb</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make -k check</command>. Un test
@@ -148,7 +151,8 @@
 <screen role="root">
 <userinput>make 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 avez construit les bindings Java, lancez la commande suivante
     en tant qu'utilisateur <systemitem class="username">root</systemitem> pour les
@@ -161,7 +165,8 @@
     <systemitem class="username">root</systemitem> pour les installer :</para>
 <screen role="root">
 <userinput>make install-swig-pl &&
-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 &&
+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 &&
 make install-swig-rb</userinput>
 </screen>
   </sect2>

Modified: trunk/blfs/general/sysutils/colord.xml
===================================================================
--- trunk/blfs/general/sysutils/colord.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/sysutils/colord.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -93,12 +93,21 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 71 colord &&
-useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71         -g colord -s /bin/false colord</userinput>
+useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
+        -g colord -s /bin/false colord</userinput>
 </screen>
     <para>Installez <application>colord</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                            --sysconfdir=/etc                        --localstatedir=/var                     --libexecdir=/usr/lib/colord             --with-daemon-user=colord                --enable-vala                            --disable-bash-completion                --disable-systemd-login                  --disable-static &&
+<userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --libexecdir=/usr/lib/colord \
+            --with-daemon-user=colord    \
+            --enable-vala                \
+            --disable-bash-completion    \
+            --disable-systemd-login      \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/general/sysutils/dbus.xml
===================================================================
--- trunk/blfs/general/sysutils/dbus.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/sysutils/dbus.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -85,7 +85,8 @@
     messages système :</para>
 <screen role="root">
 <userinput>groupadd -g 18 messagebus &&
-useradd -c "D-Bus Message Daemon User" -d /var/run/dbus         -u 18 -g messagebus -s /bin/false messagebus</userinput>
+useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
+        -u 18 -g messagebus -s /bin/false messagebus</userinput>
 </screen>
     <para>Installez <application>D-BUS</application> en lançant les commandes
     suivantes (vous pouvez d'abord souhaiter observer la sortie de
@@ -93,7 +94,14 @@
     à la commande <command>configure</command> affichée ci-dessous) :</para>
  
 <screen>
-<userinput>./configure --prefix=/usr                              --sysconfdir=/etc                          --localstatedir=/var                       --libexecdir=/usr/lib/dbus-1.0             --with-console-auth-dir=/run/console/             --without-systemdsystemunitdir             --disable-systemd                          --disable-static &&
+<userinput>./configure --prefix=/usr                  \
+            --sysconfdir=/etc              \
+            --localstatedir=/var           \
+            --libexecdir=/usr/lib/dbus-1.0 \
+            --with-console-auth-dir=/run/console/ \
+            --without-systemdsystemunitdir \
+            --disable-systemd              \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Voir ci-dessous pour les instructions de test.</para>

Modified: trunk/blfs/general/sysutils/pciutils.xml
===================================================================
--- trunk/blfs/general/sysutils/pciutils.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/sysutils/pciutils.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -55,14 +55,19 @@
     <para>Installez <application>PCI Utils</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>make PREFIX=/usr                   SHAREDIR=/usr/share/misc      MANDIR=/usr/share/man         SHARED=yes                    ZLIB=no                       all</userinput>
+<userinput>make PREFIX=/usr              \
+     SHAREDIR=/usr/share/misc \
+     SHARED=yes</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>
 <screen role="root">
 <userinput>
-make PREFIX=/usr                   SHAREDIR=/usr/share/misc      MANDIR=/usr/share/man         SHARED=yes                    ZLIB=no                       install install-lib      &&
-chmod -v 755 /usr/lib/libpci.so.&pciutils-version;</userinput>
+make PREFIX=/usr              \
+     SHAREDIR=/usr/share/misc \
+     SHARED=yes               \
+     install install-lib      &&
+chmod -v 755 /usr/lib/libpci.so</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/general/sysutils/sysstat.xml
===================================================================
--- trunk/blfs/general/sysutils/sysstat.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/sysutils/sysstat.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -64,7 +64,11 @@
     <para>Installez <application>Sysstat</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sa_lib_dir=/usr/lib/sa    sa_dir=/var/log/sa        conf_dir=/etc/sysconfig   ./configure --prefix=/usr             --disable-man-group &&
+<userinput>sa_lib_dir=/usr/lib/sa    \
+sa_dir=/var/log/sa        \
+conf_dir=/etc/sysconfig   \
+./configure --prefix=/usr \
+            --disable-man-group &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/general/sysutils/upower.xml
===================================================================
--- trunk/blfs/general/sysutils/upower.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/general/sysutils/upower.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -79,8 +79,7 @@
     <para>Installez <application>UPower</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>
-./configure --prefix=/usr        \
+<userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --enable-deprecated  \
             --disable-static     \

Modified: trunk/blfs/gnome/applications/evince.xml
===================================================================
--- trunk/blfs/gnome/applications/evince.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/applications/evince.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -85,7 +85,10 @@
     <para>Installez <application>Evince</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                            --libexecdir=/usr/lib/evince             --enable-introspection                   --disable-static &&
+<userinput>./configure --prefix=/usr                \
+            --libexecdir=/usr/lib/evince \
+            --enable-introspection       \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas une suite de tests fonctionnelle</para>

Modified: trunk/blfs/gnome/applications/file-roller.xml
===================================================================
--- trunk/blfs/gnome/applications/file-roller.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/applications/file-roller.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -77,7 +77,10 @@
     <para>Installez <application>File Roller</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                     --libexecdir=/usr/lib             --disable-packagekit              --disable-static &&
+<userinput>./configure --prefix=/usr         \
+            --libexecdir=/usr/lib \
+            --disable-packagekit  \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>

Modified: trunk/blfs/gnome/applications/gnome-terminal.xml
===================================================================
--- trunk/blfs/gnome/applications/gnome-terminal.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/applications/gnome-terminal.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -84,7 +84,11 @@
       suivantes :  
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                         --disable-static                      --disable-migration                   --with-nautilus-extension             --libexecdir=/usr/lib/gnome-terminal &&
+<userinput>./configure --prefix=/usr             \
+            --disable-static          \
+            --disable-migration       \
+            --with-nautilus-extension \
+            --libexecdir=/usr/lib/gnome-terminal &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/applications/nautilus.xml
===================================================================
--- trunk/blfs/gnome/applications/nautilus.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/applications/nautilus.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -94,7 +94,11 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                    --sysconfdir=/etc                --disable-tracker                --disable-packagekit             --libexecdir=/usr/lib/nautilus &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --disable-tracker    \
+            --disable-packagekit \
+            --libexecdir=/usr/lib/nautilus &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/applications/network-manager-applet.xml
===================================================================
--- trunk/blfs/gnome/applications/network-manager-applet.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/applications/network-manager-applet.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -103,7 +103,11 @@
       Installez <application>NetworkManager Applet</application> en lançant les commandes suivantes :  
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --libexecdir=/usr/lib/NetworkManager             --disable-migration             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/NetworkManager \
+            --disable-migration \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/platform/gjs.xml
===================================================================
--- trunk/blfs/gnome/platform/gjs.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/platform/gjs.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -59,7 +59,7 @@
     <para>Installez <application>gjs</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr --libexecdir=/usr/lib &&
 make</userinput>
 </screen>
     <para>Ce paquet a une suite de tests, mais elle échoue pour des raisons inconnues actuellement.</para>

Modified: trunk/blfs/gnome/platform/gnome-keyring.xml
===================================================================
--- trunk/blfs/gnome/platform/gnome-keyring.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/platform/gnome-keyring.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -72,7 +72,9 @@
     <para>Installez <application>gnome-keyring</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --with-pam-dir=/lib/security &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --with-pam-dir=/lib/security &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make check</command>.</para>

Modified: trunk/blfs/gnome/platform/gvfs.xml
===================================================================
--- trunk/blfs/gnome/platform/gvfs.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/gnome/platform/gvfs.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -110,7 +110,10 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --libexecdir=/usr/lib/gvfs             --disable-gphoto2 &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/gvfs \
+            --disable-gphoto2 &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/introduction/welcome/changelog.xml
===================================================================
--- trunk/blfs/introduction/welcome/changelog.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/introduction/welcome/changelog.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -42,7 +42,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>15 Novembre 2013</para>
       <itemizedlist>
@@ -93,7 +92,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>14 Novembre 2013</para>
       <itemizedlist>
@@ -120,7 +118,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>13 Novembre 2013</para>
       <itemizedlist>
@@ -154,7 +151,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>12 Novembre 2013</para>
       <itemizedlist>
@@ -218,7 +214,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>11 Novembre 2013</para>
       <itemizedlist>
@@ -240,7 +235,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>10 Novembre 2013</para>
       <itemizedlist>
@@ -318,7 +312,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>7 Novembre 2013</para>
       <itemizedlist>
@@ -350,7 +343,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>6 Novembre 2013</para>
       <itemizedlist>
@@ -379,7 +371,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>5 Novembre 2013</para>
       <itemizedlist>
@@ -415,7 +406,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>4 Novembre 2013</para>
       <itemizedlist>
@@ -432,7 +422,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>3 Novembre 2013</para>
       <itemizedlist>
@@ -459,7 +448,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>2 Novembre 2013</para>
       <itemizedlist>
@@ -494,7 +482,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>31 October 2013</para>
       <itemizedlist>
@@ -516,7 +503,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>30 Octobre 2013</para>
       <itemizedlist>
@@ -534,7 +520,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>29 Octobre 2013</para>
       <itemizedlist>
@@ -557,7 +542,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>28 Octobre 2013</para>
       <itemizedlist>
@@ -589,7 +573,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>27 Octobre 2013</para>
       <itemizedlist>

Modified: trunk/blfs/kde/add/ark.xml
===================================================================
--- trunk/blfs/kde/add/ark.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/ark.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/gwenview.xml
===================================================================
--- trunk/blfs/kde/add/gwenview.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/gwenview.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -74,7 +74,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kate.xml
===================================================================
--- trunk/blfs/kde/add/kate.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/kate.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -73,7 +73,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE       .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kdepim-runtime.xml
===================================================================
--- trunk/blfs/kde/add/kdepim-runtime.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/kdepim-runtime.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -67,7 +67,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kdepim.xml
===================================================================
--- trunk/blfs/kde/add/kdepim.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/kdepim.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -75,7 +75,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DSYSCONF_INSTALL_DIR=/etc               -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kdeplasma-addons.xml
===================================================================
--- trunk/blfs/kde/add/kdeplasma-addons.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/kdeplasma-addons.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -74,7 +74,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kmix.xml
===================================================================
--- trunk/blfs/kde/add/kmix.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/kmix.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -66,7 +66,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/konsole.xml
===================================================================
--- trunk/blfs/kde/add/konsole.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/konsole.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/libkcddb.xml
===================================================================
--- trunk/blfs/kde/add/libkcddb.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/libkcddb.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -79,7 +79,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/kde/add/libkexiv2.xml
===================================================================
--- trunk/blfs/kde/add/libkexiv2.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/libkexiv2.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -63,7 +63,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/okular.xml
===================================================================
--- trunk/blfs/kde/add/okular.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/add/okular.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -87,7 +87,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/akonadi.xml
===================================================================
--- trunk/blfs/kde/core/akonadi.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/akonadi.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -67,7 +67,11 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;        -DCMAKE_PREFIX_PATH=&qt4-dir;                -DCMAKE_BUILD_TYPE=Release                -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE       .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;  \
+      -DCMAKE_PREFIX_PATH=&qt4-dir;          \
+      -DCMAKE_BUILD_TYPE=Release          \
+      -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
+      .. &&
 make</userinput>
 </screen>
      <para>Pour tester les résultats, tappez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/kactivities.xml
===================================================================
--- trunk/blfs/kde/core/kactivities.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/kactivities.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas une suite de tests.</para>

Modified: trunk/blfs/kde/core/kde-baseapps.xml
===================================================================
--- trunk/blfs/kde/core/kde-baseapps.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/kde-baseapps.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -73,7 +73,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/kde-runtime.xml
===================================================================
--- trunk/blfs/kde/core/kde-runtime.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/kde-runtime.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -92,7 +92,10 @@
 <userinput>patch -Np1 -i ../kde-runtime-&kde-version;-rpc_fix-1.patch &&
 mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DSYSCONF_INSTALL_DIR=/etc               -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/kde-workspace.xml
===================================================================
--- trunk/blfs/kde/core/kde-workspace.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/kde-workspace.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -102,7 +102,8 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 37 kdm &&
-useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm         -u 37 -s /bin/false kdm &&
+useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm \
+        -u 37 -s /bin/false kdm &&
 install -o kdm -g kdm -dm755 /var/lib/kdm</userinput>
 </screen>
     <para>Installez <application>Kde-workspace</application> en lançant les commandes
@@ -110,14 +111,19 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;                 -DSYSCONF_INSTALL_DIR=/etc                         -DCMAKE_BUILD_TYPE=Release                         -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE       .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;           \
+      -DSYSCONF_INSTALL_DIR=/etc                   \
+      -DCMAKE_BUILD_TYPE=Release                   \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install                  &&
 mkdir -p /usr/share/xsessions &&
-ln -sf &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop        /usr/share/xsessions/kde-plasma.desktop</userinput>
+ln -sf &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop \
+       /usr/share/xsessions/kde-plasma.desktop</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/kde/core/kdelibs.xml
===================================================================
--- trunk/blfs/kde/core/kdelibs.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/kdelibs.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -95,15 +95,21 @@
     <para>Corrigez des conflits de fichier avec <application>GNOME Menus</application> en lançant
     les commandes suivantes:</para>
 <screen>
-<userinput>sed -i "s@{SYSCONF_INSTALL_DIR}/xdg/menus@& RENAME kde-applications.menu@"         kded/CMakeLists.txt &&
-sed -i "s at applications.menu@kde-&@"         kded/kbuildsycoca.cpp</userinput>
+<userinput>sed -i "s@{SYSCONF_INSTALL_DIR}/xdg/menus@& RENAME kde-applications.menu@" \
+        kded/CMakeLists.txt &&
+sed -i "s at applications.menu@kde-&@" \
+        kded/kbuildsycoca.cpp</userinput>
 </screen>
    <para>Installez <application>Kdelibs</application> en lançant les commandes
     suivantes :</para>
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DSYSCONF_INSTALL_DIR=/etc               -DCMAKE_BUILD_TYPE=Release               -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version;       .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version; \
+      .. &&
 make</userinput>
 </screen>
 <para>Les tests de regression unitaires sont prévus pour être lancés

Modified: trunk/blfs/kde/core/kdepimlibs.xml
===================================================================
--- trunk/blfs/kde/core/kdepimlibs.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/kdepimlibs.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -74,7 +74,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>La suite de tests complètes pour ce paquet n'est pas active par défaut

Modified: trunk/blfs/kde/core/nepomuk-core.xml
===================================================================
--- trunk/blfs/kde/core/nepomuk-core.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/nepomuk-core.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -71,7 +71,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
   <para> Ce paquet n'a pas de suite de tests. </para>

Modified: trunk/blfs/kde/core/nepomuk-widgets.xml
===================================================================
--- trunk/blfs/kde/core/nepomuk-widgets.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/nepomuk-widgets.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -63,7 +63,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/phonon-backend-gstreamer.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -70,7 +70,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon-backend-vlc.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-vlc.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/phonon-backend-vlc.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -63,7 +63,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon.xml
===================================================================
--- trunk/blfs/kde/core/phonon.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/kde/core/phonon.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -72,7 +72,11 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE       -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces       .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
+      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/lxde/apps/apps.xml
===================================================================
--- trunk/blfs/lxde/apps/apps.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/apps.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -19,6 +19,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxshortcut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxtask.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxterminal.xml"/>
-
   
 </chapter>

Modified: trunk/blfs/lxde/apps/gpicview.xml
===================================================================
--- trunk/blfs/lxde/apps/gpicview.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/gpicview.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY gpicview-download-http "&sourceforge-repo;/lxde/gpicview-&gpicview-version;.tar.gz">
   <!ENTITY gpicview-download-ftp  " ">
   <!ENTITY gpicview-md5sum        "b209e36531f89c48e3067b389699d4c7">
@@ -11,30 +10,22 @@
   <!ENTITY gpicview-buildsize     "6.2 Mo">
   <!ENTITY gpicview-time          "0.2 SBU">
 ]>
-
 <sect1 id="gpicview" xreflabel="GPicView-&gpicview-version;">
   <?dbhtml filename="gpicview.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: fernando $</othername>
     <date>$Date: 2013-10-28 15:00:09 +0100 (lun. 28 oct. 2013) $</date>
   </sect1info>
-
   <title>GPicView-&gpicview-version;</title>
-
   <indexterm zone="gpicview">
     <primary sortas="a-GPicView">GPicView</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à GPicView</title>
-
     <para>
       Le paquet <application>GPicView</application> contient un visualisateur d'images léger.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -68,39 +59,34 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de GPicView</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/gpicview"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de GPicView</title>
-
     <para>
       Installez <application>GPicView</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr &&
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
     <para>
       Si vous avez installé <xref linkend="xdg-utils"/>, en tant qu'utilisateur 
       <systemitem class="username">root</systemitem>, vous devez lancer la commande
@@ -108,15 +94,12 @@
       pour que les nouveaux icônes installés soient affichés dans les menus.
     </para>
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programme installé Program</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           gpicview
@@ -129,12 +112,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="gpicview-prog">
         <term><command>gpicview</command></term>
         <listitem>
@@ -146,9 +127,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/apps/lxappearance-obconf.xml
===================================================================
--- trunk/blfs/lxde/apps/lxappearance-obconf.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/lxappearance-obconf.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxappearance-obconf-download-http "&sourceforge-repo;/lxde/lxappearance-obconf-&lxappearance-obconf-version;.tar.gz">
   <!ENTITY lxappearance-obconf-download-ftp  " ">
   <!ENTITY lxappearance-obconf-md5sum        "1f061c96e0c78a6476421ca294ac24aa">
@@ -11,32 +10,24 @@
   <!ENTITY lxappearance-obconf-buildsize     "5.7 Mo">
   <!ENTITY lxappearance-obconf-time          "0.1 SBU">
 ]>
-
 <sect1 id="lxappearance-obconf" xreflabel="lxappearance-obconf-&lxappearance-obconf-version;">
   <?dbhtml filename="lxappearance-obconf.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: fernando $</othername>
     <date>$Date: 2013-10-28 15:00:09 +0100 (lun. 28 oct. 2013) $</date>
   </sect1info>
-
   <title>lxappearance-obconf-&lxappearance-obconf-version;</title>
-
   <indexterm zone="lxappearance-obconf">
     <primary sortas="a-lxappearance-obconf">lxappearance-obconf</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXAppearance OBconf</title>
-
     <para>
       Le paquet <application>LXAppearance OBconf</application> contient un greffon
       <application>LXAppearance</application> pour configurer
       <application>OpenBox</application>.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,51 +61,42 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXAppearance OBconf</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="lxappearance"/> et
       <xref linkend="openbox"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxappearance-obconf"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXAppearance OBconf</title>
-
     <para>
       Installez <application>LXAppearance OBconf</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr &&
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoires installés</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -128,7 +110,5 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/apps/lxinput.xml
===================================================================
--- trunk/blfs/lxde/apps/lxinput.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/lxinput.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxinput-download-http "&sourceforge-repo;/lxde/lxinput-&lxinput-version;.tar.gz">
   <!ENTITY lxinput-download-ftp  " ">
   <!ENTITY lxinput-md5sum        "5bf563d04984ef2a147433f3bdda687b">
@@ -11,31 +10,23 @@
   <!ENTITY lxinput-buildsize     "2.7 Mo">
   <!ENTITY lxinput-time          "0.1 SBU">
 ]>
-
 <sect1 id="lxinput" xreflabel="LXInput-&lxinput-version;">
   <?dbhtml filename="lxinput.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: fernando $</othername>
     <date>$Date: 2013-10-28 15:00:09 +0100 (lun. 28 oct. 2013) $</date>
   </sect1info>
-
   <title>LXInput-&lxinput-version;</title>
-
   <indexterm zone="lxinput">
     <primary sortas="a-LXInput">LXInput</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXInput</title>
-
     <para>
       Le paquet <application>LXInput</application> contient un petit programme utilisé pour
       configurer le clavier et la souris pour <application>LXDE</application>.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,50 +60,41 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXInput</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxinput"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXInput</title>
-
     <para>
       Installez <application>LXInput</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr &&
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programme installé Program</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           lxinput
@@ -125,12 +107,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxinput-prog">
         <term><command>lxinput</command></term>
         <listitem>
@@ -142,9 +122,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/apps/lxrandr.xml
===================================================================
--- trunk/blfs/lxde/apps/lxrandr.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/lxrandr.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxrandr-download-http "&sourceforge-repo;/lxde/lxrandr-&lxrandr-version;.tar.gz">
   <!ENTITY lxrandr-download-ftp  " ">
   <!ENTITY lxrandr-md5sum        "8a7391581541bba58839ac11dbf5b575">
@@ -11,31 +10,23 @@
   <!ENTITY lxrandr-buildsize     "2.7 Mo">
   <!ENTITY lxrandr-time          "0.1 SBU">
 ]>
-
 <sect1 id="lxrandr" xreflabel="LXRandR-&lxrandr-version;">
   <?dbhtml filename="lxrandr.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: fernando $</othername>
     <date>$Date: 2013-10-28 15:00:09 +0100 (lun. 28 oct. 2013) $</date>
   </sect1info>
-
   <title>LXRandR-&lxrandr-version;</title>
-
   <indexterm zone="lxrandr">
     <primary sortas="a-LXRandR">LXRandR</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXRandR</title>
-
     <para>
       Le paquet <application>LXRandR</application> contient un outil de configuration
       de l'écran pour <application>LXDE</application>.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,68 +60,55 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXRandR</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/> et
       <xref linkend="xorg7-app"/>
     </para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="libxslt"/> with
       <xref linkend="DocBook"/> et
       <xref linkend="docbook-xsl"/> (to build man pages)
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxrandr"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXRandR</title>
-
     <para>
       Installez <application>LXRandR</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr &&
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de test.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="commands">
     <title>Explications des commandes</title>
-
     <para>
       <option>--enable-man</option> : Utilisez ce paramètre si vous avec installé des dépendances facultatives et
       souhaitez construire les pages de manuel.
     </para>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programme installé Program</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoires installés</segtitle>
-
       <seglistitem>
         <seg>
           lxrandr
@@ -143,12 +121,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxrandr-prog">
         <term><command>lxrandr</command></term>
         <listitem>
@@ -160,9 +136,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/apps/lxshortcut.xml
===================================================================
--- trunk/blfs/lxde/apps/lxshortcut.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/lxshortcut.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxshortcut-download-http "&sourceforge-repo;/lxde/lxshortcut-&lxshortcut-version;.tar.gz">
   <!ENTITY lxshortcut-download-ftp  " ">
   <!ENTITY lxshortcut-md5sum        "72f0dfafa8098be853beae6e33b5e13b">
@@ -11,31 +10,23 @@
   <!ENTITY lxshortcut-buildsize     "2.6 Mo">
   <!ENTITY lxshortcut-time          "0.1 SBU">
 ]>
-
 <sect1 id="lxshortcut" xreflabel="LXShortcut-&lxshortcut-version;">
   <?dbhtml filename="lxshortcut.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: fernando $</othername>
     <date>$Date: 2013-10-28 15:00:09 +0100 (lun. 28 oct. 2013) $</date>
   </sect1info>
-
   <title>LXShortcut-&lxshortcut-version;</title>
-
   <indexterm zone="lxshortcut">
     <primary sortas="a-LXShortcut">LXShortcut</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXShortcut</title>
-
     <para>
       Le paquet <application>LXShortcut</application> contient un petit programme utilisé pour éditer les raccourcis
       d'applications créés avec la spécification freedesktop.org Desktop Entry.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,50 +60,41 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXShortcut</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxshortcut"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXShortcut</title>
-
     <para>
       Installez <application>LXShortcut</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr &&
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programme installé Program</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           lxshortcut
@@ -125,12 +107,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxshortcut-prog">
         <term><command>lxshortcut</command></term>
         <listitem>
@@ -142,9 +122,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/apps/lxtask.xml
===================================================================
--- trunk/blfs/lxde/apps/lxtask.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/lxtask.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxtask-download-http "&sourceforge-repo;/lxde/lxtask-&lxtask-version;.tar.gz">
   <!ENTITY lxtask-download-ftp  " ">
   <!ENTITY lxtask-md5sum        "c4ab47d03d41a88696d64d3f1e78cf7f">
@@ -11,31 +10,23 @@
   <!ENTITY lxtask-buildsize     "3.3 Mo">
   <!ENTITY lxtask-time          "0.2 SBU">
 ]>
-
 <sect1 id="lxtask" xreflabel="LXTask-&lxtask-version;">
   <?dbhtml filename="lxtask.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: fernando $</othername>
     <date>$Date: 2013-10-28 15:00:09 +0100 (lun. 28 oct. 2013) $</date>
   </sect1info>
-
   <title>LXTask-&lxtask-version;</title>
-
   <indexterm zone="lxtask">
     <primary sortas="a-LXTask">LXTask</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXTask</title>
-
     <para>
       Le paquet <application>LXTask</application> contient un gestionnaire de tâches léger indépendant
       du bureau.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,50 +60,41 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXTask</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxtask"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXTask</title>
-
     <para>
       Installez <application>LXTask</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr &&
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programme installé</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoires installés</segtitle>
-
       <seglistitem>
         <seg>
           lxtask
@@ -125,12 +107,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxtask-prog">
         <term><command>lxtask</command></term>
         <listitem>
@@ -142,9 +122,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/apps/lxterminal.xml
===================================================================
--- trunk/blfs/lxde/apps/lxterminal.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/apps/lxterminal.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxterminal-download-http "&sourceforge-repo;/lxde/lxterminal-&lxterminal-version;.tar.gz">
   <!ENTITY lxterminal-download-ftp  " ">
   <!ENTITY lxterminal-md5sum        "fd9140b45c0f28d021253c4aeb8c4aea">
@@ -11,32 +10,24 @@
   <!ENTITY lxterminal-buildsize     "4.2 Mo">
   <!ENTITY lxterminal-time          "0.1 SBU">
 ]>
-
 <sect1 id="lxterminal" xreflabel="LXTerminal-&lxterminal-version;">
   <?dbhtml filename="lxterminal.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: fernando $</othername>
     <date>$Date: 2013-10-28 15:00:09 +0100 (lun. 28 oct. 2013) $</date>
   </sect1info>
-
   <title>LXTerminal-&lxterminal-version;</title>
-
   <indexterm zone="lxterminal">
     <primary sortas="a-LXTerminal">LXTerminal</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXTerminal</title>
-
     <para>
       Le paquet <application>LXTerminal</application> contient un émulateur de terminal basé sur 
       VTE pour <application>LXDE</application>
       avec le support pour plusieurs onglets.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,67 +61,54 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXTerminal</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="vte2"/>
     </para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="libxslt"/> with
       <xref linkend="DocBook"/> et
       <xref linkend="docbook-xsl"/> (to build man pages)
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxterminal"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXTerminal</title>
-
     <para>
       Installez <application>LXTerminal</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr &&
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="commands">
     <title>Explications des commandes</title>
-
     <para>
       <option>--enable-man</option> : Utilisez ce paramètre si vous avez installé les dépendances facultatives et souhaitez construire
       les pages de manuel.
     </para>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programme installé Program</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           lxterminal
@@ -143,12 +121,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxterminal-prog">
         <term><command>lxterminal</command></term>
         <listitem>
@@ -161,9 +137,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxappearance.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxappearance.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/desktop/lxappearance.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -88,7 +88,10 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --enable-dbus &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-dbus     &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/lxde/desktop/lxde-common.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxde-common.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/lxde/desktop/lxde-common.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -96,7 +96,7 @@
        
     </para>
 <screen>
-<userinput>sed -e "s:@prefix@/share/lxde/pcmanfm:@sysconfdir@/xdg/pcmanfm/LXDE:" 
+<userinput>sed -e "s:@prefix@/share/lxde/pcmanfm:@sysconfdir@/xdg/pcmanfm/LXDE:" \
     -i startlxde.in &&
 ./configure --prefix=/usr --sysconfdir=/etc &&
 make</userinput>

Modified: trunk/blfs/multimedia/audioutils/audacious.xml
===================================================================
--- trunk/blfs/multimedia/audioutils/audacious.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/audioutils/audacious.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -154,7 +154,8 @@
     </para>
 <screen role="root">
 <userinput>install -v -m755 -d /usr/share/doc/audacious-&audacious-version;/api &&
-install -v -m644    doc/html/*                     /usr/share/doc/audacious-&audacious-version;/api</userinput>
+install -v -m644    doc/html/* \
+                    /usr/share/doc/audacious-&audacious-version;/api</userinput>
 </screen>
  
   </sect2>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -126,7 +126,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Bad Plugins &gst10-plugins-bad-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Bad Plugins &gst10-plugins-bad-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -104,7 +104,9 @@
       commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Base Plugins &gst10-plugins-base-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Base Plugins &gst10-plugins-base-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -113,7 +113,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/"  &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/"  &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -100,7 +100,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Ugly Plugins &gst10-plugins-ugly-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Ugly Plugins &gst10-plugins-ugly-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gstreamer10.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gstreamer10.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/libdriv/gstreamer10.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -91,7 +91,10 @@
       Installez <application>GStreamer</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --libexecdir=/usr/lib             --with-package-name="GStreamer &gstreamer10-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib \
+            --with-package-name="GStreamer &gstreamer10-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/libvpx.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libvpx.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/libdriv/libvpx.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -67,7 +67,9 @@
 chmod -v 644 vpx/*.h &&
 mkdir ../libvpx-build &&
 cd ../libvpx-build &&
-../libvpx-v&libvpx-version;/configure --prefix=/usr                            --enable-shared                            --disable-static &&
+../libvpx-v&libvpx-version;/configure --prefix=/usr \
+                           --enable-shared \
+                           --disable-static &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/multimedia/libdriv/x264.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/x264.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/libdriv/x264.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -76,7 +76,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --enable-shared             --disable-cli &&
+<userinput>./configure --prefix=/usr \
+            --enable-shared \
+            --disable-cli &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/ffmpeg.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/multimedia/videoutils/ffmpeg.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -144,8 +144,24 @@
     suivantes :</para>
     
 <screen>
-<userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &&
-./configure --prefix=/usr                    --enable-gpl                     --enable-version3                --enable-nonfree                 --disable-static                 --enable-shared                  --disable-debug                  --enable-libass                  --enable-libfdk-aac              --enable-libmp3lame              --enable-libopus                 --enable-libtheora               --enable-libvorbis               --enable-libvpx                  --enable-libx264                 --enable-x11grab     &&
+<userinput>patch -Np1 -i ../ffmpeg-&ffmpeg-version;-libavformat_cookies-1.patch &&
+sed -i 's/-lflite"/-lflite -lasound"/' configure &&
+./configure --prefix=/usr        \
+            --enable-gpl         \
+            --enable-version3    \
+            --enable-nonfree     \
+            --disable-static     \
+            --enable-shared      \
+            --disable-debug      \
+            --enable-libass      \
+            --enable-libfdk-aac  \
+            --enable-libmp3lame  \
+            --enable-libopus     \
+            --enable-libtheora   \
+            --enable-libvorbis   \
+            --enable-libvpx      \
+            --enable-libx264     \
+            --enable-x11grab     &&
 make &&
 gcc tools/qt-faststart.c -o tools/qt-faststart &&
 unset LIBRARY_PATH</userinput>
@@ -165,7 +181,8 @@
 do
     texi2pdf -b $DOCNAME.texi &&
     texi2dvi -b $DOCNAME.texi &&
-    dvips -o    $DOCNAME.ps                   $DOCNAME.dvi  &&
+    dvips -o    $DOCNAME.ps   \
+                $DOCNAME.dvi
 done                          &&
 popd                          &&
 unset DOCNAME</userinput>
@@ -184,22 +201,25 @@
 <screen role="root">
 <userinput>make install &&
 install -v -m755    tools/qt-faststart /usr/bin &&
-install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version; &&
-install -v -m644    doc/*.txt                     /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput>
+install -v -m755 -d /usr/share/doc/ffmpeg &&
+install -v -m644    doc/*.txt \
+                    /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>
 	Si la documentation HTML est construite, tapez la commande suivante pour l'installer:
     </para>
 <screen role="root">
-<userinput>install -v -m644 doc/*.html                  /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput>
+<userinput>install -v -m644 doc/*.html \
+                 /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>Si vous avez utilisé <command>doxygen</command> pour créer la 
     documentation de l'API, installez-la (300 Mo d'espace en plus) en
     lançant les commandes suivantes en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
-install -v -m644    doc/doxy/html/*                     /usr/share/doc/ffmpeg-&ffmpeg-version;/api</userinput>
+<userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api &&
+install -v -m644    doc/doxy/html/* \
+                    /usr/share/doc/ffmpeg/api</userinput>
 </screen>
    </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/networking/mailnews/mutt.xml
===================================================================
--- trunk/blfs/networking/mailnews/mutt.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/networking/mailnews/mutt.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -106,7 +106,12 @@
     <para>Installez <application>Mutt</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --sysconfdir=/etc             --with-docdir=/usr/share/doc/mutt-&mutt-version;             --enable-pop --enable-imap             --enable-hcache --without-qdbm             --without-tokyocabinet             --with-gdbm --without-bdb &&
+<userinput>./configure --prefix=/usr --sysconfdir=/etc \
+            --with-docdir=/usr/share/doc/mutt-&mutt-version; \
+            --enable-pop --enable-imap \
+            --enable-hcache --without-qdbm \
+            --without-tokyocabinet \
+            --with-gdbm --without-bdb &&
 make</userinput>
 </screen>
    
@@ -124,7 +129,8 @@
     TeX en lançant les commandes suivantes en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role='root'>
-<userinput>install -v -m644 doc/manual.{pdf,tex}     /usr/share/doc/mutt-&mutt-version;</userinput>
+<userinput>install -v -m644 doc/manual.{pdf,tex} \
+    /usr/share/doc/mutt-&mutt-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/networking/netlibs/glib-networking.xml
===================================================================
--- trunk/blfs/networking/netlibs/glib-networking.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/networking/netlibs/glib-networking.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -68,9 +68,10 @@
     <para>Installez <application>glib-networking</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../glib-networking-&glib-networking-version;-install_no_test_data_files-1.patch &&
-autoreconf -fi &&
-./configure --prefix=/usr             --libexecdir=/usr/lib/glib-networking             --with-ca-certificates=/etc/ssl/ca-bundle.crt             --disable-static &&
+<userinput>./configure --prefix=/usr                                 \
+            --libexecdir=/usr/lib/glib-networking         \
+            --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>.

Modified: trunk/blfs/networking/netlibs/libnl.xml
===================================================================
--- trunk/blfs/networking/netlibs/libnl.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/networking/netlibs/libnl.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -55,7 +55,9 @@
     <para>Installez <application>libnl</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Pour tester le résultat, tapez : <command>make check</command>.</para>

Modified: trunk/blfs/networking/netprogs/nfs-utils.xml
===================================================================
--- trunk/blfs/networking/netprogs/nfs-utils.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/networking/netprogs/nfs-utils.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -74,10 +74,10 @@
     <para>Activez les options suivantes dans la configuration du noyau 
     et recompilez le noyau si nécessaire :</para>
 <screen>
-<literal>File systems:
-  Network File Systems:
-    NFS File System Support: Y or M
-    NFS Server Support: Y or M</literal>
+<literal>File systems  --->
+  Network File Systems  --->
+    NFS client support: Y or M
+    NFS server support: Y or M</literal>
 </screen>
     <para>Sélectionnez les sous-options adéquates qui apparaissent quand les
     options ci-dessus sont sélectionnées.</para>
@@ -95,7 +95,8 @@
     <systemitem class="username">root</systemitem> :</para>
 <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>
     <note>
       <para>Les valeurs d'uid et de gid classiques sont 65534, ce qui signifie
@@ -114,7 +115,11 @@
     <para>Installez <application>NFS Utilities</application> en lançant 
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                      --sysconfdir=/etc                  --without-tcp-wrappers             --disable-nfsv4                    --disable-nfsv41                   --disable-gss &&
+<userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --without-tcp-wrappers \
+            --disable-nfsv4        \
+            --disable-gss &&
 make</userinput>
 </screen>
     <para>Si votre répertoire <filename class="directory">/usr</filename> est

Modified: trunk/blfs/networking/netprogs/samba.xml
===================================================================
--- trunk/blfs/networking/netprogs/samba.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/networking/netprogs/samba.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -96,7 +96,14 @@
     suivantes :</para>
 <screen>
 <userinput>sed -i -e "/dmapi_lib/s/$/ldflags='-ltirpc',/" source3/wscript_build &&
-./configure                                --prefix=/usr                          --sysconfdir=/etc                      --localstatedir=/var                   --with-piddir=/run/samba               --with-pammodulesdir=/lib/security     --enable-fhs                           --enable-nss-wrapper               &&
+./configure                            \
+    --prefix=/usr                      \
+    --sysconfdir=/etc                  \
+    --localstatedir=/var               \
+    --with-piddir=/run/samba           \
+    --with-pammodulesdir=/lib/security \
+    --enable-fhs                       \
+    --enable-nss-wrapper               &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats,en tant qu'utilisateur    <systemitem class="username">root</systemitem>
@@ -111,13 +118,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>
  
  </sect2>
@@ -341,7 +352,8 @@
       qu'utilisateur <systemitem class='username'>root</systemitem> :</para>
 <screen>
 <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 

Modified: trunk/blfs/networking/netutils/avahi.xml
===================================================================
--- trunk/blfs/networking/netutils/avahi.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/networking/netutils/avahi.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -87,7 +87,10 @@
     <para>Installez <application>avahi</application> en lançant les commandes 
     suivantes:</para>
 <screen>
-<userinput>./configure --prefix=/usr        \
+<userinput>sed -i 's/\(CFLAGS=.*\)-Werror \(.*\)/\1\2/' configure &&
+sed -i -e 's/-DG_DISABLE_DEPRECATED=1//' \
+ -e '/-DGDK_DISABLE_DEPRECATED/d' avahi-ui/Makefile.in &&
+./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --disable-static     \

Modified: trunk/blfs/networking/netutils/wireshark.xml
===================================================================
--- trunk/blfs/networking/netutils/wireshark.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/networking/netutils/wireshark.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -135,8 +135,7 @@
     <para>Continuez à installer <application>Wireshark</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../wireshark-&wireshark-version;-packet_gluster_duplicate_enums_fix-1.patch &&
-./configure --prefix=/usr --sysconfdir=/etc                                  &&
+<userinput>./configure --prefix=/usr --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de test</para>
@@ -145,15 +144,19 @@
 <userinput>make install &&
 install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &&
 install -v -m755 -d /usr/share/pixmaps/wireshark &&
-install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt}                     /usr/share/doc/wireshark-&wireshark-version; &&
+install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt} \
+                    /usr/share/doc/wireshark-&wireshark-version; &&
 pushd /usr/share/doc/wireshark-&wireshark-version; &&
    for FILENAME in ../../wireshark/*.html; do
-      ln -s -v $FILENAME .
+      ln -s -v -f $FILENAME .
    done &&
 popd &&
-install -v -m644 -D wireshark.desktop                     /usr/share/applications/wireshark.desktop &&
-install -v -m644 -D image/wsicon48.png                     /usr/share/pixmaps/wireshark.png &&
-install -v -m644    image/*.{png,ico,xpm,bmp}                     /usr/share/pixmaps/wireshark</userinput>
+install -v -m644 -D wireshark.desktop \
+                    /usr/share/applications/wireshark.desktop &&
+install -v -m644 -D image/wsicon48.png \
+                    /usr/share/pixmaps/wireshark.png &&
+install -v -m644    image/*.{png,ico,xpm,bmp} \
+                    /usr/share/pixmaps/wireshark</userinput>
 </screen>
     <para>Si vous avez téléchargé un des fichiers de documentation mentionnés dans 'Téléchargements supplémentaires', installez les en suivant les commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">

Modified: trunk/blfs/postlfs/filesystems/initramfs.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/initramfs.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/postlfs/filesystems/initramfs.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -96,7 +96,9 @@
 mknod -m 640 $WDIR/dev/console c 5 1
 mknod -m 664 $WDIR/dev/null    c 1 3
 # Install the udev configuration files
-cp /etc/udev/udev.conf $WDIR/etc/udev/udev.conf
+if [ -f /etc/udev/udev.conf ]; then
+  cp /etc/udev/udev.conf $WDIR/etc/udev/udev.conf
+fi
 for file in $(find /etc/udev/rules.d/ -type f) ; do
   cp $file $WDIR/etc/udev/rules.d
 done
@@ -122,7 +124,7 @@
   copy $f bin
 done
 # Add lvm if present
-if [ -x /sbin/lvm ] ; then sbinfiles="$sbinfiles lvm"; fi
+if [ -x /sbin/lvm ] ; then sbinfiles="$sbinfiles lvm dmsetup"; fi
 for f in $sbinfiles ; do
   ldd /sbin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
   copy $f sbin
@@ -137,6 +139,7 @@
   ln -s kmod $WDIR/bin/insmod
 fi
 # Add lvm symlinks if appropriate
+# Also copy the lvm.conf file
 if  [ -x /sbin/lvm ] ; then
   ln -s lvm $WDIR/sbin/lvchange
   ln -s lvm $WDIR/sbin/lvrename
@@ -154,6 +157,8 @@
   ln -s lvm $WDIR/sbin/vgscan
   ln -s lvm $WDIR/sbin/vgrename
   ln -s lvm $WDIR/sbin/vgck
+  # Conf file(s)
+  cp -a /etc/lvm $WDIR/etc
 fi
 # Install libraries
 sort $unsorted | uniq | while read library ; do
@@ -265,9 +270,9 @@
 ${UDEV_PATH}/udevd --daemon --resolve-names=never
 udevadm trigger
 udevadm settle
-if [ -f /etc/mdadm.conf ] ; then mdadm -As                                    ; fi
-if [ -x /sbin/vgchange  ] ; then /sbin/vgchange --noudevsync -a y > /dev/null ; fi
-if [ -n "$rootdelay"    ] ; then sleep "$rootdelay"                           ; fi
+if [ -f /etc/mdadm.conf ] ; then mdadm -As                       ; fi
+if [ -x /sbin/vgchange  ] ; then /sbin/vgchange -a y > /dev/null ; fi
+if [ -n "$rootdelay"    ] ; then sleep "$rootdelay"              ; fi
 do_mount_root
 killall -w ${UDEV_PATH}/udevd
 exec switch_root /.root "$init" "$@"

Modified: trunk/blfs/postlfs/filesystems/lvm2.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/lvm2.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/postlfs/filesystems/lvm2.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -78,7 +78,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/security/gnutls.xml
===================================================================
--- trunk/blfs/postlfs/security/gnutls.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/postlfs/security/gnutls.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -88,7 +88,9 @@
     <para>Installez <application>GnuTLS</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-static             --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &&
+<userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --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/libcap.xml
===================================================================
--- trunk/blfs/postlfs/security/libcap.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/postlfs/security/libcap.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -73,7 +73,8 @@
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make RAISE_SETFCAP=no install</userinput>
+<userinput>make RAISE_SETFCAP=no install &&
+chmod -v 755 /lib/libcap.so</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/postlfs/security/nss.xml
===================================================================
--- trunk/blfs/postlfs/security/nss.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/postlfs/security/nss.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -86,7 +86,12 @@
 <screen>
 <userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch &&
 cd nss &&
-make BUILD_OPT=1                        NSPR_INCLUDE_DIR=/usr/include/nspr    USE_SYSTEM_ZLIB=1                     ZLIB_LIBS=-lz                         $([ $(uname -m) = x86_64 ] && echo USE_64=1)   $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)</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)</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>
@@ -96,7 +101,7 @@
 install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib           &&
 install -v -m755 -d                           /usr/include/nss   &&
 cp -v -RL {public,private}/nss/*              /usr/include/nss   &&
-chmod 644                                     /usr/include/nss/* &&
+chmod -v 644                                  /usr/include/nss/* &&
 install -v -m755 Linux*/bin/{certutil,nss-config,pk12util} /usr/bin &&
 install -v -m644 Linux*/lib/pkgconfig/nss.pc  /usr/lib/pkgconfig</userinput>
 </screen>

Modified: trunk/blfs/postlfs/security/openssh.xml
===================================================================
--- trunk/blfs/postlfs/security/openssh.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/postlfs/security/openssh.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -88,7 +88,12 @@
     <para>Installez <application>OpenSSH</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                                 --libexecdir=/usr/lib/openssh                 --sysconfdir=/etc/ssh                         --datadir=/usr/share/sshd                     --with-md5-passwords                          --with-privsep-path=/var/lib/sshd &&
+<userinput>./configure --prefix=/usr                     \
+            --libexecdir=/usr/lib/openssh     \
+            --sysconfdir=/etc/ssh             \
+            --datadir=/usr/share/sshd         \
+            --with-md5-passwords              \
+            --with-privsep-path=/var/lib/sshd &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/pst/printing/cups-filters.xml
===================================================================
--- trunk/blfs/pst/printing/cups-filters.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/pst/printing/cups-filters.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -97,7 +97,13 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                                           --sysconfdir=/etc                                       --docdir=/usr/share/doc/cups-filters-&cups-filters-version;             --without-rcdir                                         --with-gs-path=/usr/bin/gs                              --with-pdftops-path=/usr/bin/gs                         --disable-static                            &&
+<userinput>./configure --prefix=/usr                               \
+            --sysconfdir=/etc                           \
+            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; \
+            --without-rcdir                             \
+            --with-gs-path=/usr/bin/gs                  \
+            --with-pdftops-path=/usr/bin/gs             \
+            --disable-static                            &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/pst/printing/cups.xml
===================================================================
--- trunk/blfs/pst/printing/cups.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/pst/printing/cups.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -112,13 +112,10 @@
     </para>
 <screen>
 Device Drivers  --->
-  [*] USB support  --->
-...
-Enable support for either UHCI or OHCI, not both:
-    [*]   OHCI HCD support
-    [*]   UHCI HCD (most Intel and VIA) support
-...
-    [*]   USB Printer support
+  USB support  --->
+    OHCI HCD (USB 1.1) support: Y or M
+    UHCI HCD (most Intel and VIA) support: Y or M
+    USB Printer support: Y or M
 </screen>
     <para>
       Si vous avez une imprimante en port parallèle, activez les options suivantes
@@ -126,11 +123,10 @@
     </para>
 <screen>
 <literal>Device Drivers  --->
-  [*] Parallel port support  --->
-    [*]   PC-style hardware
-...
+  Parallel port support  --->
+    PC-style hardware: Y or M
   Character devices  --->
-    [*] Parallel printer support</literal>
+    Parallel printer support: Y or M</literal>
 </screen>
     <indexterm zone="cups cups-kernel">
       <primary sortas="d-cups">cups</primary>
@@ -184,7 +180,9 @@
        Si vous devez accéder à un serveur d'impression <application>Cups</application>
        , utilisez le correctif suivant:
    </para>
-<screen><userinput>patch -Np1 -i ../cups-&cups-version;-content_type-1.patch</userinput></screen>
+<screen>
+<userinput>patch -Np1 -i ../cups-&cups-version;-content_type-1.patch</userinput>
+</screen>
     <para>
   Installez <application>Cups</application> en lançant les commandes
       suivantes :
@@ -194,7 +192,11 @@
 <userinput>patch -Np1 -i ../cups-&cups-version;-blfs-1.patch &&
 aclocal -I config-scripts &&
 autoconf -I config-scripts &&
-CC=gcc ./configure --libdir=/usr/lib                             --with-rcdir=/tmp/cupsinit                    --with-docdir=/usr/share/cups/doc             --with-system-groups=lpadmin      &&
+CC=gcc \
+./configure --libdir=/usr/lib                 \
+            --with-rcdir=/tmp/cupsinit        \
+            --with-docdir=/usr/share/cups/doc \
+            --with-system-groups=lpadmin      &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests opérationnelle.</para>
@@ -268,7 +270,6 @@
     <sect3 id="cups-config">
       <title>Fichiers de Config</title>
       <para><filename>/etc/cups/*</filename></para>
-
       <indexterm zone="cups cups-config">
         <primary sortas="e-etc-cups">/etc/cups/*</primary>
       </indexterm>

Modified: trunk/blfs/server/databases/mariadb.xml
===================================================================
--- trunk/blfs/server/databases/mariadb.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/server/databases/mariadb.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY mariadb-download-http "http://tweedo.com/mirror/mariadb/mariadb-&mariadb-version;/kvm-tarbake-jaunty-x86/mariadb-&mariadb-version;.tar.gz">
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/kvm-tarbake-jaunty-x86/mariadb-&mariadb-version;.tar.gz">
   <!ENTITY mariadb-md5sum        "299fd67d5f193ac30a30a60b579d8bec">
@@ -11,32 +10,24 @@
   <!ENTITY mariadb-buildsize     "1.5 GB">
   <!ENTITY mariadb-time          "6.8 SBU">
 ]>
-
 <sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
   <?dbhtml filename="mariadb.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: igor $</othername>
     <date>$Date: 2013-11-11 18:10:53 +0100 (lun. 11 nov. 2013) $</date>
   </sect1info>
-
   <title>MariaDB-&mariadb-version;</title>
-
   <indexterm zone="mariadb">
     <primary sortas="a-MariaDB">MariaDB</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à MariaDB</title>
-
     <para>
       <application>MariaDB</application> est un fork développé par la communauté
       et un remplaçant dpour le système de gestion de bases de données relationnelles
       <application>MySQL</application>.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,38 +61,27 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de MariaDB</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="cmake"/> et
       <xref linkend="openssl"/>
     </para>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="libevent"/>
     </para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
-      <!-- broken at the moment
-      <ulink url="http://packages.debian.org/source/sid/libedit">libedit</ulink>,
-      <xref linkend="boost"/>, and
-      -->
+      
       <ulink url="http://packages.debian.org/source/sid/libaio">libaio</ulink>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url="&blfs-wiki;/mariadb"/>
     </para>
-
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de MariaDB</title>
-
     <para>
       Pour des raisons de sécurité, lancer le serveur en tant qu'utilisateur
       et groupe sans privilèges est fortement encouragé. Tapez la suite (
@@ -109,15 +89,15 @@
       <systemitem class="username">root</systemitem>) pour créer l'utilitateur
       et le groupe :
     </para>
-
-<screen role="root"><userinput>groupadd -g 40 mysql &&
-useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput></screen>
-
+<screen role="root">
+<userinput>groupadd -g 40 mysql &&
+useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput>
+</screen>
     <para>
       Installez <application>MariaDB</application> en lançant la suite  
     </para>
-
-<screen><userinput>sed -i "s at data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
+<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 &&
 mkdir build &&
 cd build &&
@@ -136,105 +116,86 @@
       -DMYSQL_DATADIR=/srv/mysql \
       -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
       -DWITH_EXTRA_CHARSETS=complex \
-      -DWITH_LIBEVENT=system
+      -DWITH_LIBEVENT=system \
+      -DBOOST_OK=0 \
       .. &&
-make</userinput></screen>
-
+make</userinput>
+</screen>
     <para>
       Pour tester le résultat, tapez : <command>make test</command>.
     </para>
-
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="commands">
     <title>Explications des commandes</title>
-
     <para>
       <command>sed -i ...</command> : Le premier sed initialise correctement
       le répertoire d'installation pour quelques composants.
       Le second sed corrige un bogue dans le code.
     </para>
-
     <para>
       <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter> : Ce paramètre 
       active le support pour les ensembles de caractères complexes.
     </para>
-
     <para>
       <parameter>-DWITH_LIBEVENT=system</parameter> : Ce paramètre est utilisé
       pour dire au système de construction d'utiliser la version installée de
       <application>libevent</application>.
       Enlevez si vous n'avez pas installé <application>libevent</application>.
     </para>
-
     <para>
       <option>-DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF</option> : Utilisez ces
       paramètres si vous ne voulez pas le serveur et souhaitez construire le client
       seulement.
     </para>
-
     <para>
       <option>-DWITH_EMBEDDED_SERVER=ON</option> : Ce paramètre active la compilation
       de la bibliothèque du serveur embarqué utilisée par certaines applications
       comme
       <application>Amarok</application>.
     </para>
-
     <note><para>
       Il y a de nombreuses options disponible pour <command>cmake</command>.
       Vérifier la sortie de <command>cmake . -LH</command> pour des options 
       de personnalisation supplémentaires.
     </para></note>
-
-
   </sect2>
-
   <sect2 role="configuration">
     <title>Configuration de MySQL</title>
-
     <sect3 id="mariadb-config">
       <title>Config Files</title>
-
       <para>
         <filename>/etc/mysql/my.cnf</filename> et
         <filename>~/.my.cnf</filename>
       </para>
-
       <indexterm zone="mariadb mariadb-config">
         <primary sortas="e-AA.my.cnf">~/.my.cnf</primary>
       </indexterm>
-
       <indexterm zone="mariadb mariadb-config">
         <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
       </indexterm>
-
     </sect3>
-
     <sect3>
       <title>Information de Configuration</title>
-
       <para>
         Créez un fichier <filename>/etc/mysql/my.cnf</filename> basique
         en utilisant la commande suivante en tant qu'utilisateur <systemitem
         class="username">root</systemitem> :
       </para>
-
-<screen role="root"><userinput>install -v -dm 755 /etc/mysql &&
+<screen role="root">
+<userinput>install -v -dm 755 /etc/mysql &&
 cat > /etc/mysql/my.cnf << "EOF"
 <literal># Begin /etc/mysql/my.cnf
-
 # The following options will be passed to all MySQL clients
 [client]
 #password       = your_password
 port            = 3306
 socket          = /run/mysqld/mysqld.sock
-
 # The MySQL server
 [mysqld]
 port            = 3306
@@ -246,17 +207,13 @@
 sort_buffer_size = 512K
 net_buffer_length = 16K
 myisam_sort_buffer_size = 8M
-
 # Don't listen on a TCP/IP port at all.
 skip-networking
-
-# required unique id between 1 et 2^32 - 1
+# required unique id between 1 and 2^32 - 1
 server-id       = 1
-
 # Uncomment the following if you are using BDB tables
 #bdb_cache_size = 4M
 #bdb_max_lock = 10000
-
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = /srv/mysql
 #innodb_data_file_path = ibdata1:10M:autoextend
@@ -270,54 +227,48 @@
 #innodb_log_buffer_size = 8M
 #innodb_flush_log_at_trx_commit = 1
 #innodb_lock_wait_timeout = 50
-
 [mysqldump]
 quick
 max_allowed_packet = 16M
-
 [mysql]
 no-auto-rehash
 # Remove the next comment character if you are not familiar with SQL
 #safe-updates
-
 [isamchk]
 key_buffer = 20M
 sort_buffer_size = 20M
 read_buffer = 2M
 write_buffer = 2M
-
 [myisamchk]
 key_buffer_size = 20M
 sort_buffer_size = 20M
 read_buffer = 2M
 write_buffer = 2M
-
 [mysqlhotcopy]
 interactive-timeout
-
 # End /etc/mysql/my.cnf</literal>
-EOF</userinput></screen>
-
+EOF</userinput>
+</screen>
       <para>
         Vous pouvez maintenant installez une base de données et changer 
 	le propriétaire en utilisateur et groupe sans privilèges (
 	à faire en tant qu'utilisateur <systemitem
         class="username">root</systemitem> ):
       </para>
-
-<screen role="root"><userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &&
-chown -R mysql:mysql /srv/mysql</userinput></screen>
-
+<screen role="root">
+<userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &&
+chown -R mysql:mysql /srv/mysql</userinput>
+</screen>
       <para>
         Les configurations suivantes demandent que le serveur
         <application>MariaDB</application> soit lancé. Démarrez le serveur
         en utilisant les commandes suivantes en tant qu'utilisateur <systemitem
         class="username">root</systemitem> :
       </para>
-
-<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /var/run/mysqld &&
-mysqld_safe --user=mysql 2>&1 >/dev/null &</userinput></screen>
-
+<screen role="root">
+<userinput>install -v -m755 -o mysql -g mysql -d /var/run/mysqld &&
+mysqld_safe --user=mysql 2>&1 >/dev/null &</userinput>
+</screen>
       <para>
         Une installation par défaut n'initialise pas un mot de passe
 	pour l'administrateur, aussi utilisez la commande suivante en tant
@@ -325,47 +276,40 @@
         class="username">root</systemitem> pour l'initialiser. Remplacez
         <replaceable><new-password></replaceable> par le votre.
       </para>
-
-<screen role="root"><userinput>mysqladmin -u root password <replaceable><new-password></replaceable></userinput></screen>
-
+<screen role="root">
+<userinput>mysqladmin -u root password <replaceable><new-password></replaceable></userinput>
+</screen>
       <para>
         La configuration du serveur est maintenant terminée. Arrêtez le serveur
 	en utilisant la commande suivante en tant qu'utilisateur <systemitem
         class="username">root</systemitem> :
       </para>
-
-<screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
-
+<screen role="root">
+<userinput>mysqladmin -p shutdown</userinput>
+</screen>
     </sect3>
-
     <sect3 id="mariadb-init">
       <title>Script de démarrage</title>
-
       <para>
         Installez le script d'initialisation <filename>/etc/rc.d/init.d/mysql</filename>
 	inclus dans le paquet <xref linkend="bootscripts"/> en tant qu'utilisateur
         <systemitem class="username">root</systemitem> pour démarrer le serveur
         <application>MariaDB</application> au démarrage du système.
       </para>
-
       <indexterm zone="mariadb mariadb-init">
         <primary sortas="f-mysql">mysql</primary>
       </indexterm>
-
-<screen role="root"><userinput>make install-mysql</userinput></screen>
-
+<screen role="root">
+<userinput>make install-mysql</userinput>
+</screen>
     </sect3>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoires installés</segtitle>
-
       <seglistitem>
         <seg>
           aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log, 
@@ -395,22 +339,17 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <bridgehead renderas="sect3">Description courte</bridgehead>
-
     <para>
       Les descriptions de tous les programmes et bibliothèques prendraient
       plusieurs pages. A la place, consultez les pages de man ou la documentation
       en ligne <ulink
       url="https://mariadb.com/kb/en/mariadb-documentation/"/>.
     </para>
-
     <para>
       The <application>Perl</application> DBI modules must be installed
       for some of the <application>MariaDB</application> support programs to
       function properly.
     </para>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/server/mail/dovecot.xml
===================================================================
--- trunk/blfs/server/mail/dovecot.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/server/mail/dovecot.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -89,16 +89,24 @@
     </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 :
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --localstatedir=/var             --libexecdir=/usr/lib             --docdir=/usr/share/doc/dovecot-&dovecot-version;             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --libexecdir=/usr/lib \
+            --with-moduledir=/usr/lib/dovecot/modules \
+            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make check</command>.</para>
@@ -182,7 +190,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/exim.xml
===================================================================
--- trunk/blfs/server/mail/exim.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/server/mail/exim.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -93,7 +93,10 @@
     <para>Installez <application>Exim</application> avec les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'     -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,'     -e 's,^EXIM_USER.*$,EXIM_USER=exim,'     -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &&
+<userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' \
+    -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
+    -e 's,^EXIM_USER.*$,EXIM_USER=exim,' \
+    -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -103,7 +106,7 @@
 install -v -m644 doc/exim.8 /usr/share/man/man8 &&
 install -v -d -m755 /usr/share/doc/exim-&exim-version; &&
 install -v -m644 doc/* /usr/share/doc/exim-&exim-version; &&
-ln -sv exim /usr/sbin/sendmail</userinput>
+ln -sfv exim /usr/sbin/sendmail</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/server/major/bind.xml
===================================================================
--- trunk/blfs/server/major/bind.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/server/major/bind.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -94,7 +94,13 @@
     <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        &&
+<userinput>./configure --prefix=/usr           \
+            --sysconfdir=/etc       \
+            --localstatedir=/var    \
+            --mandir=/usr/share/man \
+            --enable-threads        \
+            --with-libtool          \
+            --disable-static        &&
 make</userinput>
 </screen>
     <para>Exécutez les commandes suivantes pour lancer la suite de tests complète.
@@ -124,8 +130,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	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/server/other/openldap.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -102,9 +102,15 @@
 <userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &&
 patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &&
 autoconf &&
-./configure --prefix=/usr                 --sysconfdir=/etc             --enable-dynamic              --disable-debug               --disable-slapd &&
+./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-dynamic  \
+            --disable-debug   \
+            --disable-slapd &&
 make depend &&
-make</userinput>
+make &&
+make install</userinput>
 </screen>
             </note>
     <para>
@@ -115,7 +121,8 @@
     </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
@@ -124,7 +131,21 @@
 <userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &&
 patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &&
 autoconf &&
-./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       \
+            --enable-dynamic      \
+            --enable-crypt        \
+            --enable-spasswd      \
+            --enable-modules      \
+            --enable-rlookups     \
+            --enable-backends=mod \
+            --enable-overlays=mod \
+            --disable-ndb         \
+            --disable-sql &&
 make depend &&
 make</userinput>
 </screen>

Modified: trunk/blfs/x/installing/libxcb.xml
===================================================================
--- trunk/blfs/x/installing/libxcb.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/libxcb.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -70,10 +70,10 @@
     <para>Installez <application>libxcb</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../libxcb-&libxcb-version;-automake_bug-1.patch &&
-sed -e "s/pthread-stubs//" -i configure.ac &&
-autoreconf -fi &&
-./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version;             --enable-xinput --enable-xkb &&
+<userinput>sed -e "s/pthread-stubs//" -i configure.ac &&
+autoreconf -fiv &&
+./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; \
+            --enable-xinput --enable-xkb &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/x/installing/mesalib.xml
===================================================================
--- trunk/blfs/x/installing/mesalib.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/mesalib.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -154,7 +154,22 @@
     suivantes :</para>
 <screen>
 <userinput>autoreconf -fi &&
-./configure CFLAGS="-O2" CXXFLAGS="-O2"                --prefix=$XORG_PREFIX                      --sysconfdir=/etc                          --enable-texture-float                     --enable-gles1                             --enable-gles2                             --enable-openvg                            --enable-osmesa                            --enable-xa                                --enable-gbm                               --enable-gallium-egl                       --enable-gallium-gbm                       --enable-glx-tls                           --with-llvm-shared-libs                    --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-openvg                \
+            --enable-osmesa                \
+            --enable-xa                    \
+            --enable-gbm                   \
+            --enable-gallium-egl           \
+            --enable-gallium-gbm           \
+            --enable-glx-tls               \
+            --with-llvm-shared-libs        \
+            --with-egl-platforms="drm,x11" \
+            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/installing/x7driver-glamor.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-glamor.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/x7driver-glamor.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -57,7 +57,6 @@
           </para>
         </listitem>
       </itemizedlist>
-
       <bridgehead renderas="sect4">Dépendances de Glamor EGL</bridgehead>
       <bridgehead renderas="sect5">Requises</bridgehead>
       <para role="required">
@@ -74,9 +73,7 @@
          
       </para>
 <screen>
-<userinput>patch -Np1 -i ../glamor-egl-&glamor-egl-version;-fixes-1.patch &&
-autoreconf -fi &&
-./configure $XORG_CONFIG --enable-glx-tls &&
+<userinput>./configure $XORG_CONFIG --enable-glx-tls &&
 make</userinput>
 </screen>
       <para>

Modified: trunk/blfs/x/installing/x7driver-intel.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-intel.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/x7driver-intel.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -95,7 +95,9 @@
          
       </para>
 <screen>
-<userinput>./configure $XORG_CONFIG --enable-kms-only --with-default-accel=sna &&
+<userinput>./configure $XORG_CONFIG \
+            --enable-kms-only \
+            --with-default-accel=sna &&
 make</userinput>
 </screen>
       <para>
@@ -135,7 +137,8 @@
         <filename>/etc/X11/xorg.conf</filename> suivant en tant qu'utilisateur
 	<systemitem class="username">root</systemitem>:
       </para>
-<screen role="root"><userinput>cat >> /etc/X11/xorg.conf << "EOF"
+<screen role="root">
+<userinput>cat >> /etc/X11/xorg.conf << "EOF"
 <literal>Section "Module"
         Load "dri2"
         Load "glamoregl"
@@ -145,7 +148,8 @@
         Driver "intel"
         Option "AccelMethod" "glamor"
 EndSection</literal>
-EOF</userinput></screen>
+EOF</userinput>
+</screen>
     </sect3>
     <sect3 role="content">
       <title>Contenu</title>

Modified: trunk/blfs/x/installing/x7driver-nouveau.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-nouveau.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/x7driver-nouveau.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -11,7 +11,6 @@
   <!ENTITY xorg-nouveau-driver-buildsize     "13 Mo">
   <!ENTITY xorg-nouveau-driver-time          "0.1 SBU">
 ]>
-
  
   <sect2 id="xorg-nouveau-driver" xreflabel="Xorg Nouveau Driver-&xorg-nouveau-driver-version;">
     <title>Xorg Nouveau Driver-&xorg-nouveau-driver-version;</title>
@@ -134,4 +133,4 @@
     </sect3>
   </sect2>
   
- 
\ No newline at end of file
+ 

Modified: trunk/blfs/x/installing/x7lib.xml
===================================================================
--- trunk/blfs/x/installing/x7lib.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/x7lib.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -160,7 +160,8 @@
 &libXxf86vm-md5sum;  libXxf86vm-&libXxf86vm-version;.tar.bz2
 &libdmx-md5sum;  libdmx-&libdmx-version;.tar.bz2
 &libpciaccess-md5sum;  libpciaccess-&libpciaccess-version;.tar.bz2
-&libxkbfile-md5sum;  libxkbfile-&libxkbfile-version;.tar.bz2</literal>
+&libxkbfile-md5sum;  libxkbfile-&libxkbfile-version;.tar.bz2
+&libxshmfence-md5sum;  libxshmfence-&libxshmfence-version;.tar.bz2</literal>
 EOF</userinput>
 </screen>
     <para>Pour télécharger les fichiers nécessaires en utilisant <application>wget</application>,
@@ -168,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>
@@ -189,12 +191,23 @@
   tar -xf $package
   pushd $packagedir
   case $packagedir in
+    libFS-[0-9]* )
+      sed -e '/#include <X11/ i\#include <X11\/Xtrans\/Xtransint.h>' \
+          -e 's/_FSTransReadv(svr->trans_conn/readv(svr->trans_conn->fd/' \
+          -i src/FSlibInt.c
+      ./configure $XORG_CONFIG
+    ;;
     libXfont-[0-9]* )
       ./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
     ;;
+    libxshmfence-[0-9]* )
+      autoreconf -fiv
+      ./configure $XORG_CONFIG
+    ;;
     * )
       ./configure $XORG_CONFIG
     ;;

Modified: trunk/blfs/x/installing/x7proto.xml
===================================================================
--- trunk/blfs/x/installing/x7proto.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/x7proto.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -123,11 +123,13 @@
 &damageproto-md5sum;  damageproto-&damageproto-version;.tar.bz2
 &dmxproto-md5sum;  dmxproto-&dmxproto-version;.tar.bz2
 &dri2proto-md5sum;  dri2proto-&dri2proto-version;.tar.bz2
+&dri3proto-md5sum;  dri3proto-&dri3proto-version;.tar.bz2
 &fixesproto-md5sum;  fixesproto-&fixesproto-version;.tar.bz2
 &fontsproto-md5sum;  fontsproto-&fontsproto-version;.tar.bz2
 &glproto-md5sum;  glproto-&glproto-version;.tar.bz2
 &inputproto-md5sum;  inputproto-&inputproto-version;.tar.bz2
 &kbproto-md5sum;  kbproto-&kbproto-version;.tar.bz2
+&presentproto-md5sum;  presentproto-&presentproto-version;.tar.bz2
 &randrproto-md5sum;  randrproto-&randrproto-version;.tar.bz2
 &recordproto-md5sum;  recordproto-&recordproto-version;.tar.bz2
 &renderproto-md5sum;  renderproto-&renderproto-version;.tar.bz2
@@ -149,7 +151,8 @@
 <screen>
 <userinput>mkdir proto &&
 cd proto &&
-grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c     -B http://xorg.freedesktop.org/releases/individual/proto/ &&
+grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
+    -B http://xorg.freedesktop.org/releases/individual/proto/ &&
 md5sum -c ../proto-&xorg-version;.md5</userinput>
 </screen>
   </sect2>

Modified: trunk/blfs/x/installing/xorg-server.xml
===================================================================
--- trunk/blfs/x/installing/xorg-server.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/installing/xorg-server.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -83,7 +83,9 @@
 <userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput>
 </screen>
 <screen>
-<userinput>./configure $XORG_CONFIG            --with-xkb-output=/var/lib/xkb            --enable-install-setuid &&
+<userinput>./configure $XORG_CONFIG \
+           --with-xkb-output=/var/lib/xkb \
+           --enable-install-setuid &&
 make</userinput>
 </screen>
     <para>Pour tester la construction, tapez : <command>make check</command>.</para>
@@ -92,8 +94,8 @@
 <userinput>make install &&
 mkdir -pv /etc/X11/xorg.conf.d &&
 cat >> /etc/sysconfig/createfiles << "EOF"
-/tmp/.ICE-unix dir 1777 root root
-/tmp/.X11-unix dir 1777 root root
+<literal>/tmp/.ICE-unix dir 1777 root root
+/tmp/.X11-unix dir 1777 root root</literal>
 EOF</userinput>
 </screen>
   </sect2>

Modified: trunk/blfs/x/lib/at-spi2-core.xml
===================================================================
--- trunk/blfs/x/lib/at-spi2-core.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/lib/at-spi2-core.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -92,7 +92,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --libexecdir=/usr/lib/at-spi2-core &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/at-spi2-core &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/lib/gtk+3.xml
===================================================================
--- trunk/blfs/x/lib/gtk+3.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/lib/gtk+3.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -104,14 +104,18 @@
       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>
       Pour tester les résultats :
     </para>
 <screen>
-<userinput>make -k check</userinput>
+<userinput>make check</userinput>
 </screen>
     <para>
       Maintenant, en tant qu'utilisateur<systemitem class="username">root</systemitem> :

Modified: trunk/blfs/x/lib/pango.xml
===================================================================
--- trunk/blfs/x/lib/pango.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/lib/pango.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -142,7 +142,9 @@
       commandes 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/x/lib/qt4.xml
===================================================================
--- trunk/blfs/x/lib/qt4.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/lib/qt4.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -187,6 +187,8 @@
 <screen>
 <userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
      config.tests/unix/libmng/libmng.cpp &&
+sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
+     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &&
 ./configure -prefix         /usr                 \
             -bindir         /usr/lib/qt4/bin     \
             -plugindir      /usr/lib/qt4/plugins \
@@ -220,7 +222,9 @@
       Enlevez les références au répertoire de construction dans les fichiers
       <filename class="extension">.pc</filename> en lançant la commande suivante:
     </para>
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
+<screen>
+<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> :
     </para>
@@ -246,11 +250,10 @@
 <screen role="root">
 <userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
             Designer Gui Help Multimedia Network OpenGL Script \
-            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml
+            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon
 do
-  sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
-       /usr/lib/libQt${file}.prl
-  perl -pi -e "s, -L$PWD/?\S+,,g" /usr/lib/pkgconfig/Qt${file}.pc
+  [ -e /usr/lib/libQt${file}.prl ] && sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
+                                              /usr/lib/libQt${file}.prl
 done
 unset file</userinput>
 </screen>
@@ -283,6 +286,8 @@
 <screen>
 <userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
      config.tests/unix/libmng/libmng.cpp &&
+sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
+     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &&
 export QTDIR=/opt/qt-&qt4-version;
 ./configure -prefix $QTDIR       \
             -sysconfdir /etc/xdg \
@@ -325,12 +330,10 @@
       <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
-            Designer Gui Help Multimedia Network OpenGL Script \
-            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml; do
+<userinput>for file in `basename -a -s .prl $QTDIR/lib/lib*.prl`; do
   sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
-       $QTDIR/lib/libQt${file}.prl
-  perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/Qt${file}.pc
+       $QTDIR/lib/${file}.prl
+  perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
 done
 unset file</userinput>
 </screen>

Modified: trunk/blfs/x/lib/qt5.xml
===================================================================
--- trunk/blfs/x/lib/qt5.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/lib/qt5.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -245,7 +245,7 @@
 <screen role="root">
 <userinput>sed -i -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
     /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap.pri &&
-find /usr/lib/*.prl -exec sed -i -e \
+find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -e \
      '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/lib/webkitgtk2.xml
===================================================================
--- trunk/blfs/x/lib/webkitgtk2.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/lib/webkitgtk2.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -115,7 +115,9 @@
       Installez <application>WebKitGTK+</application> en lançant les commandes suivantes
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                                --libexecdir=/usr/lib/webkitgtk3             --enable-introspection &&
+<userinput>./configure --prefix=/usr                    \
+            --libexecdir=/usr/lib/webkitgtk3 \
+            --enable-introspection &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/lib/xulrunner.xml
===================================================================
--- trunk/blfs/x/lib/xulrunner.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/lib/xulrunner.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -181,11 +181,14 @@
 ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &&
 chmod -v 755 /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &&
 for library in libmozalloc.so libmozjs.so libxul.so; do
-    ln -sfv ../../../xulrunner-&xulrunner-version;/$library             /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library
+    ln -sfv ../../../xulrunner-&xulrunner-version;/$library \
+            /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library
     ln -sfv xulrunner-&xulrunner-version;/$library /usr/lib/$library
 done
-ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh         /usr/lib/xulrunner-&xulrunner-version;
-ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell         /usr/lib/xulrunner-&xulrunner-version;</userinput>
+ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh \
+        /usr/lib/xulrunner-&xulrunner-version;
+ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
+        /usr/lib/xulrunner-&xulrunner-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/x/wm/icewm.xml
===================================================================
--- trunk/blfs/x/wm/icewm.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/x/wm/icewm.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -71,9 +71,9 @@
     <para>This package does not have a working testsuite.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make install &&
-make install-docs &&
-make install-man &&
+<userinput>make install         &&
+make install-docs    &&
+make install-man     &&
 make install-desktop</userinput>
 </screen>
   </sect2>
@@ -128,11 +128,11 @@
       <para>Now create the <application>IceWM</application> configuration
       files:</para>
 <screen>
-<userinput>mkdir -v ~/.icewm &&
-cp -v /usr/share/icewm/keys ~/.icewm/keys &&
-cp -v /usr/share/icewm/menu ~/.icewm/menu &&
-cp -v /usr/share/icewm/preferences ~/.icewm/preferences &
-cp -v /usr/share/icewm/toolbar ~/.icewm/toolbar &
+<userinput>mkdir -v ~/.icewm                                       &&
+cp -v /usr/share/icewm/keys ~/.icewm/keys               &&
+cp -v /usr/share/icewm/menu ~/.icewm/menu               &&
+cp -v /usr/share/icewm/preferences ~/.icewm/preferences &&
+cp -v /usr/share/icewm/toolbar ~/.icewm/toolbar         &&
 cp -v /usr/share/icewm/winoptions ~/.icewm/winoptions</userinput>
 </screen>
       <para>You can now edit these files to meet your requirements. In particular,

Modified: trunk/blfs/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/blfs/xsoft/graphweb/firefox.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/xsoft/graphweb/firefox.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -50,7 +50,6 @@
         <para>Estimation du temps de construction : &firefox-time;</para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de Firefox</bridgehead>
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
@@ -174,7 +173,6 @@
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
 EOF</userinput>
 </screen>
-
     <para>
   Compilez <application>Firefox</application> en lançant les commandes
     suivantes :</para>
@@ -203,7 +201,8 @@
 <screen role="root">
 <userinput>rm -rf /usr/lib/firefox-&firefox-version; &&
 mkdir  /usr/lib/firefox-&firefox-version; &&
-tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2     -C /usr/lib/firefox-&firefox-version; --strip-components=1 &&
+tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2 \
+    -C /usr/lib/firefox-&firefox-version; --strip-components=1 &&
 chown -R -v root:root /usr/lib/firefox-&firefox-version; &&
 ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &&
 mkdir -pv /usr/lib/mozilla/plugins &&
@@ -292,7 +291,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	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/xsoft/graphweb/seamonkey.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -168,7 +168,8 @@
 <screen role="root">
 <userinput>rm -rf    /usr/lib/seamonkey-&seamonkey-version; &&
 mkdir -pv /usr/lib/seamonkey-&seamonkey-version; &&
-tar -xf moz-build-dir/mozilla/dist/seamonkey-&seamonkey-version;.en-US.linux-$(uname -m).tar.bz2   -C /usr/lib/seamonkey-&seamonkey-version; --strip-components=1  &&
+tar -xf moz-build-dir/mozilla/dist/seamonkey-&seamonkey-version;.en-US.linux-$(uname -m).tar.bz2 \
+  -C /usr/lib/seamonkey-&seamonkey-version; --strip-components=1  &&
 ln -sfv ../lib/seamonkey-&seamonkey-version;/seamonkey /usr/bin   &&
 mkdir -pv /usr/lib/mozilla/plugins                   &&
 ln -sfv ../mozilla/plugins /usr/lib/seamonkey-&seamonkey-version; &&
@@ -269,7 +270,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/abiword.xml
===================================================================
--- trunk/blfs/xsoft/office/abiword.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/xsoft/office/abiword.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -189,7 +189,8 @@
       dedans le <filename>normal.awt</filename> que vous voulez :</para>
 <screen>
 <userinput>install -v -m750 -d ~/.AbiSuite/templates &&
-install -v -m640    /usr/share/abiword-&AbiWord-minor-version;/templates/normal.awt-<replaceable><lang></replaceable>                     ~/.AbiSuite/templates/normal.awt</userinput>
+install -v -m640    /usr/share/abiword-&AbiWord-minor-version;/templates/normal.awt-<replaceable><lang></replaceable> \
+                    ~/.AbiSuite/templates/normal.awt</userinput>
 </screen>
       <para>Modifiez <replaceable><lang></replaceable> par la 
       commande ci-dessus pour mettre le nom du fichier que vous voulez.</para>

Modified: trunk/blfs/xsoft/office/libreoffice.xml
===================================================================
--- trunk/blfs/xsoft/office/libreoffice.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/xsoft/office/libreoffice.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -265,11 +265,48 @@
        en lançant les commandes 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 &&
 chmod -v +x bin/unpack-sources &&
-sed -e "s/target.mk/langlist.mk/"                    -e "s/tar -xf/tar -x --strip-components=1 -f/"     -e "/tar -x/s/lo_src_dir/start_dir/"               -i bin/unpack-sources &&
-./autogen.sh --prefix=/usr                           --sysconfdir=/etc                       --with-vendor="BLFS"                    --with-lang="en-US pt-BR"               --with-help                             --with-alloc=system                     --without-java                          --disable-gconf                         --disable-odk                           --disable-postgresql-sdbc               --enable-python=system                  --with-system-boost                     --with-system-clucene                   --with-system-cairo                     --with-system-curl                      --with-system-expat                     --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-np
 api-headers              --with-system-nss                       --with-system-odbc                      --with-system-openldap                  --with-system-openssl                   --with-system-poppler                   --with-system-redland                   --with-system-zlib                      --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput>
+sed -e "s/target\.mk/langlist\.mk/"                \
+    -e "s/tar -xf/tar -x --strip-components=1 -f/" \
+    -e "/tar -x/s/lo_src_dir/start_dir/"           \
+    -i bin/unpack-sources &&
+./autogen.sh --prefix=/usr              \
+             --sysconfdir=/etc          \
+             --with-vendor="BLFS"       \
+             --with-lang="en-US pt-BR"  \
+             --with-help                \
+             --with-alloc=system        \
+             --without-java             \
+             --disable-gconf            \
+             --disable-odk              \
+             --disable-postgresql-sdbc  \
+             --enable-python=system     \
+             --with-system-boost        \
+             --with-system-clucene      \
+             --with-system-cairo        \
+             --with-system-curl         \
+             --with-system-expat        \
+             --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
@@ -313,7 +350,8 @@
 <userinput>mkdir -pv /usr/share/pixmaps &&
 for i in writer base calc draw impress math startcenter writer
 do
-  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png           /usr/share/pixmaps/
+  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
+          /usr/share/pixmaps/
 done
 unset i</userinput>
 </screen>

Modified: trunk/blfs/xsoft/other/gimp.xml
===================================================================
--- trunk/blfs/xsoft/other/gimp.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/xsoft/other/gimp.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -136,7 +136,8 @@
     sa première langue, le catalan ("ca") mais ceux qui souhaitent construire les langues restantes peuvent
     préparer la construction avec la commande suivante:</para>
 <screen>
-<userinput>ALL_LINGUAS="da de el en en_GB es fi fr hr it ja ko lt nl nn pl ru sl sv zh_CN" ./configure --prefix=/usr &&</userinput>
+<userinput>ALL_LINGUAS="da de el en en_GB es fi fr hr it ja ko lt nl nn pl ru sl sv zh_CN" \
+./configure --prefix=/usr &&</userinput>
 </screen>
  
     <para>Effacez de <envar>ALL_LINGUAS</envar> les codes de toutes les langues que vous ne souhaitez
@@ -144,7 +145,8 @@
     <para>Alternativement, si vous souhaitez construire des langues incluant le catalan,
     appliquez le correctif:</para>
 <screen role="nodump">
-<userinput>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz  | patch -p1 &&
+<userinput>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz \
+ | patch -p1 &&
 ./autogen.sh --prefix=/usr &&</userinput>
 </screen>
     <para>De nouveau, vous pouvez spécifier un sous-ensembles de langues en spécifiant

Modified: trunk/blfs/xsoft/other/thunderbird.xml
===================================================================
--- trunk/blfs/xsoft/other/thunderbird.xml	2013-11-17 16:22:44 UTC (rev 5118)
+++ trunk/blfs/xsoft/other/thunderbird.xml	2013-11-17 17:33:52 UTC (rev 5119)
@@ -164,7 +164,8 @@
     suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &&
-tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2     -C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1 &&
+tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
+    -C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1 &&
 ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput>
 </screen>
     <para>
@@ -260,7 +261,8 @@
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
 StartupNotify=true</literal>
 EOF
-ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png         /usr/share/pixmaps/thunderbird.png</userinput>
+ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
+        /usr/share/pixmaps/thunderbird.png</userinput>
 </screen>
     </sect3>
   </sect2>




More information about the lfs-traducfr mailing list