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

myou72 at orange.fr myou72 at orange.fr
Dim 27 Oct 12:13:19 PDT 2013


Author: myou72
Date: 2013-10-27 20:13:19 +0100 (Sun, 27 Oct 2013)
New Revision: 4938

Modified:
   trunk/blfs/general/genlib/apr.xml
   trunk/blfs/general/genlib/clucene.xml
   trunk/blfs/general/genlib/glib2.xml
   trunk/blfs/general/genlib/libiodbc.xml
   trunk/blfs/general/genlib/libusb.xml
   trunk/blfs/general/genlib/libxml2.xml
   trunk/blfs/general/genutils/graphviz.xml
   trunk/blfs/general/genutils/imagemagick.xml
   trunk/blfs/general/genutils/screen.xml
   trunk/blfs/general/genutils/unixodbc.xml
   trunk/blfs/general/graphlib/babl.xml
   trunk/blfs/general/graphlib/fontconfig.xml
   trunk/blfs/general/graphlib/gegl.xml
   trunk/blfs/general/graphlib/harfbuzz.xml
   trunk/blfs/general/graphlib/libjpeg-turbo.xml
   trunk/blfs/general/graphlib/librsvg.xml
   trunk/blfs/general/graphlib/qpdf.xml
   trunk/blfs/general/prog/cmake.xml
   trunk/blfs/general/prog/cvs.xml
   trunk/blfs/general/prog/git.xml
   trunk/blfs/general/prog/lua.xml
   trunk/blfs/general/prog/npapi-sdk.xml
   trunk/blfs/general/prog/openjdk.xml
   trunk/blfs/general/prog/perl-modules.xml
   trunk/blfs/general/prog/php.xml
   trunk/blfs/general/prog/tcl.xml
   trunk/blfs/general/prog/tk.xml
   trunk/blfs/general/sysutils/autofs.xml
   trunk/blfs/general/sysutils/colord.xml
   trunk/blfs/general/sysutils/dbus.xml
   trunk/blfs/general/sysutils/sysstat.xml
   trunk/blfs/general/sysutils/udev-extras.xml
   trunk/blfs/general/sysutils/udisks2.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/totem.xml
   trunk/blfs/gnome/platform/accountsservice.xml
   trunk/blfs/gnome/platform/dconf.xml
   trunk/blfs/gnome/platform/gcr.xml
   trunk/blfs/gnome/platform/gtksourceview.xml
   trunk/blfs/gnome/platform/gvfs.xml
   trunk/blfs/gnome/platform/libpeas.xml
   trunk/blfs/gnome/platform/totem-pl-parser.xml
   trunk/blfs/gnome/platform/vte.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/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/lxde/apps/apps.xml
   trunk/blfs/lxde/desktop/desktop.xml
   trunk/blfs/lxde/desktop/libfm.xml
   trunk/blfs/lxde/desktop/lxappearance.xml
   trunk/blfs/lxde/desktop/lxde-common.xml
   trunk/blfs/lxde/desktop/lxde-icon-theme.xml
   trunk/blfs/lxde/desktop/lxmenu-data.xml
   trunk/blfs/lxde/desktop/lxpanel.xml
   trunk/blfs/lxde/desktop/lxpolkit.xml
   trunk/blfs/lxde/desktop/lxsession.xml
   trunk/blfs/lxde/desktop/menu-cache.xml
   trunk/blfs/lxde/desktop/pcmanfm.xml
   trunk/blfs/lxde/lxde.xml
   trunk/blfs/multimedia/audioutils/mpg123.xml
   trunk/blfs/multimedia/audioutils/pnmixer.xml
   trunk/blfs/multimedia/cdwriteutils/k3b.xml
   trunk/blfs/multimedia/libdriv/alsa-plugins.xml
   trunk/blfs/multimedia/libdriv/fdk-aac.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/libass.xml
   trunk/blfs/multimedia/libdriv/libquicktime.xml
   trunk/blfs/multimedia/libdriv/libvpx.xml
   trunk/blfs/multimedia/libdriv/opal.xml
   trunk/blfs/multimedia/libdriv/opus.xml
   trunk/blfs/multimedia/libdriv/taglib.xml
   trunk/blfs/multimedia/libdriv/x264.xml
   trunk/blfs/multimedia/libdriv/xine-lib.xml
   trunk/blfs/multimedia/videoutils/ffmpeg.xml
   trunk/blfs/multimedia/videoutils/transcode.xml
   trunk/blfs/multimedia/videoutils/vlc.xml
   trunk/blfs/networking/mailnews/re-alpine.xml
   trunk/blfs/networking/netlibs/curl.xml
   trunk/blfs/networking/netlibs/glib-networking.xml
   trunk/blfs/networking/netlibs/ldns.xml
   trunk/blfs/networking/netlibs/libnl.xml
   trunk/blfs/networking/netlibs/libpcap.xml
   trunk/blfs/networking/netlibs/libtirpc.xml
   trunk/blfs/networking/netprogs/ntp.xml
   trunk/blfs/networking/netprogs/rsync.xml
   trunk/blfs/networking/netprogs/samba.xml
   trunk/blfs/networking/netutils/networkmanager.xml
   trunk/blfs/networking/netutils/wireshark.xml
   trunk/blfs/networking/textweb/links.xml
   trunk/blfs/postlfs/config/profile.xml
   trunk/blfs/postlfs/editors/emacs.xml
   trunk/blfs/postlfs/filesystems/fuse.xml
   trunk/blfs/postlfs/filesystems/lvm2.xml
   trunk/blfs/postlfs/security/consolekit.xml
   trunk/blfs/postlfs/security/gnupg2.xml
   trunk/blfs/postlfs/security/gnutls.xml
   trunk/blfs/postlfs/security/libcap.xml
   trunk/blfs/postlfs/security/libcap2.xml
   trunk/blfs/postlfs/security/linux-pam.xml
   trunk/blfs/postlfs/security/nss.xml
   trunk/blfs/postlfs/security/openssh.xml
   trunk/blfs/postlfs/security/openssl.xml
   trunk/blfs/postlfs/security/polkit.xml
   trunk/blfs/postlfs/virtualization/qemu.xml
   trunk/blfs/pst/printing/cups-filters.xml
   trunk/blfs/pst/ps/a2ps.xml
   trunk/blfs/pst/scanning/sane.xml
   trunk/blfs/server/databases/mysql.xml
   trunk/blfs/server/databases/postgresql.xml
   trunk/blfs/server/databases/sqlite.xml
   trunk/blfs/server/mail/dovecot.xml
   trunk/blfs/server/major/bind.xml
   trunk/blfs/server/other/soprano.xml
   trunk/blfs/server/other/unbound.xml
   trunk/blfs/x/installing/mesalib.xml
   trunk/blfs/x/installing/x7app.xml
   trunk/blfs/x/installing/x7driver-evdev.xml
   trunk/blfs/x/installing/x7driver-fbdev.xml
   trunk/blfs/x/installing/x7driver-r128.xml
   trunk/blfs/x/installing/xorg-server.xml
   trunk/blfs/x/lib/agg.xml
   trunk/blfs/x/lib/at-spi2-core.xml
   trunk/blfs/x/lib/gtk+2.xml
   trunk/blfs/x/lib/gtk+3.xml
   trunk/blfs/x/lib/pango.xml
   trunk/blfs/x/lib/qt4.xml
   trunk/blfs/x/lib/webkitgtk2.xml
   trunk/blfs/x/lib/xulrunner.xml
   trunk/blfs/xsoft/graphweb/firefox.xml
   trunk/blfs/xsoft/graphweb/seamonkey.xml
   trunk/blfs/xsoft/office/libreoffice.xml
   trunk/blfs/xsoft/other/gnash.xml
   trunk/blfs/xsoft/other/gparted.xml
   trunk/blfs/xsoft/other/icedtea-web.xml
   trunk/blfs/xsoft/other/thunderbird.xml
Log:
synchro screen

Modified: trunk/blfs/general/genlib/apr.xml
===================================================================
--- trunk/blfs/general/genlib/apr.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genlib/apr.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -78,8 +78,9 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-static \
-  --with-installbuilddir=/usr/share/apr-1/build &&
+<userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --with-installbuilddir=/usr/share/apr-1/build &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/genlib/clucene.xml
===================================================================
--- trunk/blfs/general/genlib/clucene.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genlib/clucene.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -51,13 +51,11 @@
        </listitem>
      </itemizedlist>
     <bridgehead renderas="sect3">Dépendances de CLucene</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="git"/> et
       <xref linkend="cmake"/>
     </para>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="boost"/>
@@ -73,45 +71,41 @@
       <application>CLucene</application> ensuite obtenez la version
       &clucene-version; :
     </para>   
- <screen><userinput>git clone git://clucene.git.sourceforge.net/gitroot/clucene/clucene &&
+ 
+<screen>
+<userinput>git clone git://clucene.git.sourceforge.net/gitroot/clucene/clucene &&
 cd clucene &&
-git checkout tags/clucene-src-&clucene-version;</userinput></screen>
-
+git checkout tags/clucene-src-&clucene-version;</userinput>
+</screen>
     <para>Installez <application>CLucene</application> en lançant les commandes suivvantes:</para>
-
-<screen><userinput>patch -Np1 -i ../clucene-&clucene-version;-contribs_lib-1.patch &&
+<screen>
+<userinput>patch -Np1 -i ../clucene-&clucene-version;-contribs_lib-1.patch &&
 mkdir build &&
 cd build &&
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DBUILD_CONTRIBS_LIB=ON .. &&
-make</userinput></screen>
-
+make</userinput>
+</screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="commands">
     <title>Explications des commandes</title>
-
     <para>
       <parameter>-DBUILD_CONTRIBS_LIB=ON</parameter>: Cette variable cmake
       active la construction de la bibliothèque de contribution CLucene nécessaire pour lancer
       les applications qui utilisent l'analyseurs de texte spécifique comme LibreOffice
       par exemple.
     </para>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenus</title>
-
     <segmentedlist>
       <segtitle>Programmes isntallés</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoires installés</segtitle>
-
       <seglistitem>
         <seg>None</seg>
         <seg>
@@ -125,7 +119,5 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/general/genlib/glib2.xml
===================================================================
--- trunk/blfs/general/genlib/glib2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genlib/glib2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -79,8 +79,7 @@
     
  
 <screen>
-<userinput>touch -t 201306082300 gtk-doc.make           &&
-./configure --prefix=/usr --with-pcre=system &&
+<userinput>./configure --prefix=/usr --with-pcre=system &&
 make</userinput>
 </screen>
     <para>La suite de tests de <application>GLib</application> exige

Modified: trunk/blfs/general/genlib/libiodbc.xml
===================================================================
--- trunk/blfs/general/genlib/libiodbc.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genlib/libiodbc.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -68,10 +68,13 @@
     <para>Installez <application>libiodbc</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                   \
+<userinput>patch -Np1 -i ../libiodbc-&libiodbc-version;-parallel_build-1.patch &&
+autoreconf -fiv &&
+./configure --prefix=/usr                   \
             --with-iodbc-inidir=/etc/iodbc  \
             --includedir=/usr/include/iodbc \
-            --disable-libodbc               &&
+            --disable-libodbc               \
+            --disable-static                &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests</para>

Modified: trunk/blfs/general/genlib/libusb.xml
===================================================================
--- trunk/blfs/general/genlib/libusb.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genlib/libusb.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -75,7 +75,8 @@
     les commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/apidocs &&
-install -v -m644    doc/html/*                     /usr/share/doc/libusb-&libusb-version;/apidocs</userinput>
+install -v -m644    doc/html/* \
+                    /usr/share/doc/libusb-&libusb-version;/apidocs</userinput>
 </screen>
   </sect2>
   <sect2 role="configuration">

Modified: trunk/blfs/general/genlib/libxml2.xml
===================================================================
--- trunk/blfs/general/genlib/libxml2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genlib/libxml2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -76,7 +76,7 @@
     <title>Installation de libxml2</title>
     <para>Si vous avez téléchargé la suite de tests, exécutez la commande suivante :</para>
 <screen>
-<userinput>tar xf ../xmlts20080827.tar.gz</userinput>
+<userinput>tar xf ../xmlts&testsuite-version;.tar.gz</userinput>
 </screen>
     <para>Installez <application>libxml2</application> en lançant les commandes
     suivantes :</para>

Modified: trunk/blfs/general/genutils/graphviz.xml
===================================================================
--- trunk/blfs/general/genutils/graphviz.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genutils/graphviz.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -103,7 +103,7 @@
     <para>Installez <application>Graphviz</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-static &&
+<userinput>./configure --prefix=/usr &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests qui fournisse

Modified: trunk/blfs/general/genutils/imagemagick.xml
===================================================================
--- trunk/blfs/general/genutils/imagemagick.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genutils/imagemagick.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -4,13 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
   <!ENTITY imagemagick-patch-version "3">
-  <!-- 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        "b4653beb2f2b3cc33ea26490af567700">
@@ -169,7 +163,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/genutils/screen.xml
===================================================================
--- trunk/blfs/general/genutils/screen.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genutils/screen.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -63,7 +63,10 @@
     <para>Installez <application>Screen</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                                 --with-socket-dir=/var/run/screen             --with-pty-group=5                            --with-sys-screenrc=/etc/screenrc &&
+<userinput>./configure --prefix=/usr                     \
+            --with-socket-dir=/var/run/screen \
+            --with-pty-group=5                \
+            --with-sys-screenrc=/etc/screenrc &&
 sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* &&
 make</userinput>
 </screen>

Modified: trunk/blfs/general/genutils/unixodbc.xml
===================================================================
--- trunk/blfs/general/genutils/unixodbc.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/genutils/unixodbc.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -70,14 +70,15 @@
     <para>Installez <application>unixODBC</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc/unixODBC &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc/unixODBC &&
 make</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 install &&
-find doc -name "Makefile*" -exec rm {} ; &&
+find doc -name "Makefile*" -exec rm {} \; &&
 chmod 644 doc/{lst,ProgrammerManual/Tutorial}/* &&
 install -v -m755 -d /usr/share/doc/unixODBC-&unixodbc-version; &&
 cp -v -R doc/* /usr/share/doc/unixODBC-&unixodbc-version;</userinput>

Modified: trunk/blfs/general/graphlib/babl.xml
===================================================================
--- trunk/blfs/general/graphlib/babl.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/graphlib/babl.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -67,8 +67,7 @@
 <userinput>make install &&
 install -v -m755 -d /usr/share/gtk-doc/html/babl/graphics &&
 install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/babl &&
-install -v -m644 docs/graphics/*.{html,png,svg} /usr/share/gtk-doc/html/babl/graphics
-</userinput>
+install -v -m644 docs/graphics/*.{html,png,svg} /usr/share/gtk-doc/html/babl/graphics</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/general/graphlib/fontconfig.xml
===================================================================
--- trunk/blfs/general/graphlib/fontconfig.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/graphlib/fontconfig.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -69,7 +69,12 @@
     <para>Installez <application>Fontconfig</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --localstatedir=/var             --docdir=/usr/share/doc/fontconfig-&fontconfig-version;             --disable-docs             --disable-static &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --docdir=/usr/share/doc/fontconfig-&fontconfig-version; \
+            --disable-docs       \
+            --disable-static     &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>
@@ -82,12 +87,15 @@
     documentation prégénérée en utilisant les commandes suivantes en tant
     qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -dm755         /usr/share/{man/man{3,5},doc/fontconfig-&fontconfig-version;/fontconfig-devel} &&
+<userinput>install -v -dm755 \
+        /usr/share/{man/man{3,5},doc/fontconfig-&fontconfig-version;/fontconfig-devel} &&
 install -v -m644 fc-*/*.1          /usr/share/man/man1 &&
 install -v -m644 doc/*.3           /usr/share/man/man3 &&
 install -v -m644 doc/fonts-conf.5  /usr/share/man/man5 &&
-install -v -m644 doc/fontconfig-devel/*         /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel &&
-install -v -m644 doc/*.{pdf,sgml,txt,html}        /usr/share/doc/fontconfig-&fontconfig-version;</userinput>
+install -v -m644 doc/fontconfig-devel/* \
+        /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel &&
+install -v -m644 doc/*.{pdf,sgml,txt,html} \
+       /usr/share/doc/fontconfig-&fontconfig-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/general/graphlib/gegl.xml
===================================================================
--- trunk/blfs/general/graphlib/gegl.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/graphlib/gegl.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -95,8 +95,7 @@
     <para>Installez <application>gegl</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -e '274cerr = avformat_open_input (&p->ic, o->path, NULL, NULL);' \
-    -i operations/external/ff-load.c &&
+<userinput>patch -Np1 -i ../gegl-&gegl-version;-ffmpeg2-1.patch &&
 ./configure --prefix=/usr &&
 make</userinput>
 </screen>
@@ -106,8 +105,7 @@
 <userinput>make install &&
 install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/gegl &&
 install -d -v -m755 /usr/share/gtk-doc/html/gegl/images &&
-install -v -m644 docs/images/* /usr/share/gtk-doc/html/gegl/images
-</userinput>
+install -v -m644 docs/images/* /usr/share/gtk-doc/html/gegl/images</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/general/graphlib/harfbuzz.xml
===================================================================
--- trunk/blfs/general/graphlib/harfbuzz.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/graphlib/harfbuzz.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -95,7 +95,7 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr --with-gobject &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/graphlib/libjpeg-turbo.xml
===================================================================
--- trunk/blfs/general/graphlib/libjpeg-turbo.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/graphlib/libjpeg-turbo.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -83,6 +83,8 @@
             --mandir=/usr/share/man \
             --with-jpeg8 \
             --disable-static &&
+sed -i -e '/^docdir/ s/$/\/libjpeg-turbo-&libjpeg-turbo-version;/' \
+       -e '/^exampledir/ s/$/\/libjpeg-turbo-&libjpeg-turbo-version;/' Makefile &&
 make</userinput>
 </screen>
     <para>
@@ -92,9 +94,7 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>docsdir=/usr/share/doc/libjpeg-turbo-&libjpeg-turbo-version; &&
-make docdir=$docsdir exampledir=$docsdir install &&
-unset docsdir</userinput>
+<userinput>make install</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">
@@ -107,7 +107,6 @@
       <command>sed -i -e ...</command> Cette commande corrige le Makefile pour installer
        la documentation et les exemples dans un répertoire séparé.
     </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
   </sect2>

Modified: trunk/blfs/general/graphlib/librsvg.xml
===================================================================
--- trunk/blfs/general/graphlib/librsvg.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/graphlib/librsvg.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -76,7 +76,9 @@
     <para>Installez <application>librsvg</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --enable-vala             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --enable-vala \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make -k check</command>.</para>

Modified: trunk/blfs/general/graphlib/qpdf.xml
===================================================================
--- trunk/blfs/general/graphlib/qpdf.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/graphlib/qpdf.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -82,7 +82,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-static             --docdir=/usr/share/doc/qpdf-&qpdf-version; &&
+<userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/qpdf-&qpdf-version; &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/prog/cmake.xml
===================================================================
--- trunk/blfs/general/prog/cmake.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/cmake.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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>Pour tester les résultats, lancez : <userinput>make test</userinput>.</para>

Modified: trunk/blfs/general/prog/cvs.xml
===================================================================
--- trunk/blfs/general/prog/cvs.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/cvs.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -111,10 +111,8 @@
 </screen>
 <para>Maintenant corrigez un conflit avec de nouvelles bibliothèques:</para>
 <screen>
-<userinput>
-sed -i -e 's/getline /get_line /' lib/getline.{c,h} &&
-sed -i -e 's/^@sp$/& 1/'          doc/cvs.texinfo 
-</userinput>
+<userinput>sed -i -e 's/getline /get_line /' lib/getline.{c,h} &&
+sed -i -e 's/^@sp$/& 1/'          doc/cvs.texinfo </userinput>
 </screen>
     <para>Installez <application>CVS</application> en lançant
     les commandes suivantes :</para>

Modified: trunk/blfs/general/prog/git.xml
===================================================================
--- trunk/blfs/general/prog/git.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/git.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -99,7 +99,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
@@ -148,9 +150,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/lua.xml
===================================================================
--- trunk/blfs/general/prog/lua.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/lua.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -97,7 +97,8 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.1 liblua.so.&lua-version;"      INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &&
+<userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.2 liblua.so.5.2.1" \
+     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &&
 mkdir -pv /usr/share/doc/lua-&lua-version; &&
 cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version;</userinput>
 </screen>

Modified: trunk/blfs/general/prog/npapi-sdk.xml
===================================================================
--- trunk/blfs/general/prog/npapi-sdk.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/npapi-sdk.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY npapi-sdk-download-http
   "https://bitbucket.org/mgorny/npapi-sdk/downloads/npapi-sdk-&npapi-sdk-version;.tar.bz2">
   <!ENTITY npapi-sdk-download-ftp  " ">
@@ -12,31 +11,23 @@
   <!ENTITY npapi-sdk-buildsize     "520 Ko">
   <!ENTITY npapi-sdk-time          "0.1 SBU">
 ]>
-
 <sect1 id="npapi-sdk" xreflabel="NPAPI-SDK-&npapi-sdk-version;">
   <?dbhtml filename="npapi-sdk.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: igor $</othername>
     <date>$Date: 2013-10-10 11:05:51 +0200 (jeu. 10 oct. 2013) $</date>
   </sect1info>
-
   <title>NPAPI-SDK-&npapi-sdk-version;</title>
-
   <indexterm zone="npapi-sdk">
     <primary sortas="a-NPAPI-SDK">NPAPI-SDK</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à NPAPI-SDK</title>
-
     <para>
       <application>NPAPI-SDK</application> est un ensemble d'entêtes de programmation d'application greffon de Netscape
       par Mozilla. Ce paquet fournit un moyen propre d'installer ses entêtes et leurs dépendances.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,43 +61,35 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url='&blfs-wiki;/NPAPI-SDK'/>
     </para>
-
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de NPAPI-SDK</title>
-
     <para>
       Installez <application>NPAPI-SDK</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr</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épertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -119,7 +102,5 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/general/prog/openjdk.xml
===================================================================
--- trunk/blfs/general/prog/openjdk.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/openjdk.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -231,7 +231,6 @@
     <para role="optional">
       <xref linkend="mitkrb"/>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/openjdk"/></para>
   </sect2>
@@ -270,7 +269,7 @@
 </screen>
     <para>Appliquez un correctif pour générer un fichier cacerts valide en utilisant le système de certificats CA:</para>
 <screen>
-<userinput>patch -Np1 -i ../icedtea-&icedtea-version;-add_cacerts-2.patch</userinput>
+<userinput>patch -Np1 -i ../icedtea-&icedtea-version;-add_cacerts-1.patch</userinput>
 </screen>
     <para>Appliquez un correctif pour remplacer les chemins corrigés par des plus appropriée pour 
     BLFS:</para>
@@ -286,9 +285,14 @@
    de l'utilisateur):
  </para>
 <screen>
-<userinput>unset JAVA_HOME &&
-./autogen.sh    &&
-./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin             --enable-nss                                          --with-version-suffix=blfs                            --enable-pulse-java &&
+<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) &&
 make</userinput>
 </screen>
     <note><para>Si vous n'avez pas installé l'archive spécifiée précédemment,
@@ -322,7 +326,7 @@
 <para>Installez le paquet avec les commandes suivantes en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>chmod 0644 openjdk.build/j2sdk-image/lib/sa-jdi.jar  &&
+<userinput>chmod 0644 openjdk.build/j2sdk-image/lib/sa-jdi.jar   &&
 cp -R openjdk.build/j2sdk-image /opt/OpenJDK-&openjdk-version; &&
 chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput>
 </screen>
@@ -531,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
@@ -597,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
@@ -618,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/perl-modules.xml
===================================================================
--- trunk/blfs/general/prog/perl-modules.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/perl-modules.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -317,7 +317,9 @@
     <para>
       Après l'installation, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
-<screen role="root"><userinput>ln -sv sgmlspl.pl /usr/bin/sgmlspl</userinput></screen>
+<screen role="root">
+<userinput>ln -sv sgmlspl.pl /usr/bin/sgmlspl</userinput>
+</screen>
     
     <itemizedlist>
       <listitem>

Modified: trunk/blfs/general/prog/php.xml
===================================================================
--- trunk/blfs/general/prog/php.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/php.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -153,7 +153,22 @@
     <para>Installez <application>PHP</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                            --sysconfdir=/etc                        --with-apxs2                             --with-config-file-path=/etc             --with-zlib                              --enable-bcmath                          --with-bz2                               --enable-calendar                        --enable-dba=shared                      --with-gdbm                              --with-gmp                               --enable-ftp                             --with-gettext                           --enable-mbstring                        --with-readline              &&
+<userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --mandir=/usr/share/man      \
+            --with-apxs2                 \
+            --with-config-file-path=/etc \
+            --with-zlib                  \
+            --enable-bcmath              \
+            --with-bz2                   \
+            --enable-calendar            \
+            --enable-dba=shared          \
+            --with-gdbm                  \
+            --with-gmp                   \
+            --enable-ftp                 \
+            --with-gettext               \
+            --enable-mbstring            \
+            --with-readline              &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.
@@ -163,9 +178,12 @@
 <userinput>make install                                         &&
 install -v -m644 php.ini-production /etc/php.ini     &&
 install -v -m755 -d /usr/share/doc/php-&php-version; &&
-install -v -m644    CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif                     /usr/share/doc/php-&php-version; &&
-ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt                     /usr/share/doc/php-&php-version; &&
-ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs                     /usr/share/doc/php-&php-version;</userinput>
+install -v -m644    CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif \
+                    /usr/share/doc/php-&php-version; &&
+ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
+                    /usr/share/doc/php-&php-version; &&
+ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs \
+                    /usr/share/doc/php-&php-version;</userinput>
 </screen>
     <para>La documentation HTML précompilée est emballée sous deux formes :
     un archive tar contenant beaucoup de fichiers individuels, utile pour être
@@ -178,12 +196,14 @@
     tar ci-dessous si nécessaire).</para>
     <para>Pour le fichier <quote>Unique en HTML</quote> :</para>
 <screen role="root">
-<userinput>install -v -m644 ../php_manual_en.html.gz     /usr/share/doc/php-&php-version; &&
+<userinput>install -v -m644 ../php_manual_en.html.gz \
+    /usr/share/doc/php-&php-version; &&
 gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput>
 </screen>
     <para>Pour l'archive tar <quote>beaucoup de fichiers HTML</quote> :</para>
 <screen role="root">
-<userinput>tar -xvf ../php_manual_en.tar.gz     -C /usr/share/doc/php-&php-version; --no-same-owner</userinput>
+<userinput>tar -xvf ../php_manual_en.tar.gz \
+    -C /usr/share/doc/php-&php-version; --no-same-owner</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">
@@ -248,7 +268,8 @@
       <para>Si désiré, ajoutez l'entrée en utilisant la commande suivante en
       tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>sed -i 's at php/includes"@&ninclude_path = ".:/usr/lib/php"@'     /etc/php.ini</userinput>
+<userinput>sed -i 's at php/includes"@&\ninclude_path = ".:/usr/lib/php"@' \
+    /etc/php.ini</userinput>
 </screen>
       <para>Pour activer le support PHP dans le serveur Internet <application>Apache</application>,
       vous devez ajouter de nouvelles lignes LoadModule (qui devrait être gérée automatiquement par

Modified: trunk/blfs/general/prog/tcl.xml
===================================================================
--- trunk/blfs/general/prog/tcl.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/prog/tcl.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -12,7 +12,7 @@
   <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
   <!ENTITY tcl-doc-md5sum    "e5d92d4a74ecc77456b092e981112560">
   <!ENTITY tcl-doc-size      "1.2 Mo">
-  <!-- Ensure this is updated when Tcl moves from the 8.6.x branch -->
+  
   <!ENTITY tcl-ver           "8.6">
 ]>
 <sect1 id="tcl" xreflabel="Tcl-&tcl-version;">
@@ -82,9 +82,14 @@
     suivantes :</para>
 <screen>
 <userinput>cd unix &&
-./configure --prefix=/usr                       --without-tzdata                    --mandir=/usr/share/man             $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
+./configure --prefix=/usr           \
+            --without-tzdata        \
+            --mandir=/usr/share/man \
+            $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
 make &&
-sed -e "s@^(TCL_SRC_DIR=').*@1/usr/include'@"     -e "/TCL_B/s@='(-L)?.*unix@='1/usr/lib@"     -i tclConfig.sh</userinput>
+sed -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \
+    -e "/TCL_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
+    -i tclConfig.sh</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

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

Modified: trunk/blfs/general/sysutils/autofs.xml
===================================================================
--- trunk/blfs/general/sysutils/autofs.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/sysutils/autofs.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -68,15 +68,19 @@
       <primary sortas="d-Automounter">Automounter</primary>
     </indexterm>
     <para>Vérifiez que le support d'auto-montage du noyau a été activé.</para>
-<screen><literal>File systems --->
-  Kernel automounter version 4 support (also supports v3): Y or M</literal></screen>
+<screen>
+<literal>File systems --->
+  Kernel automounter version 4 support (also supports v3): Y or M</literal>
+</screen>
     <para>
       Facultativement, activez les options suivantes dans la configuration du noyau:
     </para>
-<screen><literal>File systems  --->
+<screen>
+<literal>File systems  --->
   Network File Systems  --->
     NFS client support: Y or M
-    CIFS support (advanced network filesystem, SMBFS successor): Y or M</literal></screen>
+    CIFS support (advanced network filesystem, SMBFS successor): Y or M</literal>
+</screen>
   <para>Recompilez et installez le nouveau noyau si nécessaire.</para>
   </sect2>
   <sect2 role="installation">

Modified: trunk/blfs/general/sysutils/colord.xml
===================================================================
--- trunk/blfs/general/sysutils/colord.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/sysutils/colord.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -141,11 +141,8 @@
     </para>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/static-libraries.xml"/>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-
     <para>
       <option>--disable-gusb</option>: Utilisez ce paramètre si vous n'avez pas installé
       <application>libgusb</application>.
@@ -157,7 +154,6 @@
       <option>--disable-polkit</option>: Utilisez ce paramètre si vous n'avez pas installé
       <application>Polkit</application>.
     </para>
-
   </sect2>
   <sect2 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/general/sysutils/dbus.xml
===================================================================
--- trunk/blfs/general/sysutils/dbus.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/sysutils/dbus.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -70,7 +70,6 @@
       <xref linkend="dbus-python"/> (pour lancer les tests) et
       <xref linkend="doxygen"/> (pour générer la documentation API)
     </para>
-
    
     <para>Notez que le script <command>configure</command> regardera dans
     <xref linkend="xmlto"/> mais il ne fait rien car la documentation XML/HTML 
@@ -85,7 +84,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 +93,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>
@@ -138,9 +145,9 @@
       Si <command>run-test.sh</command> échoue, il peut être désactivé avec le sed suivant, avant de lancer
       les commandes pour les tests:
     </para>
-<screen><userinput>sed -i -e 's:run-test.sh:$(NULL):g' test/name-test/Makefile.in</userinput></screen>
-
-
+<screen>
+<userinput>sed -i -e 's:run-test.sh:$(NULL):g' test/name-test/Makefile.in</userinput>
+</screen>
     <para>Notez qu'il y a un rapport indiquant que les tests peuvent échouer s'ils sont
       lancés depuis un shell Midnight Commander. Il se peut vous vous ayez des
       messages d'erreur de dépassement de mémoire lors des tests. Ils sont

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

Modified: trunk/blfs/general/sysutils/udev-extras.xml
===================================================================
--- trunk/blfs/general/sysutils/udev-extras.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/sysutils/udev-extras.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -91,7 +91,8 @@
     <title>Installation des suppléments d'Udev</title>
     <para>Tout d'abord, mettez en place les fichiers personnalisés par LFS :</para>
 <screen>
-<userinput>tar -xf ../udev-lfs-186.tar.bz2</userinput>
+<userinput>UDEV=<version>
+tar -xf ../udev-lfs-$UDEV.tar.bz2</userinput>
 </screen>
      <note><para>Dans udev-lfs-197-2.tar.bz2, il y a une erreur mineure dans le Makefile.
      Pour cette version, lancez :</para>
@@ -102,7 +103,6 @@
      </note>
     <sect3>
     <title>keymap</title>
-
     <note><para>
       Depuis systemd-206, les fonctionnalités de keymap sont construites dans les
       procédures initiales d'installation de udev dans LFS. Ces procédures sont seulement à appliquer
@@ -113,11 +113,13 @@
       <command>keymap</command> et les fichiers supportés. Si l'utilisation de 
       <command>keymap</command> est souhaitée, utilisez:
     </para>
-<screen><userinput>make -f udev-lfs-$UDEV/Makefile.lfs keymap</userinput></screen>
+<screen>
+<userinput>make -f udev-lfs-$UDEV/Makefile.lfs keymap</userinput>
+</screen>
     <para>Pour installer <command>keymap</command> et ses fichiers associés,
     lancez en tant qu'utilisateur <systemitem class="username">root</systemitem> la commande suivante:</para>
 <screen role="root">
-<userinput>make -f udev-lfs-186/Makefile.lfs install-keymap</userinput>
+<userinput>make -f udev-lfs-$UDEV/Makefile.lfs install-keymap</userinput>
 </screen>
     </sect3>
     <sect3>
@@ -126,12 +128,12 @@
     et les fichiers d'interface, lancez :</para>
    
 <screen>
-<userinput>make -f udev-lfs-186/Makefile.lfs gudev</userinput>
+<userinput>make -f udev-lfs-$UDEV/Makefile.lfs gudev</userinput>
 </screen>
     <para>Installaz la bibliothèque <filename class='libraryfile'>gudev</filename>,
     en lançant en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make -f udev-lfs-186/Makefile.lfs install-gudev</userinput>
+<userinput>make -f udev-lfs-$UDEV/Makefile.lfs install-gudev</userinput>
 </screen>
     </sect3>
     <sect3>
@@ -141,12 +143,12 @@
    class='libraryfile'>libgudev-1.0</filename>, lancez :</para>
    
 <screen>
-<userinput>make -f udev-lfs-186/Makefile.lfs gir-data</userinput>
+<userinput>make -f udev-lfs-$UDEV/Makefile.lfs gir-data</userinput>
 </screen>
     <para>Installez les données gir en tant qu'utilisateur <systemitem
    class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make -f udev-lfs-186/Makefile.lfs install-gir-data</userinput>
+<userinput>make -f udev-lfs-$UDEV/Makefile.lfs install-gir-data</userinput>
 </screen>
     <caution><para>Il existe un raccourci pour construire et installer tous les
     composants <application>udev</application> en une fois, consistant à utiliser

Modified: trunk/blfs/general/sysutils/udisks2.xml
===================================================================
--- trunk/blfs/general/sysutils/udisks2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/sysutils/udisks2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -89,8 +89,7 @@
       suivantes :
     </para>
 <screen>
-<userinput>
-./configure --prefix=/usr        \
+<userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --disable-static &&

Modified: trunk/blfs/general/sysutils/upower.xml
===================================================================
--- trunk/blfs/general/sysutils/upower.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/general/sysutils/upower.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -80,7 +80,12 @@
     suivantes :</para>
 <screen>
 <userinput>
-./configure --prefix=/usr                    --sysconfdir=/etc                --enable-deprecated              --disable-static                 --localstatedir=/var             --libexecdir=/usr/lib/upower &&
+./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --enable-deprecated  \
+            --disable-static     \
+            --localstatedir=/var \
+            --libexecdir=/usr/lib/upower &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/gnome/applications/evince.xml
===================================================================
--- trunk/blfs/gnome/applications/evince.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/applications/evince.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -83,9 +83,9 @@
     <para>Installez <application>Evince</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr \
+<userinput>./configure --prefix=/usr                \
             --libexecdir=/usr/lib/evince \
-            --enable-introspection \
+            --enable-introspection       \
             --disable-static &&
 make</userinput>
 </screen>

Modified: trunk/blfs/gnome/applications/file-roller.xml
===================================================================
--- trunk/blfs/gnome/applications/file-roller.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/applications/file-roller.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/applications/gnome-terminal.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/totem.xml
===================================================================
--- trunk/blfs/gnome/applications/totem.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/applications/totem.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -94,7 +94,7 @@
     <para>Installez <application>Totem</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr \
+<userinput>./configure --prefix=/usr               \
             --libexecdir=/usr/lib/totem \
             --disable-static &&
 make</userinput>

Modified: trunk/blfs/gnome/platform/accountsservice.xml
===================================================================
--- trunk/blfs/gnome/platform/accountsservice.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/accountsservice.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -89,8 +89,7 @@
       Installez <application>AccountsService</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>
-./configure --prefix=/usr            \
+<userinput>./configure --prefix=/usr            \
             --sysconfdir=/etc        \
             --localstatedir=/var     \
             --enable-admin-group=adm \

Modified: trunk/blfs/gnome/platform/dconf.xml
===================================================================
--- trunk/blfs/gnome/platform/dconf.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/dconf.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -67,7 +67,7 @@
     <para>Installez <application>Dconf</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr \
+<userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --libexecdir=/usr/lib/dconf &&
 make</userinput>

Modified: trunk/blfs/gnome/platform/gcr.xml
===================================================================
--- trunk/blfs/gnome/platform/gcr.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/gcr.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -92,7 +92,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --libexecdir=/usr/lib/gnome-keyring &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/gnome-keyring &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/platform/gtksourceview.xml
===================================================================
--- trunk/blfs/gnome/platform/gtksourceview.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/gtksourceview.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -82,7 +82,6 @@
       Pour tester les résultats, tapez <command>make check</command>. Les tests doivent être lancé dans
       un environnement graphique.
     </para>
-
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>

Modified: trunk/blfs/gnome/platform/gvfs.xml
===================================================================
--- trunk/blfs/gnome/platform/gvfs.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/gvfs.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/gnome/platform/libpeas.xml
===================================================================
--- trunk/blfs/gnome/platform/libpeas.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/libpeas.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!-- 1.9 needs to be modified when version increases from 1.9.X -->
   <!ENTITY libpeas-download-http "&gnome-download-http;/libpeas/1.9/libpeas-&libpeas-version;.tar.xz">
   <!ENTITY libpeas-download-ftp  "&gnome-download-ftp;/libpeas/1.9/libpeas-&libpeas-version;.tar.xz">
   <!ENTITY libpeas-md5sum        "54e7c7e80fd8737ffc0987fd09d1267a">
@@ -75,8 +74,7 @@
     <para>Installez <application>libpeas</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>patch -Np1 -i ../libpeas-&libpeas-version;-gjs_fixes-1.patch &&
-./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez: <command>make check</command>. 45 test sont "OK".</para>

Modified: trunk/blfs/gnome/platform/totem-pl-parser.xml
===================================================================
--- trunk/blfs/gnome/platform/totem-pl-parser.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/totem-pl-parser.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -75,7 +75,9 @@
     <para>Installez <application>totem-pl-parser</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-static &&
+<userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --libexecdir=/usr/lib/totem-pl-parser &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/platform/vte.xml
===================================================================
--- trunk/blfs/gnome/platform/vte.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/gnome/platform/vte.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -68,8 +68,11 @@
     <para>Installez <application>VTE</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>
-./configure --prefix=/usr                      --sysconfdir=/etc                  --disable-static                   --enable-introspection             --libexecdir=/usr/lib/vte-2.90 &&
+<userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --disable-static       \
+            --enable-introspection \
+            --libexecdir=/usr/lib/vte-2.90 &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make check</command>.</para>

Modified: trunk/blfs/introduction/welcome/changelog.xml
===================================================================
--- trunk/blfs/introduction/welcome/changelog.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/introduction/welcome/changelog.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -309,7 +309,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>18 Octobre 2013</para>
       <itemizedlist>
@@ -323,7 +322,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>17 Octobre 2013</para>
       <itemizedlist>
@@ -345,7 +343,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
 <listitem>
       <para>16 Octobre 2013</para>
       <itemizedlist>

Modified: trunk/blfs/kde/add/ark.xml
===================================================================
--- trunk/blfs/kde/add/ark.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/ark.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/gwenview.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/kate.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/kdepim-runtime.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/kdepim.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/kdeplasma-addons.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/kmix.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/konsole.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/libkcddb.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/libkexiv2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/add/okular.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/kactivities.xml
===================================================================
--- trunk/blfs/kde/core/kactivities.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/kactivities.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/kde-baseapps.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/kde-runtime.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/kde-workspace.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/kdelibs.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/kdepimlibs.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/nepomuk-core.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/kde/core/nepomuk-widgets.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/lxde/apps/apps.xml
===================================================================
--- trunk/blfs/lxde/apps/apps.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/apps/apps.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -4,24 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
 <chapter id="lxde-apps">
   <?dbhtml filename="lxde-apps.html" ?>
-
   <title>LXDE Applications</title>
-
   <para>
     This is a small collection of optional applications that add extra
     capabilities to the <application>LXDE</application> desktop.
   </para>
-
-  <!-- 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href=""/>
-  -->
-
+  
 </chapter>

Modified: trunk/blfs/lxde/desktop/desktop.xml
===================================================================
--- trunk/blfs/lxde/desktop/desktop.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/desktop.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -4,21 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
 <chapter id="lxde-desktop">
   <?dbhtml filename="lxde-desktop.html" ?>
-
   <title>Bureau LXDE</title>
-
   <para>
     LXDE est un environnement de bureau extrêmement rapide et économiseur d'énergie. 
   </para>
-
   <para>
     LXDE arrive avec une belle interface, le support multi-langue, les raccourcis clavier standard
     et des fonctions supplémentaires comme la navigation de fichiers tabulée. LXDE utilise moins le CPU et
@@ -26,12 +17,10 @@
     avec des spécifications matérielles basses, comme les netbooks, les périphériques mobiles (e.g. MIDs) ou les
     vieux ordinateurs. 
   </para>
-
   <para>
     Construisez les paquets du coeur de LXDE dans l'ordre présenté dans le livre pour une résolution
     facile des dépendances.
   </para>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxmenu-data.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-icon-theme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="menu-cache.xml"/>
@@ -42,5 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxpolkit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxsession.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-common.xml"/>
-
 </chapter>

Modified: trunk/blfs/lxde/desktop/libfm.xml
===================================================================
--- trunk/blfs/lxde/desktop/libfm.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/libfm.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY libfm-download-http "&sourceforge-repo;/pcmanfm/libfm-&libfm-version;.tar.gz">
   <!ENTITY libfm-download-ftp  " ">
   <!ENTITY libfm-md5sum        "ea3d09b23ef4c37cb84ae57ea16b8f08">
@@ -11,31 +10,23 @@
   <!ENTITY libfm-buildsize     "33 Mo">
   <!ENTITY libfm-time          "0.3 SBU">
 ]>
-
 <sect1 id="libfm" xreflabel="libfm-&libfm-version;">
   <?dbhtml filename="libfm.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>libfm-&libfm-version;</title>
-
   <indexterm zone="libfm">
     <primary sortas="a-libfm">libfm</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à libfm</title>
-
     <para>
       Le paquet <application>libfm</application> contient une bibliothèque utilisée pour
       développer des gestionnaires de fichiers fournissant quelques utilitaires de gestion de fichiers.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,22 +60,18 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de libfm</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/> et
       <xref linkend="menu-cache"/>
     </para>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="libexif"/>,
       <xref linkend="vala"/>, et
       <xref linkend="lxmenu-data"/>
     </para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="dbus-glib"/> et
@@ -92,56 +79,45 @@
       <xref linkend="gvfs"/> et
       <xref linkend="gtk-doc"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/libfm"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de libfm</title>
-
     <para>
       Installez <application>libfm</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr \
+<screen>
+<userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --disable-static &&
-make</userinput></screen>
-
+make</userinput>
+</screen>
     <para>
       Pour tester le résultat, tapez : <command>make check</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>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
-
   </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>
           libfm-pref-apps
@@ -157,12 +133,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="libfm-pref-apps">
         <term><command>libfm-pref-apps</command></term>
         <listitem>
@@ -175,7 +149,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="libfm-lib">
         <term><filename class="libraryfile">libfm.so</filename></term>
         <listitem>
@@ -187,9 +160,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxappearance.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxappearance.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/lxappearance.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-download-http "&sourceforge-repo;/lxde/lxappearance-&lxappearance-version;.tar.gz">
   <!ENTITY lxappearance-download-ftp  " ">
   <!ENTITY lxappearance-md5sum        "a088c6ef08fd25df7dc3be5b07168bbe">
@@ -11,32 +10,24 @@
   <!ENTITY lxappearance-buildsize     "4.4 Mo">
   <!ENTITY lxappearance-time          "0.2 SBU">
 ]>
-
 <sect1 id="lxappearance" xreflabel="LXAppearance-&lxappearance-version;">
   <?dbhtml filename="lxappearance.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>LXAppearance-&lxappearance-version;</title>
-
   <indexterm zone="lxappearance">
     <primary sortas="a-LXAppearance">LXAppearance</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXAppearance</title>
-
     <para>
       Le paquet <application>LXAppearance</application> contient un changeur de thème
       indépendant du bureau pour
       <application>GTK+</application>.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,60 +61,50 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXAppearance</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/> et
       <xref linkend="menu-cache"/>
     </para>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="dbus-glib"/>
     </para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="libxslt"/> avec
       <xref linkend="DocBook"/> et
       <xref linkend="docbook-xsl"/> (pour construire les pages de manuel)
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxappearance"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXAppearance</title>
-
     <para>
       Installez <application>LXAppearance</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr \
+<screen>
+<userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --enable-dbus &&
-make</userinput></screen>
-
+make</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tess.
     </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>
       <parameter>--enable-dbus</parameter> : Ce paramètre active le support
       <application>DBus</application> dans
@@ -133,22 +114,17 @@
       <application>LXDE</application> ou pas installé 
       <xref linkend="dbus-glib"/>.
     </para>
-
     <para>
       <option>--enable-man</option> : Utilisez ce paramètre si vous avez 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>
           lxappearance
@@ -162,12 +138,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxappearance-prog">
         <term><command>lxappearance</command></term>
         <listitem>
@@ -181,7 +155,5 @@
         </listitem>
       </varlistentry>
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxde-common.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxde-common.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/lxde-common.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxde-common-download-http "&sourceforge-repo;/lxde/lxde-common-&lxde-common-version;.tar.gz">
   <!ENTITY lxde-common-download-ftp  " ">
   <!ENTITY lxde-common-md5sum        "e51a6b2a815a89fda1f497b509465a97">
@@ -11,31 +10,23 @@
   <!ENTITY lxde-common-buildsize     "2.4 Mo">
   <!ENTITY lxde-common-time          "less than 0.1 SBU">
 ]>
-
 <sect1 id="lxde-common" xreflabel="lxde-common-&lxde-common-version;">
   <?dbhtml filename="lxde-common.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>lxde-common-&lxde-common-version;</title>
-
   <indexterm zone="lxde-common">
     <primary sortas="a-lxde-common">lxde-common</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXDE Common</title>
-
     <para>
       Le paquet <application>LXDE Common</application> fournit une suite de configuration
       par défaut pour LXDE.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,9 +60,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXDE Common</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="consolekit"/>,
@@ -81,14 +70,12 @@
       <xref linkend="openbox"/> et
       <xref linkend="pcmanfm"/>
     </para>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="desktop-file-utils"/>,
       <xref linkend="hicolor-icon-theme"/> et
       <xref linkend="shared-mime-info"/>
     </para>
-
     <bridgehead renderas="sect4">Dépendances facultative d'exécution</bridgehead>
     <para role="optional">
       Démon de Notification, comme
@@ -98,82 +85,68 @@
       <xref linkend="lxpolkit"/> ou
       <xref linkend="polkit-gnome"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxde-common"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXDE Common</title>
-
     <para>
       Installez <application>LXDE Common</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>sed -e "s:@prefix@/share/lxde/pcmanfm:@sysconfdir@/xdg/pcmanfm/LXDE:" 
+<screen>
+<userinput>sed -e "s:@prefix@/share/lxde/pcmanfm:@sysconfdir@/xdg/pcmanfm/LXDE:" 
     -i startlxde.in &&
 ./configure --prefix=/usr --sysconfdir=/etc &&
-make</userinput></screen>
-
+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 &&
-install -Dm644 lxde-logout.desktop /usr/share/applications/lxde-logout.desktop</userinput></screen>
-
+<screen role="root">
+<userinput>make install &&
+install -Dm644 lxde-logout.desktop /usr/share/applications/lxde-logout.desktop</userinput>
+</screen>
     <para>
       Si vosu avez installez les dépendances recommandées, lancez les commandes suivantes en tant qu'utilisateur
       <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>update-mime-database /usr/share/mime &&
+<screen role="root">
+<userinput>update-mime-database /usr/share/mime &&
 gtk-update-icon-cache -qf /usr/share/icons/hicolor &&
-update-desktop-database -q</userinput></screen>
-
+update-desktop-database -q</userinput>
+</screen>
   </sect2>
-
   <sect2 role="using">
     <title>Démarrage de LXDE</title>
-
     <para>
       Pour démarrer <application>LXDE</application> en utilisant <xref linkend="xinit"/>,
       lancez la suite  
     </para>
-
-<screen><userinput>cat > ~/.xinitrc << "EOF"
+<screen>
+<userinput>cat > ~/.xinitrc << "EOF"
 ck-launch-session startlxde
 EOF
-
-startx</userinput></screen>
-
+startx</userinput>
+</screen>
   </sect2>
-
-
   <sect2 role="commands">
     <title>Explications des commandes</title>
-
     <para>
       <command>sed -e ...</command> : Ce sed corrige le mauvais chemin du fichier de configuration
       par défaut de <application>PCManFM</application>.
     </para>
-
   </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>
           lxde-logout, openbox-lxde et startlxde
@@ -189,12 +162,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="openbox-lxde">
         <term><command>openbox-lxde</command></term>
         <listitem>
@@ -207,7 +178,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="startlxde">
         <term><command>startlxde</command></term>
         <listitem>
@@ -220,9 +190,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxde-icon-theme.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxde-icon-theme.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/lxde-icon-theme.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxde-icon-theme-download-http "&sourceforge-repo;/lxde/lxde-icon-theme-&lxde-icon-theme-version;.tar.bz2">
   <!ENTITY lxde-icon-theme-download-ftp  " ">
   <!ENTITY lxde-icon-theme-md5sum        "346e1aecf805892b106b4d4b0f26e5cc">
@@ -11,31 +10,23 @@
   <!ENTITY lxde-icon-theme-buildsize     "19 Mo">
   <!ENTITY lxde-icon-theme-time          "less than 0.1 SBU">
 ]>
-
 <sect1 id="lxde-icon-theme" xreflabel="lxde-icon-theme-&lxde-icon-theme-version;">
   <?dbhtml filename="lxde-icon-theme.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>lxde-icon-theme-&lxde-icon-theme-version;</title>
-
   <indexterm zone="lxde-icon-theme">
     <primary sortas="a-lxde-icon-theme">lxde-icon-theme</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXDE Icon Theme</title>
-
     <para>
       Le paquet <application>LXDE Icon Theme</application> contient le thème d'icônes
       nuoveXT 2.2 pour <application>LXDE</application>.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,58 +60,49 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXDE Icon Theme</bridgehead>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="gtk2"/> or
       <xref linkend="gtk3"/>
       (for <command>gtk-update-icon-cache</command> command)
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxde-icon-theme"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXDE Icon Theme</title>
-
     <para>
       Install <application>LXDE Icon Theme</application> by running the
       following  
     </para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr</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 installez une des dépendances facultatives, lancez la commande suivante en tant qu'utilisateur
       <systemitem class="username">root</systemitem> :
     </para>
-
-<screen role="root"><userinput>gtk-update-icon-cache -qf /usr/share/icons/nuoveXT2</userinput></screen>
-
+<screen role="root">
+<userinput>gtk-update-icon-cache -qf /usr/share/icons/nuoveXT2</userinput>
+</screen>
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -133,7 +115,5 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxmenu-data.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxmenu-data.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/lxmenu-data.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxmenu-data-download-http "&sourceforge-repo;/lxde/lxmenu-data-&lxmenu-data-version;.tar.gz">
   <!ENTITY lxmenu-data-download-ftp  " ">
   <!ENTITY lxmenu-data-md5sum        "2184ab3746d572477f1bea7e98e230a8">
@@ -11,31 +10,23 @@
   <!ENTITY lxmenu-data-buildsize     "2.5 Mo">
   <!ENTITY lxmenu-data-time          "less than 0.1 SBU">
 ]>
-
 <sect1 id="lxmenu-data" xreflabel="lxmenu-data-&lxmenu-data-version;">
   <?dbhtml filename="lxmenu-data.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>lxmenu-data-&lxmenu-data-version;</title>
-
   <indexterm zone="lxmenu-data">
     <primary sortas="a-lxmenu-data">lxmenu-data</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXMenu Data</title>
-
     <para>
       Le paquet <application>LXMenu Data</application> fournit les fichiers requis pour construire les menus
       compatible avec la spécification freedesktop.org menu 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 LXMenu Data</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="intltool"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxmenu-data"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXMenu Data</title>
-
     <para>
       Installez <application>LXMenu Data</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr --sysconfdir=/etc &&
+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
@@ -126,7 +108,5 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxpanel.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxpanel.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/lxpanel.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxpanel-download-http "&sourceforge-repo;/lxde/lxpanel-&lxpanel-version;.tar.gz">
   <!ENTITY lxpanel-download-ftp  " ">
   <!ENTITY lxpanel-md5sum        "e96e191c4ffb7b475a6ba06455ecf7fa">
@@ -11,31 +10,23 @@
   <!ENTITY lxpanel-buildsize     "25 Mo">
   <!ENTITY lxpanel-time          "0.3 SBU">
 ]>
-
 <sect1 id="lxpanel" xreflabel="LXPanel-&lxpanel-version;">
   <?dbhtml filename="lxpanel.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>LXPanel-&lxpanel-version;</title>
-
   <indexterm zone="lxpanel">
     <primary sortas="a-LXPanel">LXPanel</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXPanel</title>
-
     <para>
       Le paquet <application>LXPanel</application> contient un panel X11 de bureau
       léger.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,75 +60,61 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXPanel</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="libwnck2"/>,
       <xref linkend="lxmenu-data"/> et
       <xref linkend="menu-cache"/>
     </para>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="alsa-lib"/> et
       <xref linkend="wireless_tools"/>
     </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;/lxpanel"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXPanel</title>
-
     <para>
       Installez <application>LXPanel</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 voulez
       construire les pages de manuel.
     </para>
-
   </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>
           lxpanel et lxpanelctl
@@ -152,12 +129,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxpanel-prog">
         <term><command>lxpanel</command></term>
         <listitem>
@@ -170,9 +145,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxpolkit.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxpolkit.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/lxpolkit.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxpolkit-download-http "&sourceforge-repo;/lxde/lxpolkit-&lxpolkit-version;.tar.gz">
   <!ENTITY lxpolkit-download-ftp  " ">
   <!ENTITY lxpolkit-md5sum        "2597b00035fe1d695219e0f9bfa8c26f">
@@ -11,31 +10,23 @@
   <!ENTITY lxpolkit-buildsize     "2.7 Mo">
   <!ENTITY lxpolkit-time          "0.1 SBU">
 ]>
-
 <sect1 id="lxpolkit" xreflabel="LXPolkit-&lxpolkit-version;">
   <?dbhtml filename="lxpolkit.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>LXPolkit-&lxpolkit-version;</title>
-
   <indexterm zone="lxpolkit">
     <primary sortas="a-LXPolkit">LXPolkit</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXPolkit</title>
-
     <para>
       Le paquet <application>LXPolkit</application> contient un agent simple d'identification
       PolicyKit.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,54 +60,45 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXPolkit</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/>,
       <xref linkend="menu-cache"/> et
       <xref linkend="polkit"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/lxpolkit"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXPolkit</title>
-
     <para>
       Installez <application>LXPolkit</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr \
+<screen>
+<userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --libexecdir=/usr/lib/lxpolkit &&
-make</userinput></screen>
-
+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
@@ -130,7 +112,5 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/lxsession.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxsession.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/lxsession.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY lxsession-download-http "&sourceforge-repo;/lxde/lxsession-&lxsession-version;.tar.gz">
   <!ENTITY lxsession-download-ftp  " ">
   <!ENTITY lxsession-md5sum        "bc3eb71936dbdf813e9ac2f00ab948f0">
@@ -11,31 +10,23 @@
   <!ENTITY lxsession-buildsize     "23 Mo">
   <!ENTITY lxsession-time          "0.3 SBU">
 ]>
-
 <sect1 id="lxsession" xreflabel="LXSession-&lxsession-version;">
   <?dbhtml filename="lxsession.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>LXSession-&lxsession-version;</title>
-
   <indexterm zone="lxsession">
     <primary sortas="a-LXSession">LXSession</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à LXSession</title>
-
     <para>
       Le paquet <application>LXSession</application> contient les gestionnaires de session
       par défaut de <application>LXDE</application>.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,9 +60,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de LXSession</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="dbus-glib"/>,
@@ -80,60 +69,49 @@
       <xref linkend="polkit"/> et
       <xref linkend="vala"/>
     </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;/lxsession"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de LXSession</title>
-
     <para>
       Installez <application>LXSession</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-man &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr --disable-man &&
+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>
       <parameter>--disable-man</parameter> : Ce paramètre désactive la construction des pages de manuel. Enlevez le si vous avez
       installé des dépendances facultatives et voulez construire les pages de manuel.
     </para>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèques installées</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           lxclipboard, lxlock, lxpolkit, lxsession, lxsession-default,
@@ -148,12 +126,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="lxsession-prog">
         <term><command>lxsession</command></term>
         <listitem>
@@ -165,9 +141,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/menu-cache.xml
===================================================================
--- trunk/blfs/lxde/desktop/menu-cache.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/menu-cache.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY menu-cache-download-http "&sourceforge-repo;/lxde/menu-cache-&menu-cache-version;.tar.gz">
   <!ENTITY menu-cache-download-ftp  " ">
   <!ENTITY menu-cache-md5sum        "fd296c317a235782fbbd37b6f54bc985">
@@ -11,32 +10,24 @@
   <!ENTITY menu-cache-buildsize     "5.6 Mo">
   <!ENTITY menu-cache-time          "0.2 SBU">
 ]>
-
 <sect1 id="menu-cache" xreflabel="menu-cache-&menu-cache-version;">
   <?dbhtml filename="menu-cache.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>menu-cache-&menu-cache-version;</title>
-
   <indexterm zone="menu-cache">
     <primary sortas="a-menu-cache">menu-cache</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à Menu Cache</title>
-
     <para>
       Le paquet <application>Menu Cache</application> contient une bibliothèque
       pour créer et utiliser des caches pour accélérer la manipulation
       des menus d'application freedesktop.org.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,68 +61,54 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de Menu Cache</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="glib2"/>
     </para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/menu-cache"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de Menu Cache</title>
-
     <para>
       Installez <application>Menu Cache</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/menu-cache \
+<screen>
+<userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib \
             --disable-static &&
-make</userinput></screen>
-
+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>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèque installée</segtitle>
       <segtitle>Répertoires installés</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -146,12 +123,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="libmenu-cache">
         <term><filename class="libraryfile">libmenu-cache.so</filename></term>
         <listitem>
@@ -163,9 +138,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/desktop/pcmanfm.xml
===================================================================
--- trunk/blfs/lxde/desktop/pcmanfm.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/desktop/pcmanfm.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY pcmanfm-download-http "&sourceforge-repo;/pcmanfm/pcmanfm-&pcmanfm-version;.tar.gz">
   <!ENTITY pcmanfm-download-ftp  " ">
   <!ENTITY pcmanfm-md5sum        "41104699e653ff2b0a9a9e80a257d6a2">
@@ -11,31 +10,23 @@
   <!ENTITY pcmanfm-buildsize     "7.8 Mo">
   <!ENTITY pcmanfm-time          "0.1 SBU">
 ]>
-
 <sect1 id="pcmanfm" xreflabel="PCManFM-&pcmanfm-version;">
   <?dbhtml filename="pcmanfm.html"?>
-
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-
   <title>PCManFM-&pcmanfm-version;</title>
-
   <indexterm zone="pcmanfm">
     <primary sortas="a-PCManFM">PCManFM</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à PCManFM</title>
-
     <para>
       Le paquet <application>PCManFM</application> contient un gestionnaire de fichiers extrêmement rapide,
       léger, maintenant riche en fonctionnalité avec la navigation tabulé.
     </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 PCManFM</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="libfm"/>
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/pcmanfm"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de PCManFM</title>
-
     <para>
       Installez <application>PCManFM</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr --sysconfdir=/etc &&
+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épertoires installés</segtitle>
-
       <seglistitem>
         <seg>
           pcmanfm
@@ -126,12 +108,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="pcmanfm-prog">
         <term><command>pcmanfm</command></term>
         <listitem>
@@ -144,9 +124,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/lxde/lxde.xml
===================================================================
--- trunk/blfs/lxde/lxde.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/lxde/lxde.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -4,18 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
 <part id="lxde" xreflabel="LXDE">
   <?dbhtml filename="lxde.html" dir="lxde"?>
-
   <title>LXDE</title>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop/desktop.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/> -->
-
 </part>

Modified: trunk/blfs/multimedia/audioutils/mpg123.xml
===================================================================
--- trunk/blfs/multimedia/audioutils/mpg123.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/audioutils/mpg123.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -67,7 +67,7 @@
     <para>Installez <application>mpg123</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr --with-module-suffix=.so &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/multimedia/audioutils/pnmixer.xml
===================================================================
--- trunk/blfs/multimedia/audioutils/pnmixer.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/audioutils/pnmixer.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY pnmixer-download-http "https://github.com/downloads/nicklan/pnmixer/pnmixer-&pnmixer-version;.tar.gz">
   <!ENTITY pnmixer-download-ftp  "">
   <!ENTITY pnmixer-md5sum        "2288af95ab280721b39b7c33601d5dd4">
@@ -11,30 +10,22 @@
   <!ENTITY pnmixer-buildsize     "2.3 Mo">
   <!ENTITY pnmixer-time          "less than 0.1 SBU">
 ]>
-
 <sect1 id="pnmixer" xreflabel="pnmixer-&pnmixer-version;">
   <?dbhtml filename="pnmixer.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: ken $</othername>
     <date>$Date: 2013-10-09 20:31:26 +0200 (mer. 09 oct. 2013) $</date>
   </sect1info>
-
   <title>pnmixer-&pnmixer-version;</title>
-
   <indexterm zone="pnmixer">
     <primary sortas="a-pnmixer">pnmixer</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à Pnmixer</title>
-
     <para>
       Le paquet <application>Pnmixer</application> fournit un contrôle du volume léger avec une icône.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -68,50 +59,41 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de Pnmixer</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="alsa-utils"/> et
       <xref linkend="gtk2"/>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url="&blfs-wiki;/pnmixer"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de Pnmixer</title>
-
     <para>
       Installez <application>Pnmixer</application> en lançant la suite  
     </para>
-
-<screen><userinput>./autogen.sh --prefix=/usr &&
-make</userinput></screen>
-
+<screen>
+<userinput>./autogen.sh --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>
           pnmixer
@@ -124,12 +106,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="pnmixer-prog">
         <term><command>pnmixer</command></term>
         <listitem>
@@ -141,9 +121,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/multimedia/cdwriteutils/k3b.xml
===================================================================
--- trunk/blfs/multimedia/cdwriteutils/k3b.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/cdwriteutils/k3b.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -119,7 +119,7 @@
     <para>Installez <application>K3b</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-2.patch &&
+<userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg2-1.patch &&
 mkdir build &&
 cd    build &&
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \

Modified: trunk/blfs/multimedia/libdriv/alsa-plugins.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/alsa-plugins.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/alsa-plugins.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -76,7 +76,8 @@
     <para>Installez <application>ALSA Plugins</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>./configure &&
+<userinput>patch -Np1 -i ../alsa-plugins-&alsa-plugins-version;-ffmpeg2-1.patch &&
+./configure &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/multimedia/libdriv/fdk-aac.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/fdk-aac.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/fdk-aac.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY fdk-aac-download-http "https://github.com/mstorsjo/fdk-aac/archive/v&fdk-aac-version;.tar.gz">
   <!ENTITY fdk-aac-download-ftp  " ">
   <!ENTITY fdk-aac-md5sum        "c8afc2d2d75db6ba18e75031e90aa813">
@@ -11,32 +10,24 @@
   <!ENTITY fdk-aac-buildsize     "28 Mo">
   <!ENTITY fdk-aac-time          "0.4 SBU">
 ]>
-
 <sect1 id="fdk-aac" xreflabel="fdk-aac-&fdk-aac-version;">
   <?dbhtml filename="fdk-aac.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: igor $</othername>
     <date>$Date: 2013-10-08 17:36:40 +0200 (mar. 08 oct. 2013) $</date>
   </sect1info>
-
   <title>fdk-aac-&fdk-aac-version;</title>
-
   <indexterm zone="fdk-aac">
     <primary sortas="a-fdk-aac">fdk-aac</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à fdk-aac</title>
-
     <para>
       Le paquet <application>fdk-aac</application> fournit
       la bibliothèque Fraunhofer FDK AAC, qui est conçu pour être
       l'implémentation de codage avancé pour l'audio de haute qualité.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,53 +61,42 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url='&blfs-wiki;/fdk-aac'/>
     </para>
-
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de fdk-aac</title>
-
     <para>
       Installez <application>fdk-aac</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>autoreconf -fiv &&
+<screen>
+<userinput>autoreconf -fiv &&
 ./configure --prefix=/usr --disable-static &&
-make</userinput></screen>
-
+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>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèque installée</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -129,12 +109,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="libfdk-aac">
         <term><filename class="libraryfile">libfdk-aac.so</filename></term>
         <listitem>
@@ -147,9 +125,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -79,10 +79,7 @@
       <xref linkend="libpng"/>,
       <xref linkend="libsoup"/>,
       <xref linkend="libvpx"/>,
-      <xref linkend="xorg7-lib"/> <!-- build time requirements only,
-      you don't need either apps, fonts or xorg server to build this
-      package. You'll need xserver for any X app that wants to play
-      something though, but that should be obvious. -->
+      <xref linkend="xorg7-lib"/> 
     </para>
     <bridgehead renderas="sect4">Facultatives</bridgehead>
     <para role="optional">

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -71,9 +71,7 @@
     <para role="required">
       <xref linkend="gst10-plugins-base"/>
     </para>
-    <!-- Common formats, output and input codecs and requirements
-    for GNOME apps. What's a multimedia framework useful if it
-    can't be used to play anything (common)? -->
+    
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="lame"/>,

Modified: trunk/blfs/multimedia/libdriv/gstreamer10.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gstreamer10.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/gstreamer10.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -107,7 +107,6 @@
 <userinput>make install</userinput>
 </screen>
   </sect2>
-
      <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/multimedia/libdriv/libass.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libass.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/libass.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -10,33 +10,25 @@
   <!ENTITY libass-buildsize     "4.5 Mo">
   <!ENTITY libass-time          "0.1 SBU">
 ]>
-
 <sect1 id="libass" xreflabel="libass-&libass-version;">
   <?dbhtml filename="libass.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: igor $</othername>
     <date>$Date: 2013-10-08 17:10:19 +0200 (mar. 08 oct. 2013) $</date>
   </sect1info>
-
   <title>libass-&libass-version;</title>
-
   <indexterm zone="libass">
     <primary sortas="a-libass">libass</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à libass</title>
-
     <para>
       <application>libass</application> est un moteur de rendu portable
       de sous-titre pour le format de sous-titre
       ASS/SSA (Advanced Substation Alpha/Substation Alpha) qui permet
       plus de sous-titre avancé que les formats SRT et similaires.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,75 +62,60 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de libass</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
       <xref linkend="freetype2"/> et
       <xref linkend="fribidi"/>
     </para>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="fontconfig"/>
     </para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="harfbuzz"/> et
       <ulink url="http://cihar.com/software/enca/">Enca</ulink>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url='&blfs-wiki;/Libass'/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de libass</title>
-
     <para>
       Installez <application>libass</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr --disable-static &&
+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>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <option>--disable-fontconfig</option> : Utilisez ce paramètre si vous n'avez
       pas installé <application>Fontconfig</application>.
     </para>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèque installée</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -151,12 +128,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="libass-lib">
         <term><filename class="libraryfile">libass.so</filename></term>
         <listitem>
@@ -168,9 +143,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/multimedia/libdriv/libquicktime.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libquicktime.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/libquicktime.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -86,10 +86,11 @@
     <para>Installez <application>libquicktime</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr     \
+<userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg2-1.patch &&
+./configure --prefix=/usr     \
             --enable-gpl      \
             --without-doxygen \
-            --docdir=/usr/share/doc/libquicktime-&libquicktime-version; **
+            --docdir=/usr/share/doc/libquicktime-&libquicktime-version;
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/multimedia/libdriv/libvpx.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libvpx.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/libvpx.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -63,7 +63,9 @@
     <para>Installez <application>libvpx</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>mkdir ../libvpx-build &&
+<userinput>sed -i 's/cp -p/cp/' build/make/Makefile &&
+chmod -v 644 vpx/*.h &&
+mkdir ../libvpx-build &&
 cd ../libvpx-build &&
 ../libvpx-v&libvpx-version;/configure --prefix=/usr \
                            --enable-shared \

Modified: trunk/blfs/multimedia/libdriv/opal.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/opal.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/opal.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -78,7 +78,7 @@
     <para>Installez <application>opal</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg-1.patch &&
+<userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &&
 ./configure --prefix=/usr &&
 make</userinput>
 </screen>

Modified: trunk/blfs/multimedia/libdriv/opus.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/opus.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/opus.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY opus-download-http
   "http://downloads.xiph.org/releases/opus/opus-&opus-version;.tar.gz">
   <!ENTITY opus-download-ftp  " ">
@@ -12,33 +11,25 @@
   <!ENTITY opus-buildsize     "15 Mo">
   <!ENTITY opus-time          "0.2 SBU">
 ]>
-
 <sect1 id="opus" xreflabel="Opus-&opus-version;">
   <?dbhtml filename="opus.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: igor $</othername>
     <date>$Date: 2013-10-08 17:24:27 +0200 (mar. 08 oct. 2013) $</date>
   </sect1info>
-
   <title>Opus-&opus-version;</title>
-
   <indexterm zone="opus">
     <primary sortas="a-Opus">Opus</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à Opus</title>
-
     <para>
       <application>Opus</application> est un format de compression audio sans
       perte développé par le "Internet Engineering Task Force" (IETF) qui est particulièrement
       performant pour la parole et les transmissions audio à travers Internet.
       Ce paquet fournit la bibliothèque de développement d'Opus et les entêtes.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -72,52 +63,41 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url='&blfs-wiki;/Opus'/>
     </para>
-
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de Opus</title>
-
     <para>
       Installez <application>Opus</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &&
-make</userinput></screen>
-
+<screen>
+<userinput>./configure --prefix=/usr --disable-static &&
+make</userinput>
+</screen>
     <para>
       Pour tester le résultat, tapez : <command>make check</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>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèque installée</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -130,12 +110,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="libopus">
         <term><filename class="libraryfile">libopus.so</filename></term>
         <listitem>
@@ -147,9 +125,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/multimedia/libdriv/taglib.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/taglib.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/taglib.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -63,8 +63,10 @@
     suivantes </para>
 <screen>
 <userinput>mkdir build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=/usr       -DCMAKE_BUILD_TYPE=Release        .. &&
+cd    build &&
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/multimedia/libdriv/x264.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/x264.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/x264.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY x264-download-http " ">
   <!ENTITY x264-download-ftp  "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-&x264-version;-stable.tar.bz2">
   <!ENTITY x264-md5sum        "e484bc07c97d596f996a2d33fc436349">
@@ -11,31 +10,23 @@
   <!ENTITY x264-buildsize     "8.7 Mo">
   <!ENTITY x264-time          "1.0 SBU">
 ]>
-
 <sect1 id="x264" xreflabel="x264-&x264-version;">
   <?dbhtml filename="x264.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: igor $</othername>
     <date>$Date: 2013-10-08 17:50:53 +0200 (mar. 08 oct. 2013) $</date>
   </sect1info>
-
   <title>x264-&x264-version;</title>
-
   <indexterm zone="x264">
     <primary sortas="a-x264">x264</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à x264</title>
-
     <para>
       Le paquet <application>x264</application> fournit une bibliothèque pour encoder les flux vidéo dans le format
       H.264/MPEG-4 AVC.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,68 +60,54 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de x264</bridgehead>
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="yasm"/>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url='&blfs-wiki;/x264'/>
     </para>
-
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de x264</title>
-
     <para>
       Installez <application>x264</application> en lançant les commandes suivantes :
        
     </para>
-
-<screen><userinput>./configure --prefix=/usr \
+<screen>
+<userinput>./configure --prefix=/usr \
             --enable-shared \
             --disable-cli &&
-make</userinput></screen>
-
+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>
       <parameter>--disable-cli</parameter> : Ce paramètre désactive la construction de l'encodage en ligne de commande qui est 
       redondant depuis que cela est requis par FFmpeg pour la plupart des formats d'entrée.
     </para>
-
     <para>
       <option>--disable-asm</option> : Utilisez ce paramètre si vous n'avez pas installé
       yasm.
     </para>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèque installée</segtitle>
       <segtitle>Répertoire installé</segtitle>
-
       <seglistitem>
         <seg>
           Aucun
@@ -143,12 +120,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="libx264">
         <term><filename class="libraryfile">libx264.so</filename></term>
         <listitem>
@@ -161,9 +136,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/xine-lib.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/libdriv/xine-lib.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -100,8 +100,9 @@
     <para>Installez <application>xine Libraries</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../xine-lib-&xine-lib-version;-missing_include-1.patch &&
-./configure --prefix=/usr                 --disable-vcd                 --disable-modplug             --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &&
+<userinput>./configure --prefix=/usr     \
+            --disable-vcd     \
+            --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &&
 make</userinput>
 </screen>
     <para>Pour la création de la documentation de l'API, <application>Doxygen</application>
@@ -125,7 +126,8 @@
         en tant qu'utilisateur <systemitem class="username">root</systemitem> pour l'installer:</para>
 <screen role="root">
 <userinput>install -v -m755 -d /usr/share/doc/xine-lib-&xine-lib-version;/api &&
-install -v -m644    doc/api/*                     /usr/share/doc/xine-lib-&xine-lib-version;/api</userinput>
+install -v -m644    doc/api/* \
+                    /usr/share/doc/xine-lib-&xine-lib-version;/api</userinput>
 </screen>
  
   </sect2>

Modified: trunk/blfs/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/ffmpeg.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/videoutils/ffmpeg.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -133,7 +133,22 @@
     
 <screen>
 <userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &&
-./configure --prefix=/usr                    --enable-gpl                     --enable-version3                --enable-nonfree                 --disable-static                 --enable-shared                  --enable-x11grab                 --enable-libfaac                 --enable-libfreetype             --enable-libmp3lame              --enable-libopenjpeg             --enable-libpulse                --enable-libspeex                --enable-libtheora               --enable-libvorbis               --enable-libvpx                  --enable-libxvid                 --enable-openssl                 --disable-debug      &&
+./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>
@@ -153,7 +168,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>
@@ -173,13 +189,15 @@
 <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 -m644    doc/*.txt \
+                    /usr/share/doc/ffmpeg-&ffmpeg-version;</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-&ffmpeg-version;</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
@@ -187,7 +205,8 @@
     <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>
+install -v -m644    doc/doxy/html/* \
+                    /usr/share/doc/ffmpeg-&ffmpeg-version;/api</userinput>
 </screen>
    </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/multimedia/videoutils/transcode.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/transcode.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/videoutils/transcode.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -108,7 +108,7 @@
 <screen>
 <userinput>sed -i 's|doc/transcode|&-$(PACKAGE_VERSION)|' \
        $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &&
-patch -Np1 -i ../transcode-&transcode-version;-ffmpeg-2.patch &&
+patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &&
 ./configure --prefix=/usr \
             --enable-alsa \
             --enable-libmpeg2 &&

Modified: trunk/blfs/multimedia/videoutils/vlc.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/vlc.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/multimedia/videoutils/vlc.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -169,9 +169,7 @@
     <para>Installez <application>VLC</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>patch -Np1 -i ../vlc-&vlc-version;-opencv_fixes-1.patch &&
-patch -Np1 -i ../vlc-&vlc-version;-live_fixes-1.patch   &&
-sed -i 's:libsmbclient.h:samba-4.0/&:' configure.ac modules/access/smb.c &&
+<userinput>sed -i 's:libsmbclient.h:samba-4.0/&:' modules/access/smb.c &&
 ./bootstrap &&
 ./configure --prefix=/usr &&
 make</userinput>
@@ -230,22 +228,6 @@
       <option>--disable-libgcrypt</option>: Utilisez ce paramètre si vous n'avez pas installé
       <application>libgcrypt</application>.
     </para>
-<!--
-<para>
-      <option>- -enable-shine</option>: Use this option if you wish to build the
-      <application>Shine</application> plugin.
-    </para>
-   <para>
-      <option>- -enable-tremor</option> : Utilisez cette option si vous avez installé
-      <application>Tremor</application> et souhaitez construire le greffon
-      <application>Tremor</application>.
-    </para>
-    <para>
-      <option>- -enable-aa</option> : Utilisez cette option si vous avez installé
-      <application>AAlib</application> et souhaitez construire le greffon
-      <application>AAlib</application>.
-   </para>
-   -->
     <note>
       <para>
         Il y a beaucoup d'options dans la commande <command>configure</command> de <application>VLC</application>. Regardez la sortie de 

Modified: trunk/blfs/networking/mailnews/re-alpine.xml
===================================================================
--- trunk/blfs/networking/mailnews/re-alpine.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/mailnews/re-alpine.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -67,8 +67,7 @@
     <para>Installez <application>Re-alpine</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>
-./configure --prefix=/usr       \
+<userinput>./configure --prefix=/usr       \
             --sysconfdir=/etc   \
             --without-ldap      \
             --without-krb5      \

Modified: trunk/blfs/networking/netlibs/curl.xml
===================================================================
--- trunk/blfs/networking/netlibs/curl.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netlibs/curl.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -79,7 +79,9 @@
     <para>Installez <application>cURL</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                          --disable-static                       --enable-threaded-resolver             --with-ca-path=/etc/ssl/certs &&
+<userinput>./configure --prefix=/usr              \
+            --disable-static           \
+            --enable-threaded-resolver &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez : 
@@ -88,7 +90,7 @@
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
-find docs ( -name "Makefile*" -o -name "*.1" -o -name "*.3" ) -exec rm {} ; &&
+find docs \( -name "Makefile*" -o -name "*.1" -o -name "*.3" \) -exec rm {} \; &&
 install -v -d -m755 /usr/share/doc/curl-&curl-version; &&
 cp -v -R docs/*     /usr/share/doc/curl-&curl-version;</userinput>
 </screen>

Modified: trunk/blfs/networking/netlibs/glib-networking.xml
===================================================================
--- trunk/blfs/networking/netlibs/glib-networking.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netlibs/glib-networking.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -77,7 +77,12 @@
     <para>Installez <application>glib-networking</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --libexecdir=/usr/lib/glib-networking             --with-ca-certificates=/etc/ssl/ca-bundle.crt             --disable-static &&
+<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 &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make -k check</command>.

Modified: trunk/blfs/networking/netlibs/ldns.xml
===================================================================
--- trunk/blfs/networking/netlibs/ldns.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netlibs/ldns.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -86,8 +86,7 @@
        
     </para>
 <screen>
-<userinput>
-./configure --prefix=/usr     \
+<userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --disable-static  \
             --with-drill      &&

Modified: trunk/blfs/networking/netlibs/libnl.xml
===================================================================
--- trunk/blfs/networking/netlibs/libnl.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netlibs/libnl.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/netlibs/libpcap.xml
===================================================================
--- trunk/blfs/networking/netlibs/libpcap.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netlibs/libpcap.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -69,14 +69,13 @@
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
-
     <para>
       Si vous voulez désactiver l'installation des bibliothèques statiques, utilisez ce sed:
     </para>
-<screen><userinput>sed -i '/INSTALL_DATA.*libpcap.a\|RANLIB.*libpcap.a/ s/^/#/' Makefile</userinput></screen>
+<screen>
+<userinput>sed -i '/INSTALL_DATA.*libpcap.a\|RANLIB.*libpcap.a/ s/^/#/' Makefile</userinput>
+</screen>
     <para>
-
-
 Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install</userinput>

Modified: trunk/blfs/networking/netlibs/libtirpc.xml
===================================================================
--- trunk/blfs/networking/netlibs/libtirpc.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netlibs/libtirpc.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -72,7 +72,7 @@
 <userinput>patch -Np1 -i ../libtirpc-&libtirpc-version;-remove_nis-1.patch &&
 sed "s at AM_CONFIG_HEADER@AC_CONFIG_HEADERS at g" -i configure.ac &&
 autoreconf -fi &&
-./configure --prefix=/usr --sysconfdir=/etc CFLAGS="-fPIC" &&
+./configure --prefix=/usr --sysconfdir=/etc CFLAGS="-fPIC" --disable-static &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/networking/netprogs/ntp.xml
===================================================================
--- trunk/blfs/networking/netprogs/ntp.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netprogs/ntp.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -79,8 +79,7 @@
     <para>Installez <application>ntp</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>
-./configure --prefix=/usr         \
+<userinput>./configure --prefix=/usr         \
             --sysconfdir=/etc     \
             --enable-linuxcaps    \
             --with-binsubdir=sbin \

Modified: trunk/blfs/networking/netprogs/rsync.xml
===================================================================
--- trunk/blfs/networking/netprogs/rsync.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netprogs/rsync.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -76,7 +76,7 @@
     <para>Installez <application>rsync</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr --without-included-zlib &&
 make</userinput>
 </screen>
     <para>Si vous avez installé <xref linkend="doxygen"/> et si vous souhaitez
@@ -91,8 +91,7 @@
     les commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role='root'>
 <userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &&
-install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api &&
-install -v -m644 doc/rsync.* /usr/share/doc/rsync-&rsync-version;</userinput>
+install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/networking/netprogs/samba.xml
===================================================================
--- trunk/blfs/networking/netprogs/samba.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netprogs/samba.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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,16 +118,18 @@
 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/{convert*,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; &&
-ln -v -s ../../samba/swat  /usr/share/doc/samba-&samba-version;</userinput>
+install -v -m644    lib/ntdb/doc/design.pdf \
+                    /usr/share/doc/samba-&samba-version;</userinput>
 </screen>
-
  
  </sect2>
   <sect2 role="commands">
@@ -343,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/networkmanager.xml
===================================================================
--- trunk/blfs/networking/netutils/networkmanager.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netutils/networkmanager.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -88,7 +88,11 @@
     <para>Installez <application>NetworkManager</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                    --sysconfdir=/etc                --localstatedir=/var             --libexecdir=/usr/lib/NetworkManager             --disable-ppp &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --libexecdir=/usr/lib/NetworkManager \
+            --disable-ppp &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>

Modified: trunk/blfs/networking/netutils/wireshark.xml
===================================================================
--- trunk/blfs/networking/netutils/wireshark.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/netutils/wireshark.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -136,7 +136,8 @@
     <para>Continuez à installer <application>Wireshark</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --sysconfdir=/etc &&
+<userinput>patch -Np1 -i ../wireshark-&wireshark-version;-packet_gluster_duplicate_enums_fix-1.patch &&
+./configure --prefix=/usr --sysconfdir=/etc                                  &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de test</para>

Modified: trunk/blfs/networking/textweb/links.xml
===================================================================
--- trunk/blfs/networking/textweb/links.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/networking/textweb/links.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -83,7 +83,8 @@
 <screen role='root'>
 <userinput>make install &&
 install -v -d -m755 /usr/share/doc/links-&Links-version; &&
-install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO     /usr/share/doc/links-&Links-version;</userinput>
+install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
+    /usr/share/doc/links-&Links-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/postlfs/config/profile.xml
===================================================================
--- trunk/blfs/postlfs/config/profile.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/config/profile.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -163,14 +163,15 @@
       se trouvent à la fin de cette section.</para>
 <screen role="root">
 <userinput>cat > /etc/profile.d/dircolors.sh << "EOF"
-<literal># Setup for /bin/ls to support color, the alias is in /etc/bashrc.
+<literal># Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
 if [ -f "/etc/dircolors" ] ; then
         eval $(dircolors -b /etc/dircolors)
         if [ -f "$HOME/.dircolors" ] ; then
                 eval $(dircolors -b $HOME/.dircolors)
         fi
 fi
-alias ls='ls --color=auto'</literal>
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'</literal>
 EOF</userinput>
 </screen>
     </sect3>
@@ -285,9 +286,10 @@
 # /etc/profile.  Personal environment variables and startup programs
 # should go into ~/.bash_profile.  Personal aliases and functions should
 # go into ~/.bashrc
-# Provides a colored /bin/ls command.  Used in conjunction with code in
-# /etc/profile.
+# Provides colored /bin/ls and /bin/grep commands.  Used in conjunction
+# with code in /etc/profile.
 alias ls='ls --color=auto'
+alias grep='grep --color=auto'
 # Provides prompt for non-login shells, specifically shells started
 # in the X environment. [Review the LFS archive thread titled
 # PS1 Environment Variable for a great case study behind this script

Modified: trunk/blfs/postlfs/editors/emacs.xml
===================================================================
--- trunk/blfs/postlfs/editors/emacs.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/editors/emacs.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -62,8 +62,7 @@
     <para>Installez <application>Emacs</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>
-./configure --prefix=/usr         \
+<userinput>./configure --prefix=/usr         \
             --libexecdir=/usr/lib \
             --with-gif=no         \
             --localstatedir=/var  &&

Modified: trunk/blfs/postlfs/filesystems/fuse.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/fuse.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/filesystems/fuse.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -91,6 +91,7 @@
 <computeroutput>configure: WARNING:
 blfs-en
 blfs-fr
+blfs-fr2
 compte-screen.sh
 decomp-screen.sh
 fmoins.sh

Modified: trunk/blfs/postlfs/filesystems/lvm2.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/lvm2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/filesystems/lvm2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/consolekit.xml
===================================================================
--- trunk/blfs/postlfs/security/consolekit.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/consolekit.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -72,8 +72,7 @@
     <para>Installez <application>ConsoleKit</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>
-./configure --prefix=/usr        \
+<userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --enable-udev-acl    \

Modified: trunk/blfs/postlfs/security/gnupg2.xml
===================================================================
--- trunk/blfs/postlfs/security/gnupg2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/gnupg2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -76,7 +76,9 @@
     <para>Installez <application>GnuPG</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --libexecdir=/usr/lib/gnupg2             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &&
+<userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/gnupg2 \
+            --docdir=/usr/share/doc/gnupg-&gnupg2-version; &&
 make &&
 makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &&
 makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput>
@@ -94,15 +96,19 @@
 <screen role="root">
 <userinput>make install &&
 install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html &&
-install -v -m644    doc/gnupg_nochunks.html                     /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &&
-install -v -m644    doc/*.texi doc/gnupg.txt                     /usr/share/doc/gnupg-&gnupg2-version;</userinput>
+install -v -m644    doc/gnupg_nochunks.html \
+                    /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &&
+install -v -m644    doc/*.texi doc/gnupg.txt \
+                    /usr/share/doc/gnupg-&gnupg2-version;</userinput>
 </screen>
 <para>Si vous avez créé des formats alternatifs de la documentation, installez les
     en utilisant la commande suivante en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -m644 doc/gnupg.html/*                  /usr/share/doc/gnupg-&gnupg2-version;/html &&
-install -v -m644 doc/gnupg.{pdf,dvi,ps}                  /usr/share/doc/gnupg-&gnupg2-version;</userinput>
+<userinput>install -v -m644 doc/gnupg.html/* \
+                 /usr/share/doc/gnupg-&gnupg2-version;/html &&
+install -v -m644 doc/gnupg.{pdf,dvi,ps} \
+                 /usr/share/doc/gnupg-&gnupg2-version;</userinput>
 </screen>
  
   </sect2>

Modified: trunk/blfs/postlfs/security/gnutls.xml
===================================================================
--- trunk/blfs/postlfs/security/gnutls.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/gnutls.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/libcap.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,8 +3,7 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-  <!-- Change to kernel.org when it gets back there. -->
+  
   <!ENTITY libcap-download-http "http://ftp.de.debian.org/debian/pool/main/libc/libcap2/libcap2_&libcap-version;.orig.tar.gz">
   <!ENTITY libcap-download-ftp  "ftp://ftp.de.debian.org/debian/pool/main/libc/libcap2/libcap2_&libcap-version;.orig.tar.gz">
   <!ENTITY libcap-md5sum        "b4896816b626bea445f0b3849bdd4077">
@@ -12,31 +11,23 @@
   <!ENTITY libcap-buildsize     "1.3 Mo">
   <!ENTITY libcap-time          "less than 0.1 SBU">
 ]>
-
 <sect1 id="libcap" xreflabel="libcap-&libcap-version;">
   <?dbhtml filename="libcap.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: bdubbs $</othername>
     <date>$Date: 2013-10-21 20:54:34 +0200 (lun. 21 oct. 2013) $</date>
   </sect1info>
-
   <title>libcap-&libcap-version;</title>
-
   <indexterm zone="libcap">
     <primary sortas="a-libcap">libcap</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à libcap</title>
-
     <para>Le paquet <application>libcap</application> implémente l'interface en espace
     utilisateur des possibilitées POSIX 1003.1e disponibles dans le noyau Linux.
     Ces possibilitées sont une partie de tous les droits puissants de root dans
     un ensemble de droits particuliers.  </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -58,72 +49,56 @@
         <para>Estimation du temps de construction : &libcap-time;</para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de libcap</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required"><xref linkend="attr"/></para>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional"><xref linkend="linux-pam"/></para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/libcap"/></para>
-
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de libcap</title>
-
     <para>Installez <application>libcap</application> en lançant les commandes suivantes :
     </para>
-
-<screen><userinput>make</userinput></screen>
-
+<screen>
+<userinput>make</userinput>
+</screen>
     <para>Ce paquet n'a pas de suite de tests.</para>
-
     <para>
       Si vous voulez désactiver l'installation des bibliothèques statiques, utilisez ce sed:
     </para>
-
-<screen><userinput>sed -i '/install.*STALIBNAME/ s/^/#/' libcap/Makefile</userinput></screen>
-
+<screen>
+<userinput>sed -i '/install.*STALIBNAME/ s/^/#/' libcap/Makefile</userinput>
+</screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
-
-<screen role="root"><userinput>make RAISE_SETFCAP=no install</userinput></screen>
-
+<screen role="root">
+<userinput>make RAISE_SETFCAP=no install</userinput>
+</screen>
   </sect2>
-
   <sect2 role="commands">
     <title>Explications des commandes</title>
-
     <para><parameter>RAISE_SETFCAP=no</parameter> : Ce paramètre enlève l'essai d'utiliser
     <application>setcap</application> dans lui-même. Cela évite une erreur d'installation
     si le noyau ou le système de fichier ne supporte pas les possiblitées étendues.
     </para>
-
   </sect2>
-
   <sect2 role="content">
     <title>Contenu</title>
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèque installée</segtitle>
       <segtitle>Répertoires installés</segtitle>
-
       <seglistitem>
         <seg>capsh, getcap, getpcaps, et setcap</seg>
         <seg>libcap.{so,a}</seg>
         <seg>Aucun</seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="capsh">
         <term><command>capsh</command></term>
         <listitem>
@@ -133,7 +108,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="getcap">
         <term><command>getcap</command></term>
         <listitem>
@@ -143,7 +117,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="getpcaps">
         <term><command>getpcaps</command></term>
         <listitem>
@@ -153,7 +126,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="setcap">
         <term><command>setcap</command></term>
         <listitem>
@@ -163,7 +135,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="libcap-lib">
         <term><filename class='libraryfile'>libcap.{so,a}</filename></term>
         <listitem>
@@ -173,9 +144,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/postlfs/security/libcap2.xml
===================================================================
--- trunk/blfs/postlfs/security/libcap2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/libcap2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -61,21 +61,12 @@
     <title>Installation de libcap2</title>
     <para>Installez <application>libcap2</application> en lançant les commandes
     suivantes :</para>
-<screen>
-<userinput>make</userinput>
-</screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
     <para>
       Si vous voulez désactiver l'installation de la bibliothèque statique, utilisez ce sed :
     </para>
     
-<screen>
-<userinput>sed -i '/install.*STALIBNAME/ s/^/#/' libcap/Makefile</userinput>
-</screen>
  <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
-<screen role="root">
-<userinput>make RAISE_SETFCAP=no install</userinput>
-</screen>
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>

Modified: trunk/blfs/postlfs/security/linux-pam.xml
===================================================================
--- trunk/blfs/postlfs/security/linux-pam.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/linux-pam.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -97,7 +97,10 @@
     <para>Installez <application>Linux-PAM</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version;             --disable-nis &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; \
+            --disable-nis &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, vous devez créer un fichier de configuration.

Modified: trunk/blfs/postlfs/security/nss.xml
===================================================================
--- trunk/blfs/postlfs/security/nss.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/nss.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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>

Modified: trunk/blfs/postlfs/security/openssh.xml
===================================================================
--- trunk/blfs/postlfs/security/openssh.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/openssh.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -81,14 +81,19 @@
     en lançant les commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>install -v -m700 -d /var/lib/sshd &&
-chown -v root:sys /var/lib/sshd &&
+chown   -v root:sys /var/lib/sshd &&
 groupadd -g 50 sshd &&
-useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd     -s /bin/false -u 50 sshd</userinput>
+useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false -u 50 sshd</userinput>
 </screen>
     <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>
@@ -104,11 +109,11 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make install &&
+<userinput>make install                                  &&
 install -v -m755 contrib/ssh-copy-id /usr/bin &&
 install -v -m644 contrib/ssh-copy-id.1 /usr/share/man/man1 &&
-install -v -m755 -d /usr/share/doc/openssh-&openssh-version; &&
-install -v -m644 INSTALL LICENCE OVERVIEW README*     /usr/share/doc/openssh-&openssh-version;</userinput>
+install -v -m755 -d /usr/share/doc/openssh-&openssh-version;           &&
+install -v -m644 INSTALL LICENCE OVERVIEW README* /usr/share/doc/openssh-&openssh-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/postlfs/security/openssl.xml
===================================================================
--- trunk/blfs/postlfs/security/openssl.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/openssl.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -85,6 +85,7 @@
 patch -Np1 -i ../openssl-&openssl-version;-fix_pod_syntax-1.patch &&
 ./config --prefix=/usr         \
          --openssldir=/etc/ssl \
+         --libdir=lib          \
          shared                \
          zlib-dynamic &&
 make</userinput>

Modified: trunk/blfs/postlfs/security/polkit.xml
===================================================================
--- trunk/blfs/postlfs/security/polkit.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/security/polkit.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -89,15 +89,20 @@
     </para>
 <screen role="root">
 <userinput>groupadd -fg 27 polkitd &&
-useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27         -g polkitd -s /bin/false polkitd</userinput>
+useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
+        -g polkitd -s /bin/false polkitd</userinput>
 </screen>
         
     <para>
      Installez <application>polkit</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>
-./configure --prefix=/usr                    --sysconfdir=/etc                --localstatedir=/var             --with-authfw=shadow             --disable-static                 --libexecdir=/usr/lib/polkit-1 &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --with-authfw=shadow \
+            --disable-static     \
+            --libexecdir=/usr/lib/polkit-1 &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/postlfs/virtualization/qemu.xml
===================================================================
--- trunk/blfs/postlfs/virtualization/qemu.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/postlfs/virtualization/qemu.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -110,8 +110,12 @@
     <para>Installez <application>qemu</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                            --sysconfdir=/etc                        --target-list=x86_64-softmmu &&
-make</userinput>
+<userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --target-list=x86_64-softmmu &&
+export ARFLAGS="rv" &&
+make &&
+unset ARFLAGS</userinput>
 </screen>
     <para>Pour lancer la construction en tests, lancez <command>make V=1 check</command>.</para>
 <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
@@ -154,7 +158,10 @@
     <filename>Fedora-16-x86_64-Live-LXDE.iso</filename> dans le répertoire courant.
     Exécutez les commandes suivantes :</para>
 <screen>
-<userinput>qemu -enable-kvm -hda vdisk.img                 -cdrom Fedora-16-x86_64-Live-LXDE.iso      -boot d                                    -m 384</userinput>
+<userinput>qemu -enable-kvm -hda vdisk.img            \
+     -cdrom Fedora-16-x86_64-Live-LXDE.iso \
+     -boot d                               \
+     -m 384</userinput>
 </screen>
     <para>Suivre la procedure d'installation normal pour la distribution choisie.
     L'option -boot spécifie l'ordre de démarrage des disques comme un chaîne de lettres de
@@ -197,11 +204,11 @@
 <userinput>cat > /etc/qemu-ifup << EOF
 #!/bin/bash
 switch=br0
-if [ -n "$1" ]; then
+if [ -n "\$1" ]; then
   # Add new tap0 interface to bridge
-  /sbin/ip link set $1 up
+  /sbin/ip link set \$1 up
   sleep 0.5s
-  /usr/sbin/brctl addif $switch $1
+  /usr/sbin/brctl addif \$switch \$1
 else
   echo "Error: no interface specified"
   exit 1
@@ -214,9 +221,9 @@
 <userinput>cat > /etc/qemu-ifdown << EOF
 #!/bin/bash
 switch=br0
-if [ -n "$1" ]; then
+if [ -n "\$1" ]; then
   # Remove tap0 interface from bridge
-  /usr/sbin/brctl delif $switch $1
+  /usr/sbin/brctl delif \$switch \$1
 else
   echo "Error: no interface specified"
   exit 1

Modified: trunk/blfs/pst/printing/cups-filters.xml
===================================================================
--- trunk/blfs/pst/printing/cups-filters.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/pst/printing/cups-filters.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-avahi                                         --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/ps/a2ps.xml
===================================================================
--- trunk/blfs/pst/ps/a2ps.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/pst/ps/a2ps.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -120,9 +120,10 @@
 <userinput>tar -xf ../i18n-fonts-&i18n-fonts-version;.tar.bz2 &&
 cp -v i18n-fonts-&i18n-fonts-version;/fonts/* /usr/share/a2ps/fonts &&
 cp -v i18n-fonts-&i18n-fonts-version;/afm/* /usr/share/a2ps/afm &&
-cd /usr/share/a2ps/afm &&
+pushd /usr/share/a2ps/afm &&
 ./make_fonts_map.sh &&
-mv fonts.map.new fonts.map</userinput>
+mv fonts.map.new fonts.map &&
+popd</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/pst/scanning/sane.xml
===================================================================
--- trunk/blfs/pst/scanning/sane.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/pst/scanning/sane.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,11 +3,11 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!-- <!ENTITY sane-be-download-http "http://alioth.debian.org/frs/?group_id=30186"> -->
+  
   <!ENTITY sane-be-download-http "http://fossies.org/linux/misc//sane-backends-&sane-version;.tar.gz">
   <!ENTITY sane-be-download-ftp  " ">
-  <!--<!ENTITY sane-be-download-ftp  "ftp://ftp2.sane-project.org/pub/sane/sane-backends-&sane-version;.tar.gz">-->
-  <!--<!ENTITY sane-be-download-ftp  "&gentoo-ftp-repo;/sane-backends-&sane-version;.tar.gz">-->
+  
+  
   <!ENTITY sane-be-md5sum        "1ca68e536cd7c1852322822f5f6ac3a4">
   <!ENTITY sane-be-size          "5.6 Mo">
   <!ENTITY sane-be-buildsize     "97 Mo">
@@ -163,24 +163,31 @@
       lançant les commandes suivantes :</para>
             
 <screen>
-<userinput>./configure --prefix=/usr                                                --sysconfdir=/etc                                            --localstatedir=/var                                         --with-docdir=/usr/share/doc/sane-backend-1.0.23             --with-group=scanner                             &&
+<userinput>./configure --prefix=/usr                                    \
+            --sysconfdir=/etc                                \
+            --localstatedir=/var                             \
+            --with-docdir=/usr/share/doc/sane-backend-&sane-version; \
+            --with-group=scanner                             &&
 make                                                         &&
 exit</userinput>
 </screen>
       <para>Si vous voulez tester les résultats, quelques fichiers doivent être corrigés :</para>
-<screen><userinput>sed -i -e 's/Jul 31 07:52:48/Oct  7 08:58:33/'      \
+<screen>
+<userinput>sed -i -e 's/Jul 31 07:52:48/Oct  7 08:58:33/'      \
        -e 's/1.0.24git/1.0.24/'                     \
        testsuite/tools/data/db.ref                  \
        testsuite/tools/data/html-mfgs.ref           \
        testsuite/tools/data/usermap.ref             \
        testsuite/tools/data/html-backends-split.ref \
        testsuite/tools/data/udev+acl.ref            \
-       testsuite/tools/data/udev.ref</userinput></screen>
+       testsuite/tools/data/udev.ref</userinput>
+</screen>
 <para>Pour tester les résultats, tapez :  <command>make check</command>.</para>
       <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install                                         &&
-install -m 644 -v tools/udev/libsane.rules                             /etc/udev/rules.d/65-scanner.rules &&
+install -m 644 -v tools/udev/libsane.rules           \
+                  /etc/udev/rules.d/65-scanner.rules &&
 chgrp -v scanner  /var/lock/sane</userinput>
 </screen>
       <para>En ayant le scanner allumé, lancez <command>scanimage -L</command>
@@ -207,7 +214,8 @@
       <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
-install -v -m644 doc/sane.png xscanimage-icon-48x48-2.png     /usr/share/sane</userinput>
+install -v -m644 doc/sane.png xscanimage-icon-48x48-2.png \
+    /usr/share/sane</userinput>
 </screen>
       <para>Si vous avez lié <application>GIMP</application> à la construction
       et si vous souhaitez que <application>GIMP</application> utilise

Modified: trunk/blfs/server/databases/mysql.xml
===================================================================
--- trunk/blfs/server/databases/mysql.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/server/databases/mysql.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -111,14 +111,36 @@
     lançant les commandes suivantes :</para>
      
 <screen>
-<userinput>sed -i "/ADD_SUBDIRECTORY(sql/share)/d" CMakeLists.txt &&
-sed -i "s/ADD_SUBDIRECTORY(libmysql)/&\nADD_SUBDIRECTORY(sql/share)/" CMakeLists.txt &&
-sed -i "s at data/test@${INSTALL_MYSQLSHAREDIR}@g" sql/CMakeLists.txt &&
-sed -i "s at data/mysql@${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
+<userinput>sed -i "/ADD_SUBDIRECTORY(sql\/share)/d" CMakeLists.txt &&
+sed -i "s/ADD_SUBDIRECTORY(libmysql)/&\\nADD_SUBDIRECTORY(sql\/share)/" CMakeLists.txt &&
+sed -i "s at data/test@\${INSTALL_MYSQLSHAREDIR}@g" sql/CMakeLists.txt &&
+sed -i "s at data/mysql@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
 sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc &&
 mkdir build &&
 cd build &&
-cmake -DCMAKE_BUILD_TYPE=Release                          -DCMAKE_INSTALL_PREFIX=/usr                         -DINSTALL_DOCDIR=share/doc/mysql                    -DINSTALL_DOCREADMEDIR=share/doc/mysql              -DINSTALL_INCLUDEDIR=include/mysql                  -DINSTALL_INFODIR=share/info                        -DINSTALL_MANDIR=share/man                          -DINSTALL_MYSQLDATADIR=/srv/mysql                   -DINSTALL_MYSQLSHAREDIR=share/mysql                 -DINSTALL_MYSQLTESTDIR=share/mysql/test             -DINSTALL_PLUGINDIR=lib/mysql/plugin                -DINSTALL_SBINDIR=sbin                              -DINSTALL_SCRIPTDIR=bin                             -DINSTALL_SQLBENCHDIR=share/mysql/bench             -DINSTALL_SUPPORTFILESDIR=share/mysql               -DMYSQL_DATADIR=/srv/mysql                          -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock           -DSYSCONFDIR=/etc/mysql                             -DWITH_PARTITION_STORAGE_ENGINE=OFF            
      -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF                -DWITH_EXTRA_CHARSETS=complex                       -DWITH_LIBEVENT=system                              -DWITH_SSL=system                                   .. &&
+cmake -DCMAKE_BUILD_TYPE=Release                    \
+      -DCMAKE_INSTALL_PREFIX=/usr                   \
+      -DINSTALL_DOCDIR=share/doc/mysql              \
+      -DINSTALL_DOCREADMEDIR=share/doc/mysql        \
+      -DINSTALL_INCLUDEDIR=include/mysql            \
+      -DINSTALL_INFODIR=share/info                  \
+      -DINSTALL_MANDIR=share/man                    \
+      -DINSTALL_MYSQLDATADIR=/srv/mysql             \
+      -DINSTALL_MYSQLSHAREDIR=share/mysql           \
+      -DINSTALL_MYSQLTESTDIR=share/mysql/test       \
+      -DINSTALL_PLUGINDIR=lib/mysql/plugin          \
+      -DINSTALL_SBINDIR=sbin                        \
+      -DINSTALL_SCRIPTDIR=bin                       \
+      -DINSTALL_SQLBENCHDIR=share/mysql/bench       \
+      -DINSTALL_SUPPORTFILESDIR=share/mysql         \
+      -DMYSQL_DATADIR=/srv/mysql                    \
+      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock     \
+      -DSYSCONFDIR=/etc/mysql                       \
+      -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF          \
+      -DWITH_EXTRA_CHARSETS=complex                 \
+      -DWITH_LIBEVENT=system                        \
+      -DWITH_SSL=system                             \
+      .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.</para>

Modified: trunk/blfs/server/databases/postgresql.xml
===================================================================
--- trunk/blfs/server/databases/postgresql.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/server/databases/postgresql.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -73,8 +73,13 @@
     <para>Installez <application>PostgreSQL</application> avec les commandes
     suivantes : </para>
 <screen>
-<userinput>sed -e "s at DEFAULT_PGSOCKET_DIR  "/tmp"@DEFAULT_PGSOCKET_DIR  "/run/postgresql"@"     -i src/include/pg_config_manual.h &&
-./configure --prefix=/usr                      --enable-thread-safety             --docdir=/usr/share/doc/postgresql-&postgresql-version; &&
+<userinput>sed -e "s at DEFAULT_PGSOCKET_DIR  \"/tmp\"@DEFAULT_PGSOCKET_DIR  \"/run/postgresql\"@" \
+    -i src/include/pg_config_manual.h &&
+sed -i -e 's at psql\\"@& -h /tmp@' src/test/regress/pg_regress{,_main}.c &&
+sed -i -e 's at gres\\"@& -k /tmp@' src/test/regress/pg_regress.c &&
+./configure --prefix=/usr          \
+            --enable-thread-safety \
+            --docdir=/usr/share/doc/postgresql-&postgresql-version; &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>
@@ -84,10 +89,10 @@
     <command>make -C contrib/<replaceable><SUBDIR-NAME></replaceable></command> pour chaque sous-répertoire.
     </para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
-
     
     
-    <screen role="root">
+    
+<screen role="root">
 <userinput>make install      &&
 make install-docs</userinput>
 </screen>
@@ -95,7 +100,9 @@
     
     <para>Si vous avez fait tous les programmes de <filename class="directory">contrib/</filename>,
     en tant qu'utilisateur <systemitem class="username">root</systemitem>:</para>
-<screen role="nodump/"><userinput>make -C contrib/<SUBDIR-NAME> install</userinput></screen>
+<screen role="nodump/">
+<userinput>make -C contrib/<replaceable><SUBDIR-NAME></replaceable> install</userinput>
+</screen>
     <para><emphasis>Si vous pensez utiliser <application>PostgreSQL</application>
     en tant que client pour se connecteur a un serveur sur une autre machine, votre installation est terminée et vous pouvez ne pas lancer
     les commandes suivantes.</emphasis></para>
@@ -114,23 +121,29 @@
 <userinput>install -v -dm700 /srv/pgsql/data &&
 install -v -dm755 /run/postgresql &&
 groupadd -g 41 postgres &&
-useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data         -u 41 postgres &&
+useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data \
+        -u 41 postgres &&
 chown -Rv postgres:postgres /srv/pgsql /run/postgresql &&
 su - postgres -c '/usr/bin/initdb -D /srv/pgsql/data'</userinput>
 </screen>
     <para>En tant qu'utilisateur <systemitem class="username">root</systemitem>, 
     démarrez le serveur de base de données avec la commande suivante :</para>
 <screen role="root">
-<userinput>su - postgres -c '/usr/bin/postmaster -D /srv/pgsql/data >     /srv/pgsql/data/logfile 2>&1 &'</userinput>
+<userinput>su - postgres -c '/usr/bin/postmaster -D /srv/pgsql/data > \
+    /srv/pgsql/data/logfile 2>&1 &'</userinput>
 </screen>
     <para>Toujours en tant qu'utilisateur <systemitem class="username">root</systemitem>, 
     créez une base de données et vérifiez l'installation :</para>
 <screen role="root">
 <userinput>su - postgres -c '/usr/bin/createdb test' &&
-echo "create table t1 ( name varchar(20), state_province varchar(20) );"     | (su - postgres -c '/usr/bin/psql test ') &&
-echo "insert into t1 values ('Billy', 'NewYork');"     | (su - postgres -c '/usr/bin/psql test ') &&
-echo "insert into t1 values ('Evanidus', 'Quebec');"     | (su - postgres -c '/usr/bin/psql test ') &&
-echo "insert into t1 values ('Jesse', 'Ontario');"     | (su - postgres -c '/usr/bin/psql test ') &&
+echo "create table t1 ( name varchar(20), state_province varchar(20) );" \
+    | (su - postgres -c '/usr/bin/psql test ') &&
+echo "insert into t1 values ('Billy', 'NewYork');" \
+    | (su - postgres -c '/usr/bin/psql test ') &&
+echo "insert into t1 values ('Evanidus', 'Quebec');" \
+    | (su - postgres -c '/usr/bin/psql test ') &&
+echo "insert into t1 values ('Jesse', 'Ontario');" \
+    | (su - postgres -c '/usr/bin/psql test ') &&
 echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</userinput>
 </screen>
   </sect2>

Modified: trunk/blfs/server/databases/sqlite.xml
===================================================================
--- trunk/blfs/server/databases/sqlite.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/server/databases/sqlite.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -85,7 +85,11 @@
     <para>Installer <application>SQLite</application> en exécutant les commandes
     suivantes:</para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-static                    CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1             -DSQLITE_ENABLE_COLUMN_METADATA=1                 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1                   -DSQLITE_SECURE_DELETE=1" &&
+<userinput>./configure --prefix=/usr --disable-static        \
+            CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1 \
+            -DSQLITE_ENABLE_COLUMN_METADATA=1     \
+            -DSQLITE_ENABLE_UNLOCK_NOTIFY=1       \
+            -DSQLITE_SECURE_DELETE=1" &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de tests.</para>

Modified: trunk/blfs/server/mail/dovecot.xml
===================================================================
--- trunk/blfs/server/mail/dovecot.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/server/mail/dovecot.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
   <!ENTITY dovecot-download-http
   "http://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
   <!ENTITY dovecot-download-ftp  " ">
@@ -12,33 +11,25 @@
   <!ENTITY dovecot-buildsize     "198 Mo">
   <!ENTITY dovecot-time          "1.6 SBU">
 ]>
-
 <sect1 id="dovecot" xreflabel="Dovecot-&dovecot-version;">
   <?dbhtml filename="dovecot.html"?>
-
   <sect1info>
     <othername>$LastChangedBy: igor $</othername>
     <date>$Date: 2013-10-24 12:10:30 +0200 (jeu. 24 oct. 2013) $</date>
   </sect1info>
-
   <title>Dovecot-&dovecot-version;</title>
-
   <indexterm zone="dovecot">
     <primary sortas="a-Dovecot">Dovecot</primary>
   </indexterm>
-
   <sect2 role="package">
     <title>Introduction à Dovecot</title>
-
     <para>
       <application>Dovecot</application> est une serveur "Internet Message Access Protocol"
       (IMAP) et "Post Office Protocol" (POP), écrit avec pour principale idée la sécurité.
       <application>Dovecot</application> veut être léger, rapide et facile à initialiser aussi bien 
       que hautement configurable et facilement extensible avec des greffons.
     </para>
-
     &lfs74_checked;
-
     <bridgehead renderas="sect3">Information sur le paquet </bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -72,9 +63,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de Dovecot</bridgehead>
-
     <bridgehead renderas="sect4">Facultative</bridgehead>
     <para role="optional">
       <xref linkend="libcap"/>,
@@ -87,57 +76,50 @@
       <xref linkend="sqlite"/>, et
       <xref linkend="clucene"/>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url="&blfs-wiki;/dovecot"/>
     </para>
   </sect2>
-
   <sect2 role="installation">
     <title>Installation de Dovecot</title>
-
     <para>
       Il doit y avoir des utilisateurs et des groupes dédiés pour les processus Dovecot sans droit et
       pour les logins des utilisateurs de processus. Tapez les commandes suivantes en tant qu'utilisateur
       <systemitem class="username">root</systemitem>:
     </para>
-
-<screen role="root"><userinput>groupadd -g 42 dovecot &&
+<screen role="root">
+<userinput>groupadd -g 42 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></screen>
-
+        -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 \
+<screen>
+<userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
             --libexecdir=/usr/lib \
             --docdir=/usr/share/doc/dovecot-&dovecot-version; \
             --disable-static &&
-make</userinput></screen>
-
+make</userinput>
+</screen>
     <para>Pour tester les résultats, tapez <command>make check</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>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <option>--with-ldap</option> : Ce paramètre active le support d'identification
       <application>OpenLDAP</application>.
@@ -164,19 +146,15 @@
     </para>
     
   </sect2>
-
   <sect2 role="configuration">
     <title>Configuration de Dovecot</title>
-
     <sect3 id="dovecot-config">
       <title>Fichiers de Config</title>
-
       <para>
         <filename>/etc/dovecot/dovecot.conf</filename>,
         <filename>/etc/dovecot/conf.d/*</filename>, et
         <filename>/etc/dovecot/local.conf</filename>
       </para>
-
       <indexterm zone="dovecot dovecot-config">
         <primary sortas="e-etc-dovecot-dovecot.conf">/etc/dovecot/dovecot.conf</primary>
       </indexterm>
@@ -186,18 +164,15 @@
       <indexterm zone="dovecot dovecot-config">
         <primary sortas="e-etc-dovecot-local.conf">/etc/dovecot/local.conf</primary>
       </indexterm>
-
     </sect3>
-
     <sect3>
       <title>Information de Configuration</title>
-
       <para>
         Copiez un exemple de configuration, que vous pouvez utiliser comme point de départ:
       </para>
-
-<screen role="root"><userinput>cp -rv /usr/share/doc/dovecot-&dovecot-version;/example-config/* /etc/dovecot</userinput></screen>
-
+<screen role="root">
+<userinput>cp -rv /usr/share/doc/dovecot-&dovecot-version;/example-config/* /etc/dovecot</userinput>
+</screen>
       <para>
         La configuration suivante est un simple exemple avec le service IMAP
         utilisant les utilisateurs locaux pour l'identification et l'emplacement des boîtes à lettres.
@@ -206,8 +181,8 @@
         <application>OpenSSL</application> et
         <application>Linux PAM</application>.
       </para>
-
-<screen role="root"><userinput>sed -i '/^\!include / s/^/#/' /etc/dovecot/dovecot.conf &&
+<screen role="root">
+<userinput>sed -i '/^\!include / s/^/#/' /etc/dovecot/dovecot.conf &&
 chmod -v 1777 /var/mail &&
 cat > /etc/dovecot/local.conf << "EOF"
 <literal>protocols = imap
@@ -219,42 +194,34 @@
 passdb {
   driver = shadow
 }</literal>
-EOF</userinput></screen>
-
+EOF</userinput>
+</screen>
       <para>
         Vous devez prévoir de lire la documentation officiel à l'adresse <ulink
         url="http://wiki2.dovecot.org/"/> si vous planifiez d'utiliser 
         <application>Dovecot</application> dans un environnement de production.
       </para>
-
     </sect3>
-
     <sect3 id="dovecot-init">
       <title>Script de démarrage</title>
-
       <para>Si vous voulez que le serveur <application>Dovecot</application> démarre automatiquement
       quand le système est démarré, installez le script d'initialisation
       <filename>/etc/rc.d/init.d/dovecot</filename> inclus
       dans le paquet <xref linkend="bootscripts"/>.</para>
-
       <indexterm zone="dovecot dovecot-init">
         <primary sortas="f-dovecot">dovecot</primary>
       </indexterm>
-
-<screen role="root"><userinput>make install-dovecot</userinput></screen>
-
+<screen role="root">
+<userinput>make install-dovecot</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>
           doveadm, doveconf, dovecot, dsync, et various internal programs
@@ -270,12 +237,10 @@
         </seg>
       </seglistitem>
     </segmentedlist>
-
     <variablelist>
       <bridgehead renderas="sect3">Description courte</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
       <varlistentry id="doveadm">
         <term><command>doveadm</command></term>
         <listitem>
@@ -287,7 +252,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="doveconf">
         <term><command>doveconf</command></term>
         <listitem>
@@ -299,7 +263,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="dovecot-prog">
         <term><command>dovecot</command></term>
         <listitem>
@@ -311,7 +274,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="dsync">
         <term><command>dsync</command></term>
         <listitem>
@@ -323,10 +285,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/blfs/server/major/bind.xml
===================================================================
--- trunk/blfs/server/major/bind.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/server/major/bind.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -128,7 +128,7 @@
     class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
-chmod -v 0755 /usr/lib/lib{bind9,isc{,cc,cfg},lwres,dns}.so.*.?.? &&
+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 &&

Modified: trunk/blfs/server/other/soprano.xml
===================================================================
--- trunk/blfs/server/other/soprano.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/server/other/soprano.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -85,7 +85,9 @@
 <userinput>patch -Np1 -i ../soprano-&soprano-version;-dbus-1.patch &&
 mkdir build &&
 cd build    &&
-cmake -DCMAKE_INSTALL_PREFIX=/usr       -DCMAKE_BUILD_TYPE=Release        .. &&
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fournit avec une suite de tests qui fonctionne.</para>

Modified: trunk/blfs/server/other/unbound.xml
===================================================================
--- trunk/blfs/server/other/unbound.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/server/other/unbound.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -90,14 +90,18 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 88 unbound &&
-useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88         -g unbound -s /bin/false unbound</userinput>
+useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88 \
+        -g unbound -s /bin/false unbound</userinput>
 </screen>
     <para>
       Installez <application>Unbound</application> en lançant les commandes suivantes :
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --with-pidfile=/run/unbound.pid &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --with-pidfile=/run/unbound.pid &&
 make</userinput>
 </screen>
     <para>
@@ -113,7 +117,7 @@
     </para>
 <screen role="root">
 <userinput>make install &&
-mv -v /usr/sbin/unbound-host /usr/bin</userinput>
+mv -v /usr/sbin/unbound-host /usr/bin/</userinput>
 </screen>
     <para>
       Si vous avez construit la documentation html, installez la en lançant les commandes suivantes
@@ -164,7 +168,8 @@
         <xref linkend="dhcp"/>, en lançant la commande suivante:
       </para>
 <screen role="root">
-<userinput>sed -i '/request /isupersede domain-name-servers 127.0.0.1;'        /etc/dhcp/dhclient.conf</userinput>
+<userinput>sed -i '/request /i\supersede domain-name-servers 127.0.0.1;' \
+       /etc/dhcp/dhclient.conf</userinput>
 </screen>
       <para>
         Pour une configuration avancée, regardez le fichier <filename>/etc/unbound/unbound.conf</filename>

Modified: trunk/blfs/x/installing/mesalib.xml
===================================================================
--- trunk/blfs/x/installing/mesalib.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/installing/mesalib.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/x7app.xml
===================================================================
--- trunk/blfs/x/installing/x7app.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/installing/x7app.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -189,7 +189,8 @@
 <screen>
 <userinput>mkdir app &&
 cd app &&
-grep -v '^#' ../app-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c     -B http://xorg.freedesktop.org/releases/individual/app/ &&
+grep -v '^#' ../app-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
+    -B http://xorg.freedesktop.org/releases/individual/app/ &&
 md5sum -c ../app-&xorg-version;.md5</userinput>
 </screen>
   </sect2>
@@ -216,7 +217,7 @@
       line3="#  define _XOPEN_SOURCE 600"
       line4="#endif"
  
-      sed -i -e "s@#ifdef HAVE_CONFIG_H@$line1n$line2n$line3n$line4nn&@" sys.c
+      sed -i -e "s@#ifdef HAVE_CONFIG_H@$line1\n$line2\n$line3\n$line4\n\n&@" sys.c
       unset line1 line2 line3 line4
     ;;
   esac

Modified: trunk/blfs/x/installing/x7driver-evdev.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-evdev.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/installing/x7driver-evdev.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -132,4 +132,4 @@
         </varlistentry>
       </variablelist>
     </sect3>
-  </sect2>
\ No newline at end of file
+  </sect2>

Modified: trunk/blfs/x/installing/x7driver-fbdev.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-fbdev.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/installing/x7driver-fbdev.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -76,8 +76,7 @@
          
       </para>
 <screen>
-<userinput>sed -i -e "/mibstore.h/d" -e "/miInitializeBackingStore/d" src/fbdev.c &&
-./configure $XORG_CONFIG &&
+<userinput>./configure $XORG_CONFIG &&
 make</userinput>
 </screen>
       <para>
@@ -124,4 +123,4 @@
         </varlistentry>
       </variablelist>
     </sect3>
-  </sect2>
\ No newline at end of file
+  </sect2>

Modified: trunk/blfs/x/installing/x7driver-r128.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-r128.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/installing/x7driver-r128.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -128,4 +128,4 @@
     </sect3>
   </sect2>
   
- 
\ No newline at end of file
+ 

Modified: trunk/blfs/x/installing/xorg-server.xml
===================================================================
--- trunk/blfs/x/installing/xorg-server.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/installing/xorg-server.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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>

Modified: trunk/blfs/x/lib/agg.xml
===================================================================
--- trunk/blfs/x/lib/agg.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/agg.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -79,8 +79,7 @@
       commands:
     </para>
 <screen>
-<userinput>
-sed -i 's:  -L at x_libraries@::' src/platform/X11/Makefile.am &&
+<userinput>sed -i 's:  -L at x_libraries@::' src/platform/X11/Makefile.am &&
 sed -i '/^AM_C_PROTOTYPES/d'   configure.in                 &&
 bash autogen.sh --prefix=/usr --disable-static &&
 make</userinput>

Modified: trunk/blfs/x/lib/at-spi2-core.xml
===================================================================
--- trunk/blfs/x/lib/at-spi2-core.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/at-spi2-core.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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+2.xml
===================================================================
--- trunk/blfs/x/lib/gtk+2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/gtk+2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -76,8 +76,9 @@
     <para>Installez <application>Gtk+-2</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>sed -i 's#l (gtk-.*).sgml#& -o 1#' docs/{faq,tutorial}/Makefile.in &&
+<userinput>sed -i 's#l \(gtk-.*\).sgml#& -o \1#' docs/{faq,tutorial}/Makefile.in &&
 sed -i 's#.*@man_#man_#' docs/reference/gtk/Makefile.in               &&
+sed -i -e 's#pltcheck.sh#$(NULL)#g' gtk/Makefile.in                   &&
 ./configure --prefix=/usr --sysconfdir=/etc                           &&
 make</userinput>
 </screen>

Modified: trunk/blfs/x/lib/gtk+3.xml
===================================================================
--- trunk/blfs/x/lib/gtk+3.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/gtk+3.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -104,7 +104,11 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr --sysconfdir=/etc &&
+<userinput>./configure --prefix=/usr             \
+            --sysconfdir=/etc         \
+            --enable-broadway-backend \
+            --enable-x11-backend      \
+            --disable-wayland-backend &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/lib/pango.xml
===================================================================
--- trunk/blfs/x/lib/pango.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/pango.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/qt4.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -301,8 +301,8 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>make install                 &&
-ln -svfn qt-$VERSION /opt/qt &&
+<userinput>make install              &&
+ln -svfn qt-&qt4-version; /opt/qt &&
 install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
                   /usr/share/pixmaps/qt4logo.png       &&
 install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \

Modified: trunk/blfs/x/lib/webkitgtk2.xml
===================================================================
--- trunk/blfs/x/lib/webkitgtk2.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/webkitgtk2.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -115,8 +115,9 @@
       Installez <application>WebKitGTK+</application> en lançant les commandes suivantes
     </para>
 <screen>
-<userinput>sed -i "/%union/i %lex-param {YYLEX_PARAM}"    Source/ThirdParty/ANGLE/src/compiler/glslang.y &&
-./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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/x/lib/xulrunner.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -114,9 +114,11 @@
 ac_add_options --disable-necko-wifi
 # If you have installed libnotify comment out this line:
 ac_add_options --disable-libnotify
+# GStreamer is necessary for H.264 video playback in HTML5 Video Player;
+# to be enabled, also remember to set "media.gstreamer.enabled" to "true"
+# in about:config. If you have installed GStreamer comment out this line:
+ac_add_options --disable-gstreamer
 # Uncomment these lines if you have installed optional dependencies:
-# GStreamer is necesary for H.264 video playback in HTML5 Video Player
-#ac_add_options --enable-gstreamer
 #ac_add_options --enable-system-hunspell
 #ac_add_options --enable-startup-notification
 # Uncomment this line if you compiled Cairo with --enable-tee switch and want
@@ -167,7 +169,6 @@
       Si vous avez compilé <application>Xulrunner</application> en chroot,
       passez <envar>SHELL=/bin/bash</envar> à la première commande make dessous.
     </para></note>
-
 <screen>
 <userinput>make -f client.mk</userinput>
 </screen>
@@ -180,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/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/blfs/xsoft/graphweb/firefox.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/xsoft/graphweb/firefox.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -131,9 +131,11 @@
 ac_add_options --disable-necko-wifi
 # If you have installed libnotify comment out this line:
 ac_add_options --disable-libnotify
+# GStreamer is necessary for H.264 video playback in HTML5 Video Player;
+# to be enabled, also remember to set "media.gstreamer.enabled" to "true"
+# in about:config. If you have installed GStreamer comment out this line:
+ac_add_options --disable-gstreamer
 # Uncomment these lines if you have installed optional dependencies:
-# GStreamer is necessary for H.264 video playback in HTML5 Video Player
-#ac_add_options --enable-gstreamer
 #ac_add_options --enable-system-hunspell
 #ac_add_options --enable-startup-notification
 # Uncomment this line if you compiled Cairo with --enable-tee switch and want
@@ -213,7 +215,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 &&
@@ -231,7 +234,6 @@
 mkdir -pv /usr/lib/mozilla/plugins &&
 ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput>
 </screen>
-
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>
@@ -303,7 +305,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-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/xsoft/graphweb/seamonkey.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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/libreoffice.xml
===================================================================
--- trunk/blfs/xsoft/office/libreoffice.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/xsoft/office/libreoffice.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -263,13 +263,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 &&
-patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_neon-1.patch    &&
-./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-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-nss                       --with-system-od
 bc                      --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 +348,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/gnash.xml
===================================================================
--- trunk/blfs/xsoft/other/gnash.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/xsoft/other/gnash.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -114,8 +114,9 @@
 sed -i '/^LIBS/s/\(.*\)/\1 -lboost_system/' \
   gui/Makefile.in utilities/Makefile.in &&
 sed -i "/DGifOpen/s:Data:&, NULL:" libbase/GnashImageGif.cpp &&
+sed -i '/#include <csignal>/a\#include <unistd.h>' plugin/klash4/klash_part.cpp &&
 ./configure --prefix=/usr --sysconfdir=/etc               \
-  --with-npapi-incl=/usr/include/npapi --enable-media=gst \
+  --with-npapi-incl=/usr/include/npapi-sdk --enable-media=gst \
   --with-npapi-plugindir=/usr/lib/mozilla/plugins         \
   --without-gconf &&
 make</userinput>

Modified: trunk/blfs/xsoft/other/gparted.xml
===================================================================
--- trunk/blfs/xsoft/other/gparted.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/xsoft/other/gparted.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -85,7 +85,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr --disable-doc &&
+<userinput>./configure --prefix=/usr    \
+            --disable-doc    \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/xsoft/other/icedtea-web.xml
===================================================================
--- trunk/blfs/xsoft/other/icedtea-web.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/xsoft/other/icedtea-web.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -61,8 +61,10 @@
     <para>Installer <application>IcedTea-Web</application> en exécutant les commandes
 	suivantes:</para>
 <screen>
-<userinput>patch -Np1 -i ../icedtea-web-&icedtea-web-version;-imminent_breakage_fix-1.patch &&
-./configure --prefix=${JAVA_HOME}/jre                --with-jdk-home=${JAVA_HOME}             --disable-docs                           --mandir=${JAVA_HOME}/man &&
+<userinput>./configure --prefix=${JAVA_HOME}/jre    \
+            --with-jdk-home=${JAVA_HOME} \
+            --disable-docs               \
+            --mandir=${JAVA_HOME}/man &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de tests.</para>

Modified: trunk/blfs/xsoft/other/thunderbird.xml
===================================================================
--- trunk/blfs/xsoft/other/thunderbird.xml	2013-10-27 09:40:02 UTC (rev 4937)
+++ trunk/blfs/xsoft/other/thunderbird.xml	2013-10-27 19:13:19 UTC (rev 4938)
@@ -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