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

myou72 at orange.fr myou72 at orange.fr
Mar 9 Déc 04:50:59 PST 2014


Author: myou72
Date: 2014-12-09 04:50:59 -0800 (Tue, 09 Dec 2014)
New Revision: 6699

Modified:
   trunk/blfs/general/genlib/boost.xml
   trunk/blfs/general/genlib/libassuan.xml
   trunk/blfs/general/genlib/libffi.xml
   trunk/blfs/general/genlib/libpaper.xml
   trunk/blfs/general/genlib/qca.xml
   trunk/blfs/general/genlib/xapian.xml
   trunk/blfs/general/genutils/imagemagick.xml
   trunk/blfs/general/genutils/xscreensaver.xml
   trunk/blfs/general/graphlib/ijs.xml
   trunk/blfs/general/graphlib/libjpeg-turbo.xml
   trunk/blfs/general/graphlib/librsvg.xml
   trunk/blfs/general/graphlib/openjpeg.xml
   trunk/blfs/general/graphlib/openjpeg2.xml
   trunk/blfs/general/graphlib/poppler.xml
   trunk/blfs/general/prog/gcc-ada.xml
   trunk/blfs/general/prog/gcc-java.xml
   trunk/blfs/general/prog/gcc.xml
   trunk/blfs/general/prog/git.xml
   trunk/blfs/general/prog/llvm.xml
   trunk/blfs/general/prog/mercurial.xml
   trunk/blfs/general/prog/openjdk.xml
   trunk/blfs/general/prog/php.xml
   trunk/blfs/general/prog/ruby.xml
   trunk/blfs/general/prog/tcl.xml
   trunk/blfs/general/prog/tk.xml
   trunk/blfs/general/prog/valgrind.xml
   trunk/blfs/general/sysutils/autofs.xml
   trunk/blfs/general/sysutils/bluez.xml
   trunk/blfs/general/sysutils/colord.xml
   trunk/blfs/general/sysutils/dbus.xml
   trunk/blfs/general/sysutils/lm_sensors.xml
   trunk/blfs/general/sysutils/pciutils.xml
   trunk/blfs/general/sysutils/sg3_utils.xml
   trunk/blfs/general/sysutils/usbutils.xml
   trunk/blfs/gnome/applications/file-roller.xml
   trunk/blfs/gnome/applications/gnome-terminal.xml
   trunk/blfs/gnome/applications/nautilus.xml
   trunk/blfs/gnome/platform/gvfs.xml
   trunk/blfs/gnome/platform/notification-daemon.xml
   trunk/blfs/gnome/platform/vte.xml
   trunk/blfs/introduction/welcome/changelog.xml
   trunk/blfs/kde/add/ark.xml
   trunk/blfs/kde/add/gwenview.xml
   trunk/blfs/kde/add/kate.xml
   trunk/blfs/kde/add/kdepim-runtime.xml
   trunk/blfs/kde/add/kdepim.xml
   trunk/blfs/kde/add/kdeplasma-addons.xml
   trunk/blfs/kde/add/kmix.xml
   trunk/blfs/kde/add/konsole.xml
   trunk/blfs/kde/add/libkcddb.xml
   trunk/blfs/kde/add/libkdcraw.xml
   trunk/blfs/kde/add/libkexiv2.xml
   trunk/blfs/kde/add/okular.xml
   trunk/blfs/kde/core/baloo-widgets.xml
   trunk/blfs/kde/core/baloo.xml
   trunk/blfs/kde/core/kde-baseapps.xml
   trunk/blfs/kde/core/kde-runtime.xml
   trunk/blfs/kde/core/kde-workspace.xml
   trunk/blfs/kde/core/kdelibs.xml
   trunk/blfs/kde/core/kdepimlibs.xml
   trunk/blfs/kde/core/kfilemetadata.xml
   trunk/blfs/kde/core/phonon-backend-gstreamer.xml
   trunk/blfs/kde/core/phonon-backend-vlc.xml
   trunk/blfs/kde/core/phonon.xml
   trunk/blfs/kde/intro/pre-install-config.xml
   trunk/blfs/lxde/desktop/lxpolkit.xml
   trunk/blfs/lxde/desktop/lxsession.xml
   trunk/blfs/multimedia/cdwriteutils/k3b.xml
   trunk/blfs/multimedia/libdriv/alsa-lib.xml
   trunk/blfs/multimedia/libdriv/flac.xml
   trunk/blfs/multimedia/libdriv/gst10-libav.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml
   trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml
   trunk/blfs/multimedia/libdriv/gstreamer10.xml
   trunk/blfs/multimedia/libdriv/libmusicbrainz5.xml
   trunk/blfs/multimedia/libdriv/x264.xml
   trunk/blfs/multimedia/videoutils/ffmpeg.xml
   trunk/blfs/networking/connect/dhcp.xml
   trunk/blfs/networking/connect/dhcpcd.xml
   trunk/blfs/networking/netlibs/curl.xml
   trunk/blfs/networking/netprogs/bridgeutils.xml
   trunk/blfs/networking/netprogs/cifsutils.xml
   trunk/blfs/networking/netprogs/nfs-utils.xml
   trunk/blfs/networking/netprogs/rpcbind.xml
   trunk/blfs/networking/netprogs/samba.xml
   trunk/blfs/networking/netprogs/wpa_supplicant.xml
   trunk/blfs/networking/netutils/traceroute.xml
   trunk/blfs/networking/netutils/wireshark.xml
   trunk/blfs/postlfs/filesystems/fuse.xml
   trunk/blfs/postlfs/filesystems/jfs.xml
   trunk/blfs/postlfs/filesystems/lvm2.xml
   trunk/blfs/postlfs/filesystems/mdadm.xml
   trunk/blfs/postlfs/filesystems/ntfs-3g.xml
   trunk/blfs/postlfs/filesystems/reiser.xml
   trunk/blfs/postlfs/filesystems/xfsprogs.xml
   trunk/blfs/postlfs/security/gnutls.xml
   trunk/blfs/postlfs/security/gpgme.xml
   trunk/blfs/postlfs/security/iptables.xml
   trunk/blfs/postlfs/security/nss.xml
   trunk/blfs/postlfs/security/stunnel.xml
   trunk/blfs/postlfs/virtualization/qemu.xml
   trunk/blfs/pst/printing/cups.xml
   trunk/blfs/pst/printing/gutenprint.xml
   trunk/blfs/pst/ps/fop.xml
   trunk/blfs/pst/ps/mupdf.xml
   trunk/blfs/server/databases/mariadb.xml
   trunk/blfs/server/databases/sqlite.xml
   trunk/blfs/server/mail/postfix.xml
   trunk/blfs/server/other/unbound.xml
   trunk/blfs/template/template.xml
   trunk/blfs/x/installing/libevdev.xml
   trunk/blfs/x/installing/libva.xml
   trunk/blfs/x/installing/mesalib.xml
   trunk/blfs/x/installing/x7app.xml
   trunk/blfs/x/installing/x7driver-ati.xml
   trunk/blfs/x/installing/x7driver-cirrus.xml
   trunk/blfs/x/installing/x7driver-intel.xml
   trunk/blfs/x/installing/x7driver-nouveau.xml
   trunk/blfs/x/installing/x7driver-vesa.xml
   trunk/blfs/x/installing/x7driver-vmware.xml
   trunk/blfs/x/installing/x7driver-wacom.xml
   trunk/blfs/x/installing/x7driver.xml
   trunk/blfs/x/installing/xorg-server.xml
   trunk/blfs/x/installing/xterm.xml
   trunk/blfs/x/lib/at-spi2-core.xml
   trunk/blfs/x/lib/fltk.xml
   trunk/blfs/x/lib/gtk+3.xml
   trunk/blfs/x/lib/webkitgtk26.xml
   trunk/blfs/x/wm/sawfish.xml
   trunk/blfs/xfce/apps/midori.xml
   trunk/blfs/xfce/core/xfce4-power-manager.xml
   trunk/blfs/xfce/core/xfce4-session.xml
   trunk/blfs/xfce/core/xfce4-xkb-plugin.xml
   trunk/blfs/xincludes/texoptional.xml
   trunk/blfs/xsoft/graphweb/firefox.xml
   trunk/blfs/xsoft/graphweb/seamonkey.xml
   trunk/blfs/xsoft/office/libreoffice.xml
   trunk/blfs/xsoft/other/fontforge.xml
   trunk/blfs/xsoft/other/icedtea-web.xml
   trunk/blfs/xsoft/other/pidgin.xml
   trunk/blfs/xsoft/other/rox-filer.xml
   trunk/blfs/xsoft/other/thunderbird.xml
Log:
synchro screen

Modified: trunk/blfs/general/genlib/boost.xml
===================================================================
--- trunk/blfs/general/genlib/boost.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/genlib/boost.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -63,7 +63,10 @@
     <para>Installez <application>boost</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./bootstrap.sh --prefix=/usr &&
+<userinput>sed -e '1 i#ifndef Q_MOC_RUN' \
+    -e '$ a#endif'            \
+    -i boost/type_traits/detail/has_binary_operator.hpp &&
+./bootstrap.sh --prefix=/usr &&
 ./b2 stage threading=multi link=shared</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/genlib/libassuan.xml
===================================================================
--- trunk/blfs/general/genlib/libassuan.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/genlib/libassuan.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -98,7 +98,8 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>install -v -dm755 /usr/share/doc/libassuan-&libassuan-version; &&
-install -v -m644  doc/assuan.{pdf,ps,dvi}                   /usr/share/doc/libassuan-&libassuan-version;</userinput>
+install -v -m644  doc/assuan.{pdf,ps,dvi} \
+                  /usr/share/doc/libassuan-&libassuan-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/general/genlib/libffi.xml
===================================================================
--- trunk/blfs/general/genlib/libffi.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/genlib/libffi.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -62,8 +62,11 @@
     <para>Installez <application>libffi</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>sed -e '/^includesdir/ s:$(libdir)/@PACKAGE_NAME at -@PACKAGE_VERSION@/include:$(includedir):'     -i include/Makefile.in &&
-sed -e '/^includedir/ s:${libdir}/@PACKAGE_NAME at -@PACKAGE_VERSION@/include:@includedir@:'     -e 's/^Cflags: -I${includedir}/Cflags:/'     -i libffi.pc.in        &&
+<userinput>sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
+    -i include/Makefile.in &&
+sed -e '/^includedir/ s/=.*$/=@includedir@/' \
+    -e 's/^Cflags: -I${includedir}/Cflags:/' \
+    -i libffi.pc.in        &&
 ./configure --prefix=/usr --disable-static &&
 make</userinput>
 </screen>

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

Modified: trunk/blfs/general/genlib/qca.xml
===================================================================
--- trunk/blfs/general/genlib/qca.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/genlib/qca.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -71,7 +71,6 @@
     <xref linkend="doxygen"/>, et
     <xref linkend="which"/>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/qca"/></para>
   </sect2>
@@ -80,8 +79,13 @@
     <para>Installez <application>Qca</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -i '217s at set@this->set@' src/botantools/botan/botan/secmem.h &&
-./configure --prefix=/usr            	         --no-separate-debug-info             --certstore-path=/etc/ssl/ca-bundle.crt &&
+<userinput>mkdir build &&
+cd    build &&
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;            \
+      -DCMAKE_BUILD_TYPE=Release                \
+      -DQT4_BUILD=ON                            \
+      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
+      ..                                        &&
 make</userinput>
 </screen>
  <para>Pour tester les résultats, tapez <command>make test</command>.</para>
@@ -98,7 +102,6 @@
     forcer la construction avec Qt4 même si Qt5 est trouvé.</para>
     <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
     Installe les pages de manuel qca à l'emplacement normal.</para>
-
 </sect2>
   <sect2 role="content">
     <title>Contenu</title>
@@ -130,7 +133,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="qcatool">
         <term><command>qcatool</command></term>
         <listitem>

Modified: trunk/blfs/general/genlib/xapian.xml
===================================================================
--- trunk/blfs/general/genlib/xapian.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/genlib/xapian.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -55,7 +55,9 @@
     <title>Installation de Xapian</title>
     <para>Installez <application>Xapian</application> en lançant les comandes suivantes </para>
 <screen>
-<userinput>./configure --prefix=/usr             --disable-static             --docdir=/usr/share/doc/xapian-core-&xapian-version; &&
+<userinput>./configure --prefix=/usr \
+            --disable-static \
+            --docdir=/usr/share/doc/xapian-core-&xapian-version; &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/genutils/imagemagick.xml
===================================================================
--- trunk/blfs/general/genutils/imagemagick.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/genutils/imagemagick.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -162,7 +162,12 @@
     suivantes :</para>
  
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --enable-hdri                 --with-modules                --with-perl                   --disable-static  &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --enable-hdri     \
+            --with-modules    \
+            --with-perl       \
+            --disable-static  &&
 make</userinput>
 </screen>
      <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/general/genutils/xscreensaver.xml
===================================================================
--- trunk/blfs/general/genutils/xscreensaver.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/genutils/xscreensaver.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -90,7 +90,6 @@
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>
-
     <para><option>--with-setuid-hacks</option> : Ce paramètre autorise
     certaines démos à s'installer avec l'uid <systemitem class="username">root</systemitem>,
     ce qui est nécessaire pour pinger d'autres machines.</para>

Modified: trunk/blfs/general/graphlib/ijs.xml
===================================================================
--- trunk/blfs/general/graphlib/ijs.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/graphlib/ijs.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -70,7 +70,10 @@
       Installez <application>IJS</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --mandir=/usr/share/man             --enable-shared             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --mandir=/usr/share/man \
+            --enable-shared \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/graphlib/libjpeg-turbo.xml
===================================================================
--- trunk/blfs/general/graphlib/libjpeg-turbo.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/graphlib/libjpeg-turbo.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -96,7 +96,9 @@
       proprement. Pour corriger cela avant l'installation, lancez la suite en tant qu'utilisateur
       <systemitem
       class="username">root</systemitem> user:</para>
-<screen role="root"><userinput>rm -f /usr/lib/libjpeg.so*</userinput></screen>
+<screen role="root">
+<userinput>rm -f /usr/lib/libjpeg.so*</userinput>
+</screen>
     </note>
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :

Modified: trunk/blfs/general/graphlib/librsvg.xml
===================================================================
--- trunk/blfs/general/graphlib/librsvg.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/graphlib/librsvg.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -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/openjpeg.xml
===================================================================
--- trunk/blfs/general/graphlib/openjpeg.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/graphlib/openjpeg.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -60,13 +60,9 @@
   </sect2>
   <sect2 role="installation">
     <title>Installation de OpenJPEG</title>
-
-
     <para>
       Installez <application>OpenJPEG</application> en lançant les commandes suivantes:
     </para>
-
-
 <screen>
 <userinput>autoreconf -f -i &&
 ./configure --prefix=/usr --disable-static &&

Modified: trunk/blfs/general/graphlib/openjpeg2.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/graphlib/poppler.xml
===================================================================
--- trunk/blfs/general/graphlib/poppler.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/graphlib/poppler.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -134,7 +134,10 @@
     </para>
 <screen>
 <userinput>[ -e /usr/bin/setqt4 ] && source setqt4 || [ ! -e /usr/bin/setqt5 ] &&
-./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --enable-xpdf-headers &&
+./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-xpdf-headers &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez : <command>make check</command>.
@@ -149,7 +152,10 @@
     </para>
 <screen>
 <userinput>[ -e /usr/bin/setqt5 ] && source setqt5 &&
-./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static              --enable-xpdf-headers &&
+./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-xpdf-headers &&
 make</userinput>
 </screen>
     <para>
@@ -166,9 +172,9 @@
      Les documents sont installés en utilisant la commande suivante:
     </para>
 <screen role="root">
-<userinput>install -v -m755 -d       /usr/share/doc/poppler-&poppler-version; &&
-install -v -m644 README*  /usr/share/doc/poppler-&poppler-version; &&
-cp -vr lib/reference/html /usr/share/doc/poppler-&poppler-version;</userinput>
+<userinput>install -v -m755 -d        /usr/share/doc/poppler-&poppler-version; &&
+install -v -m644 README*   /usr/share/doc/poppler-&poppler-version; &&
+cp -vr glib/reference/html /usr/share/doc/poppler-&poppler-version;</userinput>
 </screen>
 <bridgehead renderas="sect3">Donnée Poppler</bridgehead>
     <para>Si vous avez téléchargé le paquet d'encodage de données supplémentaires,

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

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

Modified: trunk/blfs/general/prog/gcc.xml
===================================================================
--- trunk/blfs/general/prog/gcc.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/gcc.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -124,10 +124,19 @@
     <command>./configure</command> ci-dessous.</para>
    <para>Installez <application>GCC</application> en lançant les commandes suivantes:</para>
 <screen>
-<userinput>patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch    &&
+<userinput>
 mkdir ../gcc-build                                   &&
 cd    ../gcc-build                                   &&
-../gcc-&gcc-version;/configure                                   --prefix=/usr                                        --libdir=/usr/lib                                    --enable-shared                                      --enable-threads=posix                               --enable-__cxa_atexit                                --enable-clocale=gnu                                 --disable-multilib                                   --with-system-zlib                                   --enable-languages=c,c++,fortran,go,objc,obj-c++ &&
+../gcc-&gcc-version;/configure                               \
+    --prefix=/usr                                    \
+    --libdir=/usr/lib                                \
+    --enable-shared                                  \
+    --enable-threads=posix                           \
+    --enable-__cxa_atexit                            \
+    --enable-clocale=gnu                             \
+    --disable-multilib                               \
+    --with-system-zlib                               \
+    --enable-languages=c,c++,fortran,go,objc,obj-c++ &&
 make</userinput>
 </screen>
 <para>Si vous avez installé des paquets supplémentaires comme <application>Valgrind</application> et <application>GDB</application>,
@@ -151,7 +160,8 @@
 <userinput>make install &&
 mkdir -pv /usr/share/gdb/auto-load/usr/lib              &&
 mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib &&
-chown -v -R root:root     /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput>
+chown -v -R root:root \
+    /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput>
 </screen>
     
     <para>Quelques paquets veulent trouver le préprocesseur C dans

Modified: trunk/blfs/general/prog/git.xml
===================================================================
--- trunk/blfs/general/prog/git.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/git.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -100,7 +100,8 @@
     <para>Installez <application>Git</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                     --with-gitconfig=/etc/gitconfig &&
+<userinput>./configure --prefix=/usr         \
+            --with-gitconfig=/etc/gitconfig &&
 make</userinput>
 </screen>
      <para>
@@ -146,14 +147,17 @@
     <para>Si vous avez téléchargé les pages de manuel déballez les en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>tar -xf ../git-manpages-&git-version;.tar.xz     -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput>
+<userinput>tar -xf ../git-manpages-&git-version;.tar.xz \
+    -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput>
 </screen>
     <para>Si vous avez téléchargé les documentations HTML déballez les en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>tar -xf  ../git-htmldocs-&git-version;.tar.xz     -C   /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &&
-find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} ;     &&
-find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} ;</userinput>
+<userinput>mkdir -vp   /usr/share/doc/git-&git-version; &&
+tar   -xf   ../git-htmldocs-&git-version;.tar.xz \
+      -C    /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &&
+find        /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \; &&
+find        /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput>
 </screen>
    <bridgehead renderas="sect3">Reorganisez les pages de man et.ou les docs html (pour les deux méthodes)</bridgehead>
     <para>
@@ -161,15 +165,15 @@
       <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &&
-mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &&
-mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &&
-mv       /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &&
-mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &&
-mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &&
-mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &&
-mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput>
+<userinput>mkdir -vp /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
+mv        /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &&
+mv        /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &&
+mkdir -vp /usr/share/doc/git-&git-version;/technical/{html,text}         &&
+mv        /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &&
+mv        /usr/share/doc/git-&git-version;/technical/{*.,}html           &&
+mkdir -vp /usr/share/doc/git-&git-version;/howto/{html,text}             &&
+mv        /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &&
+mv        /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/general/prog/llvm.xml
===================================================================
--- trunk/blfs/general/prog/llvm.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/llvm.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -40,8 +40,6 @@
     <para>Les paquets facultatifs <application>Clang</application> et <application>Compiler RT</application> fournissent de
     nouvelles interfaces C, C++, C objet et C++ objet et des bibliothèques d'exécution
     pour <application>LLVM</application>.</para>
-
-
     <note>
       <para>
         Ce paquet présente un bogue avec gcc-4.9.0 ou un gcc-4.9.1 non-modifié.
@@ -50,8 +48,6 @@
         pour les instructions d'installation de <application>gcc</application>.
       </para>
     </note>
-
-
    &lfs76_checked;
     <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/blfs/general/prog/mercurial.xml
===================================================================
--- trunk/blfs/general/prog/mercurial.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/mercurial.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -92,12 +92,13 @@
     ces tests peuvent être désactivé. Pour tester les résultats dans le sous-répertoire
     <filename class="directory">tmp</filename>, en blacklistant ce test, tapez:</para>
 <screen>
-<userinput>cat > tests/blacklists/test-failed << "EOF"
-<literal># Failure with Python-2.7.8
-  test-patchbomb.t</literal>
+<userinput>cat > tests/blacklists/failed-tests << "EOF"
+<literal># Test Failures
+  test-parse-date.t</literal>
 EOF
 rm -rf tests/tmp &&
-TESTFLAGS="--tmpdir tmp --blacklist blacklists/test-failed" make check</userinput>
+TESTFLAGS="-j<replaceable><N></replaceable> --tmpdir tmp --blacklist blacklists/failed-tests" \
+make check</userinput>
 </screen>
     <para>Ou <replaceable><N></replaceable> est un nombre entier entre un et le nombre de  coeurs du processeur.
      Afin de pouvoir investiguer un test échouant en particulier, par exemple <quote>test-parse-date.t</quote>

Modified: trunk/blfs/general/prog/openjdk.xml
===================================================================
--- trunk/blfs/general/prog/openjdk.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/openjdk.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -68,7 +68,6 @@
         <xref linkend="icedtea-web"/> et <xref linkend="icedtea-sound"/>.
       </para>
     </note>
-
     <para>OpenJDK est du code GPL, cependant, il convient de préciser qu'il y a
      eu une exception spéciale pour les projets non-libres d'utiliser ces classes dans
      leurs produits propriétaires. De façon similaire à la LGPL, qui autorise
@@ -81,7 +80,6 @@
     également être librement disponible.</para>
     <note>
   
-
     <para>Les sources de <application>OpenJDK</application> inclu une très complète, open source
       suite de tests appelée <application>JTreg</application>.
       Les instructions de tests suivantes permettent de tester le JDK juste construit pour une
@@ -91,7 +89,6 @@
       une suite de tests fermée <application>JCK/TCK</application>. Pas de revendication
       de compatibilité, même une compatibilité partielle, peut être faite sans passer
       une suite de tests approuvées.</para>
-
       <para>Oracle fournit un accès libre communautaire, au cas par cas,
       à des outils fermés pour assurer une compatibilité à 100% avec leur JDK propriétaire.
       Cependant la version binaire fournit sur la page <xref linkend="java"/> comme le JVM construit avec les instructions
@@ -100,7 +97,6 @@
       TCK</ulink>. Toutes les versions qui seront construites en utilisant les instructions données,
       ne pourront pas revendiquer d'être compatible avec le JDK propriétaire,  sans que l'utilisateur demande, et
       réussissent les tests de compatibilités.</para>
-
       <para>Avec cela en tête, les binaires produits en utilisant cette méthode de construction sont
          régulièrement testé avec le TCK par les membres listés sur le site au dessus.
       En supplément de la licence communautaire, une licence pour l'éducation, non-commerciale
@@ -244,31 +240,37 @@
     Vous devez commencer par extraire les sources racines depuis le fichier <filename>&ojdk-tarball;</filename>, allez
     dans le répertoire extrait, ensuite continuez avec les instruction suivantes :
      </para>
-<screen><userinput>tar -xf ../corba.tar.xz      &&
+<screen>
+<userinput>tar -xf ../corba.tar.xz      &&
 tar -xf ../hotspot.tar.xz    &&
 tar -xf ../jaxp.tar.xz       &&
 tar -xf ../jaxws.tar.xz      &&
 tar -xf ../jdk.tar.xz        &&
 tar -xf ../langtools.tar.xz  &&
-tar -xf ../nashorn.tar.xz</userinput></screen>
-
+tar -xf ../nashorn.tar.xz</userinput>
+</screen>
    <para>
       Si vous avez téléchargé la suite de tests, décompressez la également:
     </para>
-
-<screen><userinput>tar -xf ../jtreg&jtreg-version;.tar.gz</userinput></screen>
+<screen>
+<userinput>tar -xf ../jtreg&jtreg-version;.tar.gz</userinput>
+</screen>
     <para>
       Corrigez un problème avec la nouvelle API de giflib (depuis 5.1.0):
     </para>
-<screen><userinput>sed -e 's/DGifCloseFile(gif/&, NULL/'     -e '/DGifOpen/s/c)/c, NULL)/'         -i jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c</userinput></screen>
-
+<screen>
+<userinput>sed -e 's/DGifCloseFile(gif/&, NULL/' \
+    -e '/DGifOpen/s/c)/c, NULL)/'     \
+    -i jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c</userinput>
+</screen>
     <para>
       corrigez un bogue dans un script shell utilisé pour initialisé les drapeaux pour
       <command>make</command>:
     </para>
-
-<screen><userinput>sed 's/([ t])]([^])/1I]2/g'     -i hotspot/make/linux/makefiles/adjust-mflags.sh</userinput></screen>
-
+<screen>
+<userinput>sed 's/\([ \t]\)\]\([^\]\)/\1I]\2/g' \
+    -i hotspot/make/linux/makefiles/adjust-mflags.sh</userinput>
+</screen>
     <note>
       <para>
          Avant de continuer, vous devez vous assurer que votre variable d'environnement
@@ -284,85 +286,111 @@
     </note>
     <para>Configurez et construisez le paquet avec les commandes suivantes
     (la valeur --with-milestone peut être modifiée selon les préférences de l'utilisateur):</para>
-<screen><userinput>unset JAVA_HOME               &&
-sh ./configure                   --with-update-version=&ojdk-upd;      --with-build-number=&ojdk-bd;       --with-milestone=BLFS         --enable-unlimited-crypto     --with-zlib=system            --with-giflib=system       &&
-make DEBUG_BINARIES=true all</userinput></screen>
-
+<screen>
+<userinput>unset JAVA_HOME               &&
+sh ./configure                \
+   --with-update-version=&ojdk-upd;   \
+   --with-build-number=&ojdk-bd;    \
+   --with-milestone=BLFS      \
+   --enable-unlimited-crypto  \
+   --with-zlib=system         \
+   --with-giflib=system       &&
+make DEBUG_BINARIES=true all</userinput>
+</screen>
     <para>
       Il semble que l'infrastructure de tests de OpenJDK est en cours de réalisation, donc tester la nouvelle version construite
       de JVM demande quelques étapes. En premiet, il est mieux de lancer la suite de test dans un
       frame buffer sur un affichage différent, en utilisant
        Xvfb:
     </para>
-<screen role='nodump'><userinput>if [ -n "$DISPLAY" ]; then
+<screen role='nodump'>
+<userinput>if [ -n "$DISPLAY" ]; then
   OLD_DISP=$DISPLAY
 fi
 export DISPLAY=:20
-nohup Xvfb $DISPLAY                                         -fbdir $(pwd)                                    -pixdepths 8 16 24 32 > Xvfb.out 2>&1 &
+nohup Xvfb $DISPLAY                              \
+           -fbdir $(pwd)                         \
+           -pixdepths 8 16 24 32 > Xvfb.out 2>&1 &
 echo $! > Xvfb.pid
 echo Waiting for Xvfb to initialize; sleep 1
-nohup twm -display $DISPLAY           -f /dev/null > twm.out 2>&1            &
+nohup twm -display $DISPLAY \
+          -f /dev/null > twm.out 2>&1            &
 echo $! > twm.pid
 echo Waiting for twm to initialize; sleep 1
-xhost +</userinput></screen>
+xhost +</userinput>
+</screen>
     <para>
       Ensuite, il est nécéssaire de modifier quelques fichiers:
     </para>
-
-<screen role='nodump'><userinput>echo -e "
-jdk_all = :jdk_core           \
-          :jdk_svc            \
-          :jdk_beans          \
-          :jdk_imageio        \
-          :jdk_sound          \
-          :jdk_sctp           \
-          com/sun/awt         \
-          javax/accessibility \
-          javax/print         \
-          sun/pisces          \
+<screen role='nodump'>
+<userinput>echo -e "
+jdk_all = :jdk_core           \\
+          :jdk_svc            \\
+          :jdk_beans          \\
+          :jdk_imageio        \\
+          :jdk_sound          \\
+          :jdk_sctp           \\
+          com/sun/awt         \\
+          javax/accessibility \\
+          javax/print         \\
+          sun/pisces          \\
           com/sun/java/swing" >> jdk/test/TEST.groups &&
-sed -e 's/all:.*jck.*/all: jtreg/'     -i langtools/test/Makefile</userinput></screen>
-
+sed -e 's/all:.*jck.*/all: jtreg/' \
+    -i langtools/test/Makefile</userinput>
+</screen>
     <para>
       Quelques variables doivent être initialisée:
     </para>
-
-<screen role='nodump'><userinput>JT_JAVA=$(type -p javac | sed 's@/bin.*@@') &&
+<screen role='nodump'>
+<userinput>JT_JAVA=$(type -p javac | sed 's@/bin.*@@') &&
 JT_HOME=$(pwd)/jtreg                        &&
-PRODUCT_HOME=$(echo $(pwd)/build/*/images/j2sdk-image)</userinput></screen>
-
+PRODUCT_HOME=$(echo $(pwd)/build/*/images/j2sdk-image)</userinput>
+</screen>
     <para>
       Les tests sont lancé comme la suite:
     </para>
-
-<screen role='nodump'><userinput>LANG=C make -k -C test                                  JT_HOME=${JT_HOME}                          JT_JAVA=${JT_JAVA}                          PRODUCT_HOME=${PRODUCT_HOME} all &&
-LANG=C ${JT_HOME}/linux/bin/jtreg -a -v:fail,error                 -dir:$(pwd)/hotspot/test                    -k:!ignore                                 -jdk:${PRODUCT_HOME}                        :jdk</userinput></screen>
-
+<screen role='nodump'>
+<userinput>LANG=C make -k -C test                      \
+            JT_HOME=${JT_HOME}              \
+            JT_JAVA=${JT_JAVA}              \
+            PRODUCT_HOME=${PRODUCT_HOME} all &&
+LANG=C ${JT_HOME}/linux/bin/jtreg -a -v:fail,error \
+                -dir:$(pwd)/hotspot/test    \
+                -k:\!ignore                 \
+                -jdk:${PRODUCT_HOME}        \
+                :jdk</userinput>
+</screen>
     <para>
       Les résultats des tests peuvent être comparé avec ces 
       <ulink url="http://download.java.net/openjdk/testresults/8/">résultats</ulink>.
       Finallement, arrêtez le frame buffer virtuel et nettoyez:
     </para>
-<screen role='nodump'><userinput>kill -9 `cat twm.pid`  &&
+<screen role='nodump'>
+<userinput>kill -9 `cat twm.pid`  &&
 kill -9 `cat Xvfb.pid` &&
 rm -f Xvfb.out twm.out &&
 rm -f Xvfb.pid twm.pid &&
 if [ -n "$OLD_DISP" ]; then
   DISPLAY=$OLD_DISP
-fi</userinput></screen>
+fi</userinput>
+</screen>
 <para>Installez le paquet avec les commandes suivantes en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
-<screen role="root"><userinput>find build/*/images/j2sdk-image -iname *.jar -exec chmod a+r {} ; &&
+<screen role="root">
+<userinput>find build/*/images/j2sdk-image -iname \*.jar -exec chmod a+r {} \; &&
 chmod a+r build/*/images/j2sdk-image/lib/ct.sym &&
-find build/*/images/j2sdk-image -iname *.diz -delete &&
-find build/*/images/j2sdk-image -iname *.debuginfo -delete &&
+find build/*/images/j2sdk-image -iname \*.diz -delete &&
+find build/*/images/j2sdk-image -iname \*.debuginfo -delete &&
 cp -R build/*/images/j2sdk-image /opt/OpenJDK-&openjdk-version; &&
- chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
+chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput>
+</screen>
     <para>si vous le souhaitez, vous pouvez installer un fichier .desktop
 correspondant à une netrée dans le menu du bureau pour <command>policytool</command>. En premier,
 vous devez obtenir un icone de <xref linkend="icedtea-web"/>:</para>
 <screen>
-<userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz          icedtea-web-&icedtea-web-version;/javaws.png         --strip-components=1</userinput>
+<userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz  \
+        icedtea-web-&icedtea-web-version;/javaws.png \
+        --strip-components=1</userinput>
 </screen>
 <para>
 Maintenant, en tant
@@ -399,7 +427,6 @@
     du <application>JDK</application> temporaire.Ce n'est normalement pas nécéssaire si <command>java</command>
     est trouvé dans le <envar>PATH</envar>.
 </para>
-
     <para>
       <parameter>--with-update-version</parameter>: Actuellement, le système de construction n'inclu pas le numéro de mise
       à jour dans la chaine de version. Il est spécifié ici.
@@ -442,7 +469,6 @@
     <para>
       <command>find ... -iname '*.diz' -delete</command>: Cette comande et la suivante suppriment les fichier redondants.
     </para>
-
     
   </sect2>
   <sect2 role="configuration" id="openjdk-config" xreflabel="Configuration d'OpenJDK" >
@@ -493,8 +519,12 @@
     En tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>cat >> /etc/profile.d/extrapaths.sh << "EOF" &&
-# Begin Java addition
-<literal>pathappend /opt/jdk/man       MANPATH
+<literal># Begin Java addition
+if ! [ -n $MANPATH ]; then
+  MANPATH=:/opt/jdk/man
+else
+  pathappend /opt/jdk/man       MANPATH
+fi
 # End Java addition</literal>
 EOF
 cat >> /etc/man_db.conf << "EOF" &&
@@ -504,6 +534,7 @@
 MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk
 # End Java addition</literal>
 EOF
+mkdir -p /var/cache/man
 mandb -c /opt/jdk/man</userinput>
 </screen>
 <para>Pour tester que les pages de man sont correctement installées, tapez <command>source /etc/profile</command> et <command>man java</command> pour afficher les pages de man respectives.</para>
@@ -512,7 +543,6 @@
     
     <sect3 id='ojdk-certs'>
       <title>Installez ou mettez à jour les fichiers "JRE Certificate Authority Certificates" (cacerts)</title>
-
       <para>Utilisez la procédure suivante pour installer le fichier <filename>cacerts</filename>
        ou pour en générer un nouveau si  <xref linkend="cacerts"/> a été mis à jour.
        Pour commencer, s'il n'est pas déjà présent, générez le script <command>mkcacerts</command>
@@ -634,31 +664,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
@@ -700,7 +730,11 @@
     certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
     certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
     sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
-    echo yes | env LC_ALL=C "${KEYTOOL}" -import                                                              -alias `basename "${cert}"`                                          -keystore "${OUTFILE}"                                               -storepass 'changeit'                                                -file "${tempfile}"
+    echo yes | env LC_ALL=C "${KEYTOOL}" -import                     \
+                                         -alias `basename "${cert}"` \
+                                         -keystore "${OUTFILE}"      \
+                                         -storepass 'changeit'       \
+                                         -file "${tempfile}"
     rm "${tempfile}"
 done
 if test "${TEMPDIR}x" != "x" ; then
@@ -722,7 +756,11 @@
     Ensuite vous pouvez en créer un nouveau, en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>/opt/jdk/bin/mkcacerts                    -d "/etc/ssl/certs/"              -k "/opt/jdk/bin/keytool"         -s "/usr/bin/openssl"             -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
+<userinput>/opt/jdk/bin/mkcacerts            \
+        -d "/etc/ssl/certs/"      \
+        -k "/opt/jdk/bin/keytool" \
+        -s "/usr/bin/openssl"     \
+        -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
 </screen>
     </sect3> 
   </sect2>

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

Modified: trunk/blfs/general/prog/ruby.xml
===================================================================
--- trunk/blfs/general/prog/ruby.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/ruby.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -5,9 +5,6 @@
   %general-entities;
   <!ENTITY ruby-download-http "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-&ruby-version;.tar.xz">
   <!ENTITY ruby-download-ftp  " ">
-<!--
-  <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/2.1/ruby-&ruby-version;-p&ruby-patch-version;.tar.bz2">
--->
   <!ENTITY ruby-md5sum        "8a30ed4b022a24acbb461976c9c70789">
   <!ENTITY ruby-size          "9 Mo">
   <!ENTITY ruby-buildsize     "337 Mo (additional 550 Mo for rdoc indexes and API documents)">
@@ -69,7 +66,9 @@
     <para>Installez <application>Ruby</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr               --enable-shared             --docdir=/usr/share/doc/ruby-&ruby-version; &&
+<userinput>./configure --prefix=/usr   \
+            --enable-shared \
+            --docdir=/usr/share/doc/ruby-&ruby-version; &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.</para>

Modified: trunk/blfs/general/prog/tcl.xml
===================================================================
--- trunk/blfs/general/prog/tcl.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/tcl.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -12,7 +12,7 @@
   <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
   <!ENTITY tcl-doc-md5sum    "912142f117a090e83e8ec3d771572191">
   <!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;">
@@ -83,11 +83,23 @@
 <screen>
 <userinput>export SRCDIR=`pwd` &&
 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#$SRCDIR/unix#/usr/lib#"     -e "s#$SRCDIR#/usr/include#"      -i tclConfig.sh               &&
-sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.1#/usr/lib/tdbc1.0.0#"     -e "s#$SRCDIR/pkgs/tdbc1.0.1/generic#/usr/include#"        -e "s#$SRCDIR/pkgs/tdbc1.0.1/library#/usr/lib/tcl8.6#"     -e "s#$SRCDIR/pkgs/tdbc1.0.1#/usr/include#"                -i pkgs/tdbc1.0.1/tdbcConfig.sh                        &&
-sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.1#/usr/lib/itcl4.0.0#"     -e "s#$SRCDIR/pkgs/itcl4.0.1/generic#/usr/include#"        -e "s#$SRCDIR/pkgs/itcl4.0.1#/usr/include#"                -i pkgs/itcl4.0.1/itclConfig.sh                        &&
+sed -e "s#$SRCDIR/unix#/usr/lib#" \
+    -e "s#$SRCDIR#/usr/include#"  \
+    -i tclConfig.sh               &&
+sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.2#/usr/lib/tdbc1.0.2#" \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.2/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.2/library#/usr/lib/tcl8.6#" \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.2#/usr/include#"            \
+    -i pkgs/tdbc1.0.2/tdbcConfig.sh                        &&
+sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.2#/usr/lib/itcl4.0.2#" \
+    -e "s#$SRCDIR/pkgs/itcl4.0.2/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/itcl4.0.2#/usr/include#"            \
+    -i pkgs/itcl4.0.2/itclConfig.sh                        &&
 unset SRCDIR</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.</para>

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

Modified: trunk/blfs/general/prog/valgrind.xml
===================================================================
--- trunk/blfs/general/prog/valgrind.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/prog/valgrind.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -91,7 +91,8 @@
 <screen>
 <userinput>sed -i 's/-mt//g' configure &&
 sed -i 's|/doc/valgrind||' docs/Makefile.in &&
-./configure --prefix=/usr             --datadir=/usr/share/doc/valgrind-&valgrind-version; &&
+./configure --prefix=/usr \
+            --datadir=/usr/share/doc/valgrind-&valgrind-version; &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/sysutils/autofs.xml
===================================================================
--- trunk/blfs/general/sysutils/autofs.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/autofs.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -70,16 +70,16 @@
     <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>
+  <*/M> Kernel automounter version 4 support (also supports v3) [CONFIG_AUTOFS4_FS]</literal>
 </screen>
     <para>
       Facultativement, activez les options suivantes dans la configuration du noyau:
     </para>
 <screen>
 <literal>File systems  --->
-  Network File Systems  --->
-    NFS client support: Y or M
-    CIFS support (advanced network filesystem, SMBFS successor): Y or M</literal>
+  [*] Network File Systems  --->                                      [CONFIG_NETWORK_FILESYSTEMS]
+    <*/M> NFS client support                                          [CONFIG_NFS_FS]
+    <*/M> CIFS support (advanced network filesystem, SMBFS successor) [CONFIG_CIFS]</literal>
 </screen>
   <para>Recompilez et installez le nouveau noyau si nécessaire.</para>
   </sect2>

Modified: trunk/blfs/general/sysutils/bluez.xml
===================================================================
--- trunk/blfs/general/sysutils/bluez.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/bluez.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -87,16 +87,17 @@
       Actives les options suivantes dans la configuration du noyau et recompilez le noyau si nécessaire:
     </para>
 <screen>
-<literal>[*] Networking support --->                   [CONFIG_NET]
-  <*> or <M> Bluetooth subsystem support ---> [CONFIG_BT]
-    <*> or <M> RFCOMM protocol support        [CONFIG_BT_RFCOMM]
-    [*] RFCOMM TTY support                    [CONFIG_BT_RFCOMM_TTY]
-    <*> or <M> BNEP protocol support          [CONFIG_BT_BNEP]
-    [*] Multicast filter support              [CONFIG_BT_BNEP_MC_FILTER]
-    [*] Protocol filter support               [CONFIG_BT_BNEP_PROTO_FILTER]
-    <*> or <M> HIDP protocol support          [CONFIG_BT_HIDP]
-    Bluetooth device drivers --->
-  <*> or <M> RF switch subsystem support</literal>
+<literal>[*] Networking support --->                [CONFIG_NET]
+  </M> Bluetooth subsystem support --->    [CONFIG_BT]
+    <*/M> RFCOMM protocol support          [CONFIG_BT_RFCOMM]
+    [*]   RFCOMM TTY support               [CONFIG_BT_RFCOMM_TTY]
+    <*/M> BNEP protocol support            [CONFIG_BT_BNEP]
+    [*]   Multicast filter support         [CONFIG_BT_BNEP_MC_FILTER]
+    [*]   Protocol filter support          [CONFIG_BT_BNEP_PROTO_FILTER]
+    <*/M> HIDP protocol support            [CONFIG_BT_HIDP]
+        Bluetooth device drivers --->
+          (Select the appropriate drivers for your Bluetooth hardware)
+  <*/M> RF switch subsystem support --->   [CONFIG_RFKILL]</literal>
 </screen>
     <indexterm zone="bluez bluez-kernel">
       <primary sortas="d-bluez">bluez</primary>
@@ -116,7 +117,11 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                     --sysconfdir=/etc                 --localstatedir=/var              --enable-library                  --disable-systemd     &&
+<userinput>./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
+            --enable-library      \
+            --disable-systemd     &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/sysutils/colord.xml
===================================================================
--- trunk/blfs/general/sysutils/colord.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/colord.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -95,12 +95,22 @@
     </para>
 <screen role="root">
 <userinput>groupadd -g 71 colord &&
-useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71         -g colord -s /bin/false colord</userinput>
+useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
+        -g colord -s /bin/false colord</userinput>
 </screen>
     <para>Installez <application>colord</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                            --sysconfdir=/etc                        --localstatedir=/var                     --with-daemon-user=colord                --enable-vala                            --enable-systemd-login=no                --disable-bash-completion                --disable-static                         --with-systemdsystemunitdir=no &&
+<userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --with-daemon-user=colord    \
+            --enable-vala                \
+            --enable-systemd-login=no    \
+            --disable-argyllcms-sensor   \
+            --disable-bash-completion    \
+            --disable-static             \
+            --with-systemdsystemunitdir=no &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
@@ -142,7 +152,6 @@
       <parameter>--with-systemdsystemunitdir=no</parameter>: Désactive
       la construction avec les bibliothèques systemd.
     </para>
-
     <para>
       <option>--enable-gtk-doc</option>: Utilisez ce paramètre si 
       <application>GTK-Doc</application> est installé et que vous souhaitiez construire et

Modified: trunk/blfs/general/sysutils/dbus.xml
===================================================================
--- trunk/blfs/general/sysutils/dbus.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/dbus.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -80,7 +80,8 @@
     messages système :</para>
 <screen role="root">
 <userinput>groupadd -g 18 messagebus &&
-useradd -c "D-Bus Message Daemon User" -d /var/run/dbus         -u 18 -g messagebus -s /bin/false messagebus</userinput>
+useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
+        -u 18 -g messagebus -s /bin/false messagebus</userinput>
 </screen>
     <para>Installez <application>D-BUS</application> en lançant les commandes
     suivantes (vous pouvez d'abord souhaiter observer la sortie de
@@ -88,15 +89,22 @@
     à la commande <command>configure</command> affichée ci-dessous) :</para>
  
 <screen>
-<userinput>./configure --prefix=/usr                              --sysconfdir=/etc                          --localstatedir=/var                       --with-console-auth-dir=/run/console/             --without-systemdsystemunitdir             --disable-systemd                          --disable-static &&
+<userinput>./configure --prefix=/usr                  \
+            --sysconfdir=/etc              \
+            --localstatedir=/var           \
+            --disable-doxygen-docs         \
+            --disable-static               \
+            --disable-systemd              \
+            --without-systemdsystemunitdir \
+            --with-console-auth-dir=/run/console/ \
+            --docdir=/usr/share/doc/dbus-&dbus-version;   &&
 make</userinput>
 </screen>
     <para>Voir ci-dessous pour les instructions de test.</para>
  
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make install &&
-mv -v /usr/share/doc/dbus /usr/share/doc/dbus-&dbus-version;</userinput>
+<userinput>make install</userinput>
 </screen>
 <para>
       Si vous construisez votre système en chroot ou que vous n'avez pas encore lancé 
@@ -153,7 +161,6 @@
     </para>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <parameter>--disable-systemd</parameter> : Cette option désactive le
       support de systemd dans <application>D-Bus</application>

Modified: trunk/blfs/general/sysutils/lm_sensors.xml
===================================================================
--- trunk/blfs/general/sysutils/lm_sensors.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/lm_sensors.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -94,18 +94,16 @@
       les modules et ensuite compiler tous ce qui peut être nécessaire à Lm Sensors en modules:
     </para>
 <screen>
-<literal>Top level 
-  [*] Enable loadable module support  --->
+<literal>
+[*] Enable loadable module support  --->  [CONFIG_MODULES]
 Bus options (PCI etc.)  --->
-  [*] PCI support
+  [*] PCI support                         [CONFIG_PCI]
 Device Drivers  --->
-  [*] I2C support
-    [*] I2C device interface
-    I2C Algorithms  --->
-      <M> (configure all of them as modules)
+  I2C support --->
+    <*/M> I2C device interface            [CONFIG_I2C_CHARDEV]
     I2C Hardware Bus support  --->
       <M> (configure all of them as modules)
-  [*] Hardware Monitoring support  --->
+  <*/M> Hardware Monitoring support  ---> [CONFIG_HWMON]
     <M> (configure all of them as modules)</literal>
 </screen>
     <para>

Modified: trunk/blfs/general/sysutils/pciutils.xml
===================================================================
--- trunk/blfs/general/sysutils/pciutils.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/pciutils.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -55,12 +55,17 @@
     <para>Installez <application>PCI Utils</application> en
     lançant les commandes suivantes :</para>
 <screen>
-<userinput>make PREFIX=/usr                   SHAREDIR=/usr/share/misc      SHARED=yes</userinput>
+<userinput>make PREFIX=/usr              \
+     SHAREDIR=/usr/share/misc \
+     SHARED=yes</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>make PREFIX=/usr                   SHAREDIR=/usr/share/misc      SHARED=yes                    install install-lib      &&
+<userinput>make PREFIX=/usr              \
+     SHAREDIR=/usr/share/misc \
+     SHARED=yes               \
+     install install-lib      &&
 chmod -v 755 /usr/lib/libpci.so</userinput>
 </screen>
   </sect2>

Modified: trunk/blfs/general/sysutils/sg3_utils.xml
===================================================================
--- trunk/blfs/general/sysutils/sg3_utils.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/sg3_utils.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -423,8 +423,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-
        <varlistentry id="sg_requests">
         <term><command>sg_requests</command></term>
         <listitem>
@@ -455,7 +453,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="sg_rmsn">
         <term><command>sg_rmsn</command></term>
         <listitem>
@@ -517,7 +514,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="sg_sat_read_gplog">
         <term><command>sg_sat_read_gplog</command></term>
         <listitem>
@@ -530,7 +526,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="sg_sat_set_features">
         <term><command>sg_sat_set_features</command></term>
         <listitem>
@@ -571,7 +566,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="sg_ses_microcode">
         <term><command>sg_ses_microcode</command></term>
         <listitem>
@@ -583,9 +577,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-
-
       <varlistentry id="sg_start">
         <term><command>sg_start</command></term>
         <listitem>
@@ -690,7 +681,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="sg_write_verify">
         <term><command>sg_write_verify</command></term>
         <listitem>
@@ -702,7 +692,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="sg_wr_mode">
         <term><command>sg_wr_mode</command></term>
         <listitem>

Modified: trunk/blfs/general/sysutils/usbutils.xml
===================================================================
--- trunk/blfs/general/sysutils/usbutils.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/general/sysutils/usbutils.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -93,7 +93,8 @@
     en tant qu'utilisateur <systemitem
    class="username">root</systemitem> user :</para>
 <screen role="root">
-<userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput>
+<userinput>install -dm755 /usr/share/hwdata/ &&
+wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput>
 </screen>
     <para>Il se peut que vous souhaitiez ajouter une entrée
     au crontab de <systemitem class="username">root</systemitem> (ou à

Modified: trunk/blfs/gnome/applications/file-roller.xml
===================================================================
--- trunk/blfs/gnome/applications/file-roller.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/gnome/applications/file-roller.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -78,7 +78,9 @@
     <para>Installez <application>File Roller</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                     --disable-packagekit              --disable-static &&
+<userinput>./configure --prefix=/usr         \
+            --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	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/gnome/applications/gnome-terminal.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -86,7 +86,10 @@
       suivantes :  
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                         --disable-static                      --disable-migration                   --disable-search-provider &&
+<userinput>./configure --prefix=/usr             \
+            --disable-static          \
+            --disable-migration       \
+            --disable-search-provider &&
 make</userinput>
 </screen>
     <para>
@@ -97,7 +100,8 @@
     </para>
 <screen role="root">
 <userinput>make install &&
-sed -e 's/System/Utility/'     -i /usr/share/applications/gnome-terminal.desktop</userinput>
+sed -e 's/System/Utility/' \
+    -i /usr/share/applications/gnome-terminal.desktop</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/gnome/applications/nautilus.xml
===================================================================
--- trunk/blfs/gnome/applications/nautilus.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/gnome/applications/nautilus.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -95,7 +95,10 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                    --sysconfdir=/etc                --disable-tracker                --disable-packagekit &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --disable-tracker    \
+            --disable-packagekit &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/platform/gvfs.xml
===================================================================
--- trunk/blfs/gnome/platform/gvfs.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/gnome/platform/gvfs.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -114,7 +114,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --disable-gphoto2 &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-gphoto2 &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/platform/notification-daemon.xml
===================================================================
--- trunk/blfs/gnome/platform/notification-daemon.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/gnome/platform/notification-daemon.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -81,7 +81,9 @@
       suivantes  
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static  &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  &&
 make</userinput>
 </screen>
     <para>
@@ -93,20 +95,19 @@
 <screen role="root">
 <userinput>make install</userinput>
 </screen>
-
     <para>
       Vous pouvez tester le démon de notification avec la commande
       <command>notify-send</command>:
     </para>
-<screen><userinput>pgrep -l notification-da &&
-notify-send -i info Information "Hi ${USER}, This is a Test"</userinput></screen>
+<screen>
+<userinput>pgrep -l notification-da &&
+notify-send -i info Information "Hi ${USER}, This is a Test"</userinput>
+</screen>
     <para>
       La commande <command>pgrep -l notification-da</command> est ajoutée pour s'assurer que c'est le démon
       de ce paquet qui est lancé, pas un autre, comme le démon de 
       <xref linkend="xfce4-notifyd"/>.
     </para>
-
-
   </sect2>
   <sect2 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/gnome/platform/vte.xml
===================================================================
--- trunk/blfs/gnome/platform/vte.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/gnome/platform/vte.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -9,7 +9,7 @@
   <!ENTITY vte-size          "984 Ko">
   <!ENTITY vte-buildsize     "18 Mo (additional 2 Mo for the tests)">
   <!ENTITY vte-time          "0.3 SBU (additional moins de 0.1 SBU for the tests)">
-  <!-- For "Contents" and "Short Descriptions" sections -->
+  
   <!ENTITY vte-nano          "91">
 ]>
 <sect1 id="vte" xreflabel="VTE-&vte-version;">
@@ -71,7 +71,10 @@
     <para>Installez <application>VTE</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                      --sysconfdir=/etc                  --disable-static                   --enable-introspection &&
+<userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --disable-static       \
+            --enable-introspection &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make check</command>.</para>

Modified: trunk/blfs/introduction/welcome/changelog.xml
===================================================================
--- trunk/blfs/introduction/welcome/changelog.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/introduction/welcome/changelog.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -74,7 +74,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>4 Décembre 2014</para>
       <itemizedlist>
@@ -117,7 +116,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>2 Décembre 2014</para>
       <itemizedlist>
@@ -160,7 +158,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>1 Décembre 2014</para>
       <itemizedlist>
@@ -178,7 +175,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>30 Novembre 2014</para>
       <itemizedlist>
@@ -221,7 +217,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>28 Novembre 2014</para>
       <itemizedlist>
@@ -326,7 +321,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>25 Novembre 2014</para>
       <itemizedlist>
@@ -348,7 +342,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>23 Novembre 2014</para>
       <itemizedlist>
@@ -387,8 +380,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
     <listitem>
       <para>20 Novembre 2014</para>
       <itemizedlist>
@@ -410,7 +401,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>19 Novembre 2014</para>
       <itemizedlist>
@@ -521,7 +511,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>15 Novembre 2014</para>
       <itemizedlist>
@@ -559,7 +548,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>13 Novembre 2014</para>
       <itemizedlist>
@@ -611,7 +599,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>11 Novembre 2014</para>
       <itemizedlist>
@@ -679,7 +666,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>10 Novembre 2014</para>
       <itemizedlist>
@@ -718,8 +704,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
    <listitem>
       <para>9 Novembre 2014</para>
       <itemizedlist>
@@ -736,7 +720,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>7 Novembre 2014</para>
       <itemizedlist>
@@ -839,7 +822,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>2 Novembre 2014</para>
       <itemizedlist>
@@ -857,10 +839,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
-
-
    <listitem>
       <para>31 Octobre 2014</para>
       <itemizedlist>

Modified: trunk/blfs/kde/add/ark.xml
===================================================================
--- trunk/blfs/kde/add/ark.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/ark.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/gwenview.xml
===================================================================
--- trunk/blfs/kde/add/gwenview.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/gwenview.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -74,7 +74,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kate.xml
===================================================================
--- trunk/blfs/kde/add/kate.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/kate.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -73,7 +73,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kdepim-runtime.xml
===================================================================
--- trunk/blfs/kde/add/kdepim-runtime.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/kdepim-runtime.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -68,7 +68,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
 <screen role="root">

Modified: trunk/blfs/kde/add/kdepim.xml
===================================================================
--- trunk/blfs/kde/add/kdepim.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/kdepim.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -77,7 +77,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DSYSCONF_INSTALL_DIR=/etc               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kdeplasma-addons.xml
===================================================================
--- trunk/blfs/kde/add/kdeplasma-addons.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/kdeplasma-addons.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -76,7 +76,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/kmix.xml
===================================================================
--- trunk/blfs/kde/add/kmix.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/kmix.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -66,7 +66,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/konsole.xml
===================================================================
--- trunk/blfs/kde/add/konsole.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/konsole.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -65,7 +65,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/libkcddb.xml
===================================================================
--- trunk/blfs/kde/add/libkcddb.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/libkcddb.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -79,7 +79,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>

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

Modified: trunk/blfs/kde/add/libkexiv2.xml
===================================================================
--- trunk/blfs/kde/add/libkexiv2.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/libkexiv2.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -63,7 +63,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/add/okular.xml
===================================================================
--- trunk/blfs/kde/add/okular.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/add/okular.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -89,7 +89,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/baloo-widgets.xml
===================================================================
--- trunk/blfs/kde/core/baloo-widgets.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/baloo-widgets.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -61,7 +61,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>

Modified: trunk/blfs/kde/core/baloo.xml
===================================================================
--- trunk/blfs/kde/core/baloo.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/baloo.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -67,7 +67,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/kde/core/kde-baseapps.xml
===================================================================
--- trunk/blfs/kde/core/kde-baseapps.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/kde-baseapps.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -75,7 +75,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make test</command>.</para>

Modified: trunk/blfs/kde/core/kde-runtime.xml
===================================================================
--- trunk/blfs/kde/core/kde-runtime.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/kde-runtime.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -83,7 +83,11 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;               -DSYSCONF_INSTALL_DIR=/etc                        -DCMAKE_BUILD_TYPE=Release                        -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;         \
+      -DSYSCONF_INSTALL_DIR=/etc                  \
+      -DCMAKE_BUILD_TYPE=Release                  \
+      -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make test</command>.</para>

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

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

Modified: trunk/blfs/kde/core/kdepimlibs.xml
===================================================================
--- trunk/blfs/kde/core/kdepimlibs.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/kdepimlibs.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -79,7 +79,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>La suite de tests complètes pour ce paquet n'est pas active par défaut

Modified: trunk/blfs/kde/core/kfilemetadata.xml
===================================================================
--- trunk/blfs/kde/core/kfilemetadata.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/kfilemetadata.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -71,7 +71,9 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/kde/core/phonon-backend-gstreamer.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -70,7 +70,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_INSTALL_LIBDIR=lib               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon-backend-vlc.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-vlc.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/phonon-backend-vlc.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -63,7 +63,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_INSTALL_LIBDIR=lib               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon.xml
===================================================================
--- trunk/blfs/kde/core/phonon.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/core/phonon.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -74,7 +74,12 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;                                     -DCMAKE_BUILD_TYPE=Release                                       -DCMAKE_INSTALL_LIBDIR=lib                                       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE              -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;                               \
+      -DCMAKE_BUILD_TYPE=Release                                 \
+      -DCMAKE_INSTALL_LIBDIR=lib                                 \
+      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE        \
+      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/intro/pre-install-config.xml
===================================================================
--- trunk/blfs/kde/intro/pre-install-config.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/kde/intro/pre-install-config.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -50,6 +50,7 @@
 pathappend &kde-dir;/lib/pkgconfig   PKG_CONFIG_PATH
 pathappend &kde-dir;/share/pkgconfig PKG_CONFIG_PATH
 pathappend &kde-dir;/share           XDG_DATA_DIRS
+pathappend &kde-dir;/share/man       MANPATH
 pathappend /etc/kde/xdg                XDG_CONFIG_DIRS
 export &kde-dir-var; KDEDIR
 # End /etc/profile.d/kde.sh</literal>

Modified: trunk/blfs/lxde/desktop/lxpolkit.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxpolkit.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/lxde/desktop/lxpolkit.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -77,20 +77,12 @@
       Installez <application>LXPolkit</application> en lançant les commandes suivantes :
        
     </para>
-<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>
   </sect2>
   <sect2 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/lxde/desktop/lxsession.xml
===================================================================
--- trunk/blfs/lxde/desktop/lxsession.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/lxde/desktop/lxsession.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -98,8 +98,7 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make install &&
-install -vdm755 /usr/share/app-install/desktop</userinput>
+<userinput>make instal</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/multimedia/cdwriteutils/k3b.xml
===================================================================
--- trunk/blfs/multimedia/cdwriteutils/k3b.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/cdwriteutils/k3b.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -109,10 +109,11 @@
     <para>Installez <application>K3b</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg2-1.patch &&
-mkdir build &&
+<userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DSYSCONF_INSTALL_DIR=/etc/kde           -Wno-dev ..  &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde     \
+      -Wno-dev ..  &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/multimedia/libdriv/alsa-lib.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/alsa-lib.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/alsa-lib.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -66,10 +66,10 @@
     
 <screen>
 <literal>Device Drivers --->
-  <y/m> Sound card support --->
-    <y/m> Advanced Linux Sound Architecture --->
+  <*/m> Sound card support --->                  [CONFIG_SOUND]
+    <*/m> Advanced Linux Sound Architecture ---> [CONFIG_SND]
             Select settings and drivers appropriate for your hardware.
-    < >   Open Sound System (unselected) </literal>
+    < >   Open Sound System (DEPRECATED)         [CONFIG_SOUND_PRIME]</literal>
 </screen>
     <para>Dans la section Device Drivers ⇒ Sound card support ⇒ Advanced Linux
     Sound Architecture de la configuration du noyau, sélectionnez les paramètres

Modified: trunk/blfs/multimedia/libdriv/flac.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/flac.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/flac.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -66,7 +66,8 @@
     <para>Installez <application>FLAC</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --disable-thorough-tests &&
+<userinput>./configure --prefix=/usr \
+            --disable-thorough-tests &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.

Modified: trunk/blfs/multimedia/libdriv/gst10-libav.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-libav.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/gst10-libav.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -87,7 +87,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Libav Plugins &gst10-libav-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Libav Plugins &gst10-libav-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-bad.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -65,7 +65,6 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Téléchargements supplémentaires</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -75,7 +74,6 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de GStreamer Bad Plug-ins</bridgehead>
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
@@ -137,20 +135,21 @@
     <note><para>Si vous voulez un greffon pour une dépendance donnée, cette dépendance doit être
       installée avant cette application.
     </para></note>
-
      <para>
       Si vous avez installé <xref linkend="openjpeg2"/> et souhaitez l'utiliser avec
       <application>GStreamer Bad Plug-ins</application>, appliquez le correctif suivant:
     </para>
-<screen><userinput>patch -Np1 -i ../gst-plugins-bad-&gst10-plugins-bad-version;-openjpeg21-1.patch</userinput></screen>
-
-
+<screen>
+<userinput>patch -Np1 -i ../gst-plugins-bad-&gst10-plugins-bad-version;-openjpeg21-1.patch</userinput>
+</screen>
     <para>
       Installez <application>GStreamer Bad Plug-ins</application> en lançant les commandes suivantes :
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Bad Plugins &gst10-plugins-bad-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Bad Plugins &gst10-plugins-bad-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-base.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -106,7 +106,9 @@
       commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Base Plugins &gst10-plugins-base-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Base Plugins &gst10-plugins-base-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-good.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -115,7 +115,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/"  &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/"  &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/gst10-plugins-ugly.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -103,7 +103,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer Ugly Plugins &gst10-plugins-ugly-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer Ugly Plugins &gst10-plugins-ugly-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/gstreamer10.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/gstreamer10.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/gstreamer10.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -91,7 +91,9 @@
       Installez <application>GStreamer</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-package-name="GStreamer &gstreamer10-version; BLFS"             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
+<userinput>./configure --prefix=/usr \
+            --with-package-name="GStreamer &gstreamer10-version; BLFS" \
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/libmusicbrainz5.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/libmusicbrainz5.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/libmusicbrainz5.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -68,7 +68,6 @@
       <xref linkend="libxml2"/> et
       <xref linkend="neon"/>
     </para>
-
     <bridgehead renderas="sect4">Facultatives</bridgehead>
     <para role="optional">
       <xref linkend="doxygen"/>
@@ -84,8 +83,7 @@
       commands:
     </para>
 <screen>
-<userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz5-version;-build_system-1.patch &&
-mkdir build &&
+<userinput>mkdir build &&
 cd    build &&
 cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
 make</userinput>
@@ -94,8 +92,9 @@
       Si vous avez installé <xref linkend="doxygen"/>, facultativement construisez la documentation
       de l'API:
     </para>
-<screen><userinput>doxygen ../Doxyfile</userinput></screen>
-
+<screen>
+<userinput>doxygen ../Doxyfile</userinput>
+</screen>
     <para>
       Ce paquet n'a pas de suite de tests.
       </para>
@@ -109,10 +108,10 @@
       Si vous avez construit la documentation de l'API, installez en tant qu'utilisateur <systemitem
       class="username">root</systemitem> :
     </para>
-<screen><userinput>rm -rf /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version; &&
-cp -vr docs/ /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version;</userinput></screen>
-
-
+<screen>
+<userinput>rm -rf /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version; &&
+cp -vr docs/ /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version;</userinput>
+</screen>
   </sect2>
   <sect2 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/multimedia/libdriv/x264.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/x264.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/libdriv/x264.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -76,7 +76,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --enable-shared             --disable-cli &&
+<userinput>./configure --prefix=/usr \
+            --enable-shared \
+            --disable-cli &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/ffmpeg.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/multimedia/videoutils/ffmpeg.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -129,7 +129,22 @@
     
 <screen>
 <userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &&
-./configure --prefix=/usr                    --enable-gpl                     --enable-version3                --enable-nonfree                 --disable-static                 --enable-shared                  --disable-debug                  --enable-libass                  --enable-libfdk-aac              --enable-libmp3lame              --enable-libtheora               --enable-libvorbis               --enable-libvpx                  --enable-libx264                 --enable-x11grab                 --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &&
+./configure --prefix=/usr        \
+            --enable-gpl         \
+            --enable-version3    \
+            --enable-nonfree     \
+            --disable-static     \
+            --enable-shared      \
+            --disable-debug      \
+            --enable-libass      \
+            --enable-libfdk-aac  \
+            --enable-libmp3lame  \
+            --enable-libtheora   \
+            --enable-libvorbis   \
+            --enable-libvpx      \
+            --enable-libx264     \
+            --enable-x11grab     \
+            --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &&
 make &&
 gcc tools/qt-faststart.c -o tools/qt-faststart</userinput>
 </screen>
@@ -140,14 +155,15 @@
       Postscript de la documentation, tapez les commandes suivantes:
     </para>
 <screen>
-<userinput>sed -i '$s/$/nn at bye/' doc/{git-howto,nut,fate}.texi             &&
-sed -i '/machine:i386/ s//@backslashchar{}/g' doc/platform.texi &&
+<userinput>sed -i '$s/$/\n\n at bye/' doc/{git-howto,nut,fate}.texi             &&
+sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &&
 pushd doc &&
 for DOCNAME in `basename -s .html *.html`
 do
     texi2pdf -b $DOCNAME.texi &&
     texi2dvi -b $DOCNAME.texi &&
-    dvips -o    $DOCNAME.ps                   $DOCNAME.dvi
+    dvips -o    $DOCNAME.ps   \
+                $DOCNAME.dvi
 done                          &&
 popd                          &&
 unset DOCNAME</userinput>
@@ -164,15 +180,18 @@
 <screen role="root">
 <userinput>make install &&
 install -v -m755    tools/qt-faststart /usr/bin &&
-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 les documentations PDF et Postscript sont construites, tapez les commandes suivantes , en 
         tant qu'utilisateur <systemitem class="username">root</systemitem> pour l'installer:
     </para>
 <screen role="root">
-<userinput>install -v -m644 doc/*.pdf                  /usr/share/doc/ffmpeg-&ffmpeg-version; &&
-install -v -m644 doc/*.ps                   /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput>
+<userinput>install -v -m644 doc/*.pdf \
+                 /usr/share/doc/ffmpeg-&ffmpeg-version; &&
+install -v -m644 doc/*.ps  \
+                 /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
@@ -207,8 +226,8 @@
       précédents, lancez la commande suivante:
     </para>
 <screen>
-<userinput>make fate SAMPLES=fate-suite/ | tee ../fate.log &&
-grep ^TEST ../fate.log | wc -l</userinput>
+<userinput><command>rsync -vrltLW  --delete --timeout=60 --contimeout=60 \
+      rsync://fate-suite.ffmpeg.org/fate-suite/ fate-suite/</command></userinput>
 </screen>
    </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/networking/connect/dhcp.xml
===================================================================
--- trunk/blfs/networking/connect/dhcp.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/connect/dhcp.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -66,16 +66,19 @@
     <title>Configuration du noyau</title>
     <para>Vous devez avoir le support Packet Socket:
     </para>
-
-<screen><literal>[*] Networking support --->          [CONFIG_NET]
+<screen>
+<literal>[*] Networking support --->          [CONFIG_NET]
       Networking options --->
-        <*> Packet socket            [CONFIG_PACKET]</literal></screen>
+        <*> Packet socket            [CONFIG_PACKET]</literal>
+</screen>
     <para>
       Si vous n'aves par le support IPv6:
     </para>
-<screen><literal>[*] Networking support --->          [CONFIG_NET]
+<screen>
+<literal>[*] Networking support --->          [CONFIG_NET]
       Networking Options --->
-        <*> The IPv6 Protocol --->   [CONFIG_IPV6]</literal></screen>
+        <*> The IPv6 Protocol --->   [CONFIG_IPV6]</literal>
+</screen>
     <para>
        compilé, ensutie vous devez utiliser le correctif <quote>missing_ipv6</quote>.
     </para>

Modified: trunk/blfs/networking/connect/dhcpcd.xml
===================================================================
--- trunk/blfs/networking/connect/dhcpcd.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/connect/dhcpcd.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -5,7 +5,7 @@
   %general-entities;
   <!ENTITY dhcpcd-download-http "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
   <!ENTITY dhcpcd-download-ftp  " ">
-  <!--<!ENTITY dhcpcd-download-ftp  "ftp://ftp.osuosl.org/pub/gentoo/distfiles/dhcpcd-&dhcpcd-version;.tar.bz2">-->
+  
   <!ENTITY dhcpcd-md5sum        "a00be7d82eea62baa600a425059bb53e">
   <!ENTITY dhcpcd-size          "156 Ko">
   <!ENTITY dhcpcd-buildsize     "2.3 Mo">
@@ -62,7 +62,8 @@
     <para>Installez <application>dhcpcd</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --libexecdir=/lib/dhcpcd             --dbdir=/var/tmp         &&
+<userinput>./configure --libexecdir=/lib/dhcpcd \
+            --dbdir=/var/tmp         &&
 make</userinput>
 </screen>
     <para>Ce paquet est fourni sans suite de tests.</para>

Modified: trunk/blfs/networking/netlibs/curl.xml
===================================================================
--- trunk/blfs/networking/netlibs/curl.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netlibs/curl.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -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 &&
+<userinput>./configure --prefix=/usr              \
+            --disable-static           \
+            --enable-threaded-resolver &&
 make</userinput>
 </screen>
     <para>
@@ -87,7 +89,9 @@
  du temps de test pour chaque test échouant est d'environ 10%. Le SBU des tests est obtenu en désactivant les
 tests qui échouent, avec :
    </para>
- <screen><userinput>cat >> tests/data/DISABLED << "EOF"
+ 
+<screen>
+<userinput>cat >> tests/data/DISABLED << "EOF"
 <literal>564
 700
 701
@@ -100,19 +104,18 @@
 711
 712
 2034</literal>
-EOF</userinput></screen>
+EOF</userinput>
+</screen>
      <para>
        et lancez <command>make test</command>.
     </para>
-
     <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>
-
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>

Modified: trunk/blfs/networking/netprogs/bridgeutils.xml
===================================================================
--- trunk/blfs/networking/netprogs/bridgeutils.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netprogs/bridgeutils.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -69,9 +69,10 @@
     <para>Activez les options suivantes dans la configuration du noyau et
     recompilez le noyau si nécessaire :</para>
 <screen>
-<literal>Networking support: Y
-  Networking options:
-    802.1d Ethernet Bridging: M or Y [CONFIG_BRIDGE]</literal>
+<literal>
+[*] Networking support --->            [CONFIG_NET]
+      Networking options --->
+        <*/M> 802.1d Ethernet Bridging [CONFIG_BRIDGE]</literal>
 </screen>
     <indexterm zone="bridgeutils bridgeutils-kernel">
       <primary sortas="d-bridgeutils">Bridge Utilities</primary>

Modified: trunk/blfs/networking/netprogs/cifsutils.xml
===================================================================
--- trunk/blfs/networking/netprogs/cifsutils.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netprogs/cifsutils.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -68,8 +68,8 @@
     </para>
 <screen>
 <literal>File systems  --->
-  Network File Systems  --->
-    CIFS support (advanced network filesystem, SMBFS successor): Y or M [CONFIG_CIFS]</literal>
+  [*] Network File Systems  --->                                      [CONFIG_NETWORK_FILESYSTEMS]
+    <*/M> CIFS support (advanced network filesystem, SMBFS successor) [CONFIG_CIFS]</literal>
 </screen>
     <indexterm zone="cifsutils cifsutils-kernel">
       <primary sortas="d-cifsutils">cifs-utils</primary>

Modified: trunk/blfs/networking/netprogs/nfs-utils.xml
===================================================================
--- trunk/blfs/networking/netprogs/nfs-utils.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netprogs/nfs-utils.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -74,9 +74,9 @@
     et recompilez le noyau si nécessaire :</para>
 <screen>
 <literal>File systems  --->
-  Network File Systems  --->
-    NFS client support: Y or M
-    NFS server support: Y or M</literal>
+  [*] Network File Systems  --->         [CONFIG_NETWORK_FILESYSTEMS]
+    <*/M> NFS client support             [CONFIG_NFS_FS]
+    <*/M> NFS server support             [CONFIG_NFSD]</literal>
 </screen>
     <para>Sélectionnez les sous-options adéquates qui apparaissent quand les
     options ci-dessus sont sélectionnées.</para>

Modified: trunk/blfs/networking/netprogs/rpcbind.xml
===================================================================
--- trunk/blfs/networking/netprogs/rpcbind.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netprogs/rpcbind.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -65,7 +65,10 @@
     <para>Pour faire fonctionner <application>rpcbind</application> correctement,
     corrigez d'abord le paquet pour utiliser les bons noms de service.</para>
 <screen>
-<userinput>./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root &&
+<userinput>./configure --prefix=/usr       \
+            --bindir=/sbin      \
+            --with-rpcuser=root \
+            --without-systemdsystemunitdir &&
 make</userinput>
 </screen>
     <para>Installez <application>rpcbind</application> en lançant les commandes
@@ -84,7 +87,6 @@
     <para><command>--with-rpcuser=root</command>: Ce travail contourne une erreur dans le script 
      configure.</para>
     <para><command>--without-systemdsystemunitdir</command>: BLFS ne supporte pas systemd.</para>
-
   </sect2>
   <sect2 role="configuration">
     <title>Configuration de rpcbind</title>

Modified: trunk/blfs/networking/netprogs/samba.xml
===================================================================
--- trunk/blfs/networking/netprogs/samba.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netprogs/samba.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -93,12 +93,20 @@
 	suivantes :</para>
       
 <screen>
-<userinput>./configure                                 --prefix=/usr                           --sysconfdir=/etc                       --localstatedir=/var                    --with-piddir=/run/samba                --with-pammodulesdir=/lib/security      --without-systemd                       --enable-fhs                            --enable-nss-wrapper                &&
+<userinput>./configure                             \
+    --prefix=/usr                       \
+    --sysconfdir=/etc                   \
+    --localstatedir=/var                \
+    --with-piddir=/run/samba            \
+    --with-pammodulesdir=/lib/security  \
+    --without-systemd                   \
+    --enable-fhs                        \
+    --enable-nss-wrapper                &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem>:</para>
 <screen>
-<userinput>sed -i "/samba3.blackbox.failure.failure/i ^samba3.raw.eas" selftest/knownfail</userinput>
+<userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput>
 </screen>
       
       </sect2>
@@ -153,13 +161,17 @@
 ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so    &&
 install -v -m644    examples/smb.conf.default /etc/samba &&
 mkdir -pv /etc/openldap/schema                        &&
-install -v -m644    examples/LDAP/README                                  /etc/openldap/schema/README.LDAP  &&
+install -v -m644    examples/LDAP/README              \
+                    /etc/openldap/schema/README.LDAP  &&
                     
-install -v -m644    examples/LDAP/samba*                                  /etc/openldap/schema              &&
+install -v -m644    examples/LDAP/samba*              \
+                    /etc/openldap/schema              &&
                     
-install -v -m755    examples/LDAP/{get*,ol*}                     /etc/openldap/schema              &&
+install -v -m755    examples/LDAP/{get*,ol*} \
+                    /etc/openldap/schema              &&
 install -v -m755 -d /usr/share/doc/samba-&samba-version; &&
-install -v -m644    lib/ntdb/doc/design.pdf                     /usr/share/doc/samba-&samba-version;</userinput>
+install -v -m644    lib/ntdb/doc/design.pdf \
+                    /usr/share/doc/samba-&samba-version;</userinput>
 </screen>
 	</sect3>
 	<sect3>
@@ -348,7 +360,8 @@
 		
 <screen role="root">
 <userinput>groupadd -g 99 nogroup &&
-useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup     -s /bin/false -u 99 nobody</userinput>
+useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
+    -s /bin/false -u 99 nobody</userinput>
 </screen>
 		<para>Si vous avez aussi besoin du script <filename>winbind</filename> pour résoudre les
 		  noms depuis les clients Windows, lancez:</para>

Modified: trunk/blfs/networking/netprogs/wpa_supplicant.xml
===================================================================
--- trunk/blfs/networking/netprogs/wpa_supplicant.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netprogs/wpa_supplicant.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -76,24 +76,14 @@
     <para>Activez les options suivantes dans la configuration du noyau aussi bien que les pilotes spécifiques pour votre matériel
       et recompilez si nécessaire :</para>
 <screen>
-<literal>Networking support  -
--->
-                   [CONFIG_NET]
-  Wireless  -
--->
-                                            [CONFIG_WIRELESS]
-    cfg80211 - wireless configuration API: Y or M           [CONFIG_CFG80211]
-      cfg80211 wireless extensions compatibility: Y         [CONFIG_CFG80211_WEXT]
-    Generic IEEE 802.11 Networking Stack (mac80211): Y or M [CONFIG_MAC80211]
-Device Drivers  -
--->
-                         
-  Network device support  -
--->
-                              [CONFIG_NETDEVICES}
-    Wireless LAN  -
--->
-                                      [CONFIG_WLAN]</literal>
+<literal>[*] Networking support  --->                              [CONFIG_NET]
+  [*] Wireless  --->                                      [CONFIG_WIRELESS]
+    <*/M> cfg80211 - wireless configuration API           [CONFIG_CFG80211]
+    [*]     cfg80211 wireless extensions compatibility    [CONFIG_CFG80211_WEXT]
+    <*/M> Generic IEEE 802.11 Networking Stack (mac80211) [CONFIG_MAC80211]
+Device Drivers  --->
+  [*] Network device support  --->                        [CONFIG_NETDEVICES]
+    [*] Wireless LAN  --->                                [CONFIG_WLAN]</literal>
 </screen>
     <para>Ouvrez le sous-menu et selectionnez les options que supportent votre matériel :
     <command>lspci</command> de <xref linkend="pciutils"/> peut être utilisé

Modified: trunk/blfs/networking/netutils/traceroute.xml
===================================================================
--- trunk/blfs/networking/netutils/traceroute.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netutils/traceroute.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -62,10 +62,11 @@
     <para>Ce paquet n'est pas livré avec une suite de test</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role='root'>
-<userinput>make prefix=/usr install &&
-mv /usr/bin/traceroute /bin &&
-ln -sv -f traceroute /bin/traceroute6 &&
-ln -sv -f traceroute.8 /usr/share/man/man8/traceroute6.8</userinput>
+<userinput>make prefix=/usr install                                 &&
+mv /usr/bin/traceroute /bin                              &&
+ln -sv -f traceroute /bin/traceroute6                    &&
+ln -sv -f traceroute.8 /usr/share/man/man8/traceroute6.8 &&
+rm -fv /usr/share/man/man1/traceroute.1</userinput>
 </screen>
  <para>Le fichier traceroute.1 qui est installé dans LFS par inetutils n'est plus d'actualité. Ce paquet
    écrase cette version de la page de manuel de traceroute et installe la page de manuel dans le chapitre

Modified: trunk/blfs/networking/netutils/wireshark.xml
===================================================================
--- trunk/blfs/networking/netutils/wireshark.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/networking/netutils/wireshark.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -100,9 +100,9 @@
       <para>Le noyau doit avoir le protocole de paquets (Packet protocol) activé pour que
          <application>Wireshark</application> capture les paquets en direct à partir du réseau:</para>
 <screen>
-<literal>Networking support: Y
-  Networking options:
-    Packet: sockets monitoring interface: M or Y</literal>
+<literal>[*] Networking support --->          [CONFIG_NET]
+      Networking options --->
+        <*/M> Packet socket          [CONFIG_PACKET]</literal>
 </screen>
       <para>Si la construction est faite en tant qu'un module, le nom est
          <filename>af_packet.ko</filename>.</para>
@@ -138,7 +138,7 @@
     <para>Si vous voulez un utilisateur sans privilèges pour exécuter 
     <application>wireshark</application>, lancez les commandes suivantes en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
-<screen>
+<screen role="root">
 <userinput>usermod -a -G wireshark <replaceable><username></replaceable></userinput>
 </screen>
     <para>Si vous avez <application>GTK+2</application> et 3, et
@@ -164,7 +164,10 @@
     <para>Continuez à installer <application>Wireshark</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                 --with-gtk3=yes               --with-qt=no                  --sysconfdir=/etc &&
+<userinput>./configure --prefix=/usr     \
+            --with-gtk3=yes   \
+            --with-qt=no      \
+            --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de test</para>
@@ -173,15 +176,19 @@
 <userinput>make install &&
 install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &&
 install -v -m755 -d /usr/share/pixmaps/wireshark &&
-install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt}                     /usr/share/doc/wireshark-&wireshark-version; &&
+install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt} \
+                    /usr/share/doc/wireshark-&wireshark-version; &&
 pushd /usr/share/doc/wireshark-&wireshark-version; &&
    for FILENAME in ../../wireshark/*.html; do
       ln -s -v -f $FILENAME .
    done &&
 popd &&
-install -v -m644 -D wireshark.desktop                     /usr/share/applications/wireshark.desktop &&
-install -v -m644 -D image/wsicon48.png                     /usr/share/pixmaps/wireshark.png &&
-install -v -m644    image/*.{png,ico,xpm,bmp}                     /usr/share/pixmaps/wireshark</userinput>
+install -v -m644 -D wireshark.desktop \
+                    /usr/share/applications/wireshark.desktop &&
+install -v -m644 -D image/wsicon48.png \
+                    /usr/share/pixmaps/wireshark.png &&
+install -v -m644    image/*.{png,ico,xpm,bmp} \
+                    /usr/share/pixmaps/wireshark</userinput>
 </screen>
     <para>Si vous avez téléchargé un des fichiers de documentation mentionnés dans 'Téléchargements supplémentaires', installez les en suivant les commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
@@ -247,15 +254,19 @@
       il y a deux possibilités (les instructions doivent être exécutées en tant que root).</para>
       <para>Si seulement l'interface Qt est construite:</para>
 <screen role="root">
-<userinput>mv -v /usr/share/applications/wireshark.desktop       /usr/share/applications/wireshark-qt.desktop</userinput>
+<userinput>mv -v /usr/share/applications/wireshark.desktop \
+      /usr/share/applications/wireshark-qt.desktop</userinput>
 </screen>
       <para>Si les deux interfaces GTK+ et Qt sont construites:</para>
 <screen role="root">
-<userinput>cp -v /usr/share/applications/wireshark.desktop       /usr/share/applications/wireshark-qt.desktop</userinput>
+<userinput>cp -v /usr/share/applications/wireshark.desktop \
+      /usr/share/applications/wireshark-qt.desktop</userinput>
 </screen>
       <para>Maintenant corriger pour <command>wireshark-qt</command>:</para>
 <screen role="root">
-<userinput>sed -e 's/ireshark/&-qt/'     -e 's/^(Icon=wireshark)-qt/1/'     -i /usr/share/applications/wireshark-qt.desktop</userinput>
+<userinput>sed -e 's/ireshark/&-qt/' \
+    -e 's/^\(Icon=wireshark\)-qt/\1/' \
+    -i /usr/share/applications/wireshark-qt.desktop</userinput>
 </screen>
       <note>
         <para>Si vous voulez regarder les paquets, assurez vous que vous ne les filtrez pas avec <xref linkend="iptables"/>. Si vous voulez exclure certaines classes de paquets, il est plus efficace de le faire avec <application>iptables</application> qu'avec <application>Wireshark</application>.</para>

Modified: trunk/blfs/postlfs/filesystems/fuse.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/fuse.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/filesystems/fuse.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -79,7 +79,7 @@
     </para>
 <screen>
 <literal>File systems  --->
-  [*] FUSE (Filesystem in Userspace) support</literal>
+  <*/M> FUSE (Filesystem in Userspace) support [CONFIG_FUSE_FS]</literal>
 </screen>
     <indexterm zone="fuse fuse-kernel">
       <primary sortas="d-fuse">fuse</primary>

Modified: trunk/blfs/postlfs/filesystems/jfs.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/jfs.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/filesystems/jfs.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -54,8 +54,8 @@
     <para>Activez l'option suivante dans la configuration du noyau et recompilez
     le noyau :</para>
 <screen>
-<literal>File Systems:
-  JFS filesystem support: M or Y</literal>
+<literal>File systems  --->
+  <*/M> JFS filesystem support [CONFIG_JFS_FS]</literal>
 </screen>
     <indexterm zone="jfsutils jfsutils-kernel">
       <primary sortas="d-jfsutils">Utiliaires JFS</primary>

Modified: trunk/blfs/postlfs/filesystems/lvm2.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/lvm2.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/filesystems/lvm2.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -70,11 +70,11 @@
     </para></note>
 <screen>
 <literal>Device Drivers --->
-  Multiple devices driver support (RAID and LVM): Y
-    Device mapper support: Y or M
-    Crypt target support: (optional)
-    Snapshot target: (optional)
-    Mirror target: (optional) </literal>
+  [*] Multiple devices driver support (RAID and LVM) ---> [CONFIG_MD]
+    <*/M>   Device mapper support                         [CONFIG_BLK_DEV_DM]
+    <*/M/ >   Crypt target support                        [CONFIG_DM_CRYPT]
+    <*/M/ >   Snapshot target                             [CONFIG_DM_SNAPSHOT]
+    <*/M/ >   Mirror target                               [CONFIG_DM_MIRROR]</literal>
 </screen>
     <indexterm zone="lvm2 lvm2-kernel">
       <primary sortas="d-lvm2">lvm2</primary>
@@ -85,7 +85,13 @@
     <para>Installez <application>lvm2</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                   --exec-prefix=                  --with-confdir=/etc             --enable-applib                 --enable-cmdlib                 --enable-pkgconfig              --enable-udev_sync  &&
+<userinput>./configure --prefix=/usr       \
+            --exec-prefix=      \
+            --with-confdir=/etc \
+            --enable-applib     \
+            --enable-cmdlib     \
+            --enable-pkgconfig  \
+            --enable-udev_sync  &&
 make</userinput>
 </screen>
     

Modified: trunk/blfs/postlfs/filesystems/mdadm.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/mdadm.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/filesystems/mdadm.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -54,16 +54,16 @@
     <para>Autoriser les options suivantes dans la configuration du noyau
     et recompiler le noyau, si nécéssaire. Seulement le type de RAID souhaité est nécéssaire.  </para>
 <screen>
-<literal>File Systems:
-  Device Drivers:
-    Multiple devices driver support (RAID and LVM): Y
-      RAID support: Y or M
-        Autodetect RAID arrays during kernel boot: Y
-        Linear (append) mode: Y or M
-        RAID-0 (striping) mode : Y or M
-        RAID-1 (mirroring) mode : Y or M
-        RAID-10 (mirrored striping) mode: Y or M
-        RAID-4/RAID-5/RAID-6 mode : Y or M</literal>
+<literal>File Systems --->
+  Device Drivers --->
+    [*] Multiple devices driver support (RAID and LVM) ---> [CONFIG_MD]
+      <*> RAID support                                      [CONFIG_BLK_DEV_MD]
+      [*]   Autodetect RAID arrays during kernel boot       [CONFIG_MD_AUTODETECT]
+      <*/M>  Linear (append) mode                           [CONFIG_MD_LINEAR]
+      <*/M>  RAID-0 (striping) mode                         [CONFIG_MD_RAID0]
+      <*/M>  RAID-1 (mirroring) mode                        [CONFIG_MD_RAID1]
+      <*/M>  RAID-10 (mirrored striping) mode               [CONFIG_MD_RAID10]
+      <*/M>  RAID-4/RAID-5/RAID-6 mode                      [CONFIG_MD_RAID456]</literal>
 </screen>
     <indexterm zone="mdadm mdadm-kernel">
       <primary sortas="d-mdadm">mdadm</primary>

Modified: trunk/blfs/postlfs/filesystems/ntfs-3g.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/ntfs-3g.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/filesystems/ntfs-3g.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -85,7 +85,7 @@
     </para>
 <screen>
 <literal>File systems  --->
-  [*] FUSE (Filesystem in Userspace) support</literal>
+  <*/M> FUSE (Filesystem in Userspace) support [CONFIG_FUSE_FS]</literal>
 </screen>
     <indexterm zone="ntfs-3g ntfs-3g-kernel">
       <primary sortas="d-ntfs-3g">ntfs-3g</primary>

Modified: trunk/blfs/postlfs/filesystems/reiser.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/reiser.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/filesystems/reiser.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -57,8 +57,8 @@
     <para>Activez l'option suivante dans la configuration du noyau et recompilez
     le noyau :</para>
 <screen>
-<literal>File Systems:
-  Reiserfs support: M or Y</literal>
+<literal>File systems --->
+  <*/M> Reiserfs support [CONFIG_REISERFS_FS]</literal>
 </screen>
     <indexterm zone="reiserfs reiserfs-kernel">
       <primary sortas="d-reiseerfs">Programmes Reiserfs</primary>

Modified: trunk/blfs/postlfs/filesystems/xfsprogs.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/xfsprogs.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/filesystems/xfsprogs.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY xfsprogs-download-http "&sources-anduin-http;/x/xfsprogs-&xfsprogs-version;.tar.gz">-->
   <!ENTITY xfsprogs-download-http " ">
   <!ENTITY xfsprogs-download-ftp  "ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-&xfsprogs-version;.tar.gz">
   <!ENTITY xfsprogs-md5sum        "b6b0db5e3ee71ceba26d0a5accbd0666">
@@ -55,8 +54,8 @@
     <para>Activez les options suivantes dans la configuration du noyau et
     recompilez le noyau:</para>
 <screen>
-<literal>File Systems:
-  XFS filesystem support: M or Y</literal>
+<literal>File systems --->
+  <*/M> XFS filesystem support [CONFIG_XFS_FS]</literal>
 </screen>
     <indexterm zone="xfsprogs xfsprogs-kernel">
       <primary sortas="d-xfs">XFS programs</primary>
@@ -67,15 +66,19 @@
     <para>Installez <application>xfsprogs</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>make DEBUG=-DNDEBUG          INSTALL_USER=root       INSTALL_GROUP=root      LOCAL_CONFIGURE_OPTIONS="--enable-readline"</userinput>
+<userinput>make DEBUG=-DNDEBUG     \
+     INSTALL_USER=root  \
+     INSTALL_GROUP=root \
+     LOCAL_CONFIGURE_OPTIONS="--enable-readline"</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install     &&
 make PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install-dev &&
-rm -rfv /lib/libhandle.{a,la,so}                          &&
-ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so    &&
+rm -rfv /usr/lib/libhandle.a                               &&
+rm -rfv /lib/libhandle.{a,la,so}                           &&
+ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so     &&
 sed -i "s at libdir='/lib at libdir='/usr/lib at g" /usr/lib/libhandle.la</userinput>
 </screen>
   </sect2>

Modified: trunk/blfs/postlfs/security/gnutls.xml
===================================================================
--- trunk/blfs/postlfs/security/gnutls.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/security/gnutls.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -91,7 +91,8 @@
     <para>Installez <application>GnuTLS</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &&
+<userinput>./configure --prefix=/usr \
+            --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/postlfs/security/gpgme.xml
===================================================================
--- trunk/blfs/postlfs/security/gpgme.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/security/gpgme.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -51,7 +51,6 @@
         <para>Estimation du temps de construction : &gpgme-time;</para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Téléchargements supplémentaires</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -61,11 +60,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
-
-
     <bridgehead renderas="sect3">Dépendences GPGME</bridgehead>
-
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required"><xref linkend="libassuan"/></para>
     <bridgehead renderas="sect4">Facultatives</bridgehead>
@@ -80,17 +75,18 @@
     <para>Installez <application>GPGME</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                    --disable-fd-passing             --disable-gpgsm-test &&
+<userinput>./configure --prefix=/usr        \
+            --disable-fd-passing \
+            --disable-gpgsm-test &&
 make</userinput>
 </screen>
-
      <para>
       Dans <application>gpgme-1.5.2</application>, LA suite de tests a été modifiée et est inutilisable.
       Si vous voulez lancer la suite de tests, corrigez la en premier avec :
     </para>
-<screen><userinput>patch -Np1 -i ../gpgme-&gpgme-version;-tests-1.patch</userinput></screen>
-
-
+<screen>
+<userinput>patch -Np1 -i ../gpgme-&gpgme-version;-tests-1.patch</userinput>
+</screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
@@ -137,7 +133,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="libgpgme-pthread">
         <term><filename class='libraryfile'>libgpgme-pthread.{so,a}</filename></term>
         <listitem>

Modified: trunk/blfs/postlfs/security/iptables.xml
===================================================================
--- trunk/blfs/postlfs/security/iptables.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/security/iptables.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -59,9 +59,11 @@
     <application>iptables</application>. Pour l'utiliser, les
     paramètres adéquats de configuration du noyau sont trouvés dans :
     </para>
-<screen><literal>[*] Networking support  --->                                    [CONFIG_NET]
+<screen>
+<literal>[*] Networking support  --->                                    [CONFIG_NET]
       Networking Options  --->
-        [*] Network packet filtering framework (Netfilter) ---> [CONFIG_NETFILTER]</literal></screen>
+        [*] Network packet filtering framework (Netfilter) ---> [CONFIG_NETFILTER]</literal>
+</screen>
     <indexterm zone="iptables iptables-kernel">
       <primary sortas="d-iptables">Iptables</primary>
     </indexterm>

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

Modified: trunk/blfs/postlfs/security/stunnel.xml
===================================================================
--- trunk/blfs/postlfs/security/stunnel.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/security/stunnel.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -72,7 +72,8 @@
     tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>groupadd -g 51 stunnel &&
-useradd -c "stunnel Daemon" -d /var/lib/stunnel         -g stunnel -s /bin/false -u 51 stunnel</userinput>
+useradd -c "stunnel Daemon" -d /var/lib/stunnel \
+        -g stunnel -s /bin/false -u 51 stunnel</userinput>
 </screen>
     <note>
       <para>Un certificat SSL signé et une clé privée sont nécessaires pour lancer
@@ -99,7 +100,10 @@
     <para>Installez <application>Stunnel</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --localstatedir=/var &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-systemd    &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -124,11 +128,8 @@
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>
-
     <para><parameter>--disable-systemd</parameter>: Ce paramètre désactive
     le support de l'activation de systemd, qui n'est pas disponible dans BLFS.</para>
-
-
     <para><command>make docdir=... install</command> : Cette commande
     installe le paquet, modifie le répertoire d'installation de la documentation
     en un nom conforme aux conventions.</para>

Modified: trunk/blfs/postlfs/virtualization/qemu.xml
===================================================================
--- trunk/blfs/postlfs/virtualization/qemu.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/postlfs/virtualization/qemu.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -94,10 +94,10 @@
      <para>Activez les options suivantes dans la configuration du noyau
     et recompilez le noyau si nécessaire :</para>
 <screen>
-<literal>Virtualization:  --->
-  Kernel-based Virtual Machine (KVM) support: Y or M
-    KVM for Intel processors support: Y or M
-    KVM for AMD processors support: Y or M</literal>
+<literal>[*] Virtualization:  --->                            [CONFIG_VIRTUALIZATION]
+  <*/M>   Kernel-based Virtual Machine (KVM) support [CONFIG_KVM]
+  <*/M>     KVM for Intel processors support         [CONFIG_KVM_INTEL]
+  <*/M>     KVM for AMD processors support           [CONFIG_KVM_AMD]</literal>
 </screen>
     <indexterm zone="qemu qemu-kernel">
       <primary sortas="d-qemu">qemu</primary>
@@ -107,12 +107,12 @@
     <para>Pour le réseau, vérifiez que <xref linkend='bridgeutils'/> est installé et que les options
     suivantes dans la configuration du noyau sont actives :</para>
 <screen>
-<literal>Networking support  --->
+<literal>[*] Networking support  --->                         [CONFIG_NET]
   Networking options  --->
-    802.1d Ethernet Bridging: Y or M
+    <*/M> 802.1d Ethernet Bridging                   [CONFIG_BRIDGE]
 Device Drivers  --->
-  Network device support  --->
-    Universal TUN/TAP device driver support: Y or M</literal>
+  [*] Network device support  --->                   [CONFIG_NETDEVICES]
+    <*/M>    Universal TUN/TAP device driver support [CONFIG_TUN]</literal>
 </screen>
    
   </sect2>
@@ -238,12 +238,16 @@
       </listitem>
       <listitem>
         <para>Permettre les connections réseaux quand l'exécution en tant que membre du groupe kvm:</para>
-<screen role="root"><userinput>chgrp kvm  /usr/libexec/qemu-bridge-helper &&
-chmod 4750 /usr/libexec/qemu-bridge-helper</userinput></screen>
+<screen role="root">
+<userinput>chgrp kvm  /usr/libexec/qemu-bridge-helper &&
+chmod 4750 /usr/libexec/qemu-bridge-helper</userinput>
+</screen>
       </listitem>
       <listitem>
         <para>Initialisez un fichier de configuration requis:</para>
-<screen role="root"><userinput>echo 'allow br0' > /etc/qemu/bridge.conf</userinput></screen>
+<screen role="root">
+<userinput>echo 'allow br0' > /etc/qemu/bridge.conf</userinput>
+</screen>
       </listitem>
       <listitem>
         <para>Démarrer qemu avec les options "-net nic -net bridge".  </para>

Modified: trunk/blfs/pst/printing/cups.xml
===================================================================
--- trunk/blfs/pst/printing/cups.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/pst/printing/cups.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -54,8 +54,6 @@
     <para role="required">
       <xref linkend="gnutls"/>
     </para>
-
-
     <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended">
       <xref linkend="colord"/>,
@@ -103,10 +101,10 @@
     </para>
 <screen>
 <literal>Device Drivers  --->
-  USB support  --->
-    OHCI HCD (USB 1.1) support: Y or M            [CONFIG_USB_OHCI_HCD]
-    UHCI HCD (most Intel and VIA) support: Y or M [CONFIG_USB_UHCI_HCD]
-    USB Printer support: Y or M                   [CONFIG_USB_PRINTER]</literal>
+  [*] USB support  --->                          [CONFIG_USB_SUPPORT]
+    <*/M>  OHCI HCD (USB 1.1) support            [CONFIG_USB_OHCI_HCD]
+    <*/M>  UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
+    <*/M>  USB Printer support                   [CONFIG_USB_PRINTER]</literal>
 </screen>
     <para>
       Si vous avez une imprimante en port parallèle, activez les options suivantes
@@ -114,10 +112,10 @@
     </para>
 <screen>
 <literal>Device Drivers  --->
-  Parallel port support  --->                     [CONFIG_PARPORT]
-    PC-style hardware: Y or M                     [CONFIG_PARPORT_PC]
+  <*/M> Parallel port support  --->    [CONFIG_PARPORT]
+    <*/M> PC-style hardware            [CONFIG_PARPORT_PC]
   Character devices  --->
-    Parallel printer support: Y or M              [CONFIG_PRINTER]</literal>
+    <*/M> Parallel printer support     [CONFIG_PRINTER]</literal>
 </screen>
     <indexterm zone="cups cups-kernel">
       <primary sortas="d-cups">cups</primary>
@@ -172,11 +170,18 @@
      </para>
 <screen>
 <userinput>sed -i 's:555:755:g;s:444:644:g' Makedefs.in           &&
-sed -i '/MAN.*.EXT/s:.gz::g'        configure config-scripts/cups-manpages.m4       &&
+sed -i '/MAN.*.EXT/s:.gz::g' \
+       configure config-scripts/cups-manpages.m4       &&
 sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 &&
+sed -i 's at else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' \
+       test/ippserver.c                                &&
 aclocal  -I config-scripts &&
 autoconf -I config-scripts &&
-./configure --libdir=/usr/lib                        --disable-systemd                        --with-rcdir=/tmp/cupsinit               --with-system-groups=lpadmin             --with-docdir=/usr/share/cups/doc-&cups-version; &&
+./configure --libdir=/usr/lib            \
+            --disable-systemd            \
+            --with-rcdir=/tmp/cupsinit   \
+            --with-system-groups=lpadmin \
+            --with-docdir=/usr/share/cups/doc-&cups-version; &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez :  <command>make -k check</command>. Un session graphique déjà
@@ -229,13 +234,10 @@
       <command>libgcrypt-config</command>, car
       <application>libgcrypt</application> n'est pas utilisé ailleurs dans le paquet.
      </para>
-
-
      <para>
       <command>sed ... test/ippserver.c</command>: Ce sed corrige un bogue,
       qui apparait quand <application>avahi</application> n'est pas présent.
     </para>
-
      <para>
       <parameter>--disable-systemd</parameter>: Systemd n'est pas supporté par BLFS.
      </para>

Modified: trunk/blfs/pst/printing/gutenprint.xml
===================================================================
--- trunk/blfs/pst/printing/gutenprint.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/pst/printing/gutenprint.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -83,11 +83,11 @@
       et recompilez le noyau:
     </para>
 <screen>
-Device Drivers  --->
-  USB support  --->
-    OHCI HCD (USB 1.1) support: Y or M
-    UHCI HCD (most Intel and VIA) support: Y or M
-    USB Printer support: Y or M
+<literal>Device Drivers  --->
+  [*] USB support  --->                          [CONFIG_USB_SUPPORT]
+    <*/M>  OHCI HCD (USB 1.1) support            [CONFIG_USB_OHCI_HCD]
+    <*/M>  UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
+    <*/M>  USB Printer support                   [CONFIG_USB_PRINTER]</literal>
 </screen>
     <indexterm zone="gutenprint escputil">
       <primary sortas="d-escputil">escputil for usb printers</primary>

Modified: trunk/blfs/pst/ps/fop.xml
===================================================================
--- trunk/blfs/pst/ps/fop.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/pst/ps/fop.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -16,11 +16,6 @@
   <!ENTITY jai64-download    "http://download.java.net/media/jai/builds/release/&jai-version;/jai-&jai-version;-lib-linux-amd64.tar.gz">
   <!ENTITY jai64-md5sum      "4a906db35612f668aeef2c0606d7075b">
   <!ENTITY jai64-size        "3.4 Mo">
-<!--
-  <!ENTITY offo-download     "&sourceforge-repo;/offo/offo-hyphenation_v2.0.zip">
-  <!ENTITY offo-md5sum       "a78171d47c9af223c51bbd42df36f26d">
-  <!ENTITY offo-size         "858 Ko">
--->
 ]>
 <sect1 id="fop" xreflabel="fop-&fop-version;">
   <?dbhtml filename="fop.html"?>
@@ -117,7 +112,7 @@
       <title>Installer les composants de l'API de JAI</title>
       <para>Ensuite installer les composants de l'API de JAI. En tant qu'utilisateur <systemitem
       class="username">root</systemitem> :</para>
-<screen>
+<screen role="root">
 <userinput>case `uname -m` in
   i?86)
     tar -xf ../jai-&jai-version;-lib-linux-i586.tar.gz

Modified: trunk/blfs/pst/ps/mupdf.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/server/databases/mariadb.xml
===================================================================
--- trunk/blfs/server/databases/mariadb.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/server/databases/mariadb.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -120,11 +120,28 @@
       Installez <application>MariaDB</application> en lançant la suite  
     </para>
 <screen>
-<userinput>sed -i "s at data/test@${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
+<userinput>sed -i "s at data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
 sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc &&
 mkdir build &&
 cd build &&
-cmake -DCMAKE_BUILD_TYPE=Release                             -DCMAKE_INSTALL_PREFIX=/usr                            -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;             -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version;       -DINSTALL_MANDIR=share/man                             -DINSTALL_MYSQLSHAREDIR=share/mysql                    -DINSTALL_MYSQLTESTDIR=share/mysql/test                -DINSTALL_PLUGINDIR=lib/mysql/plugin                   -DINSTALL_SBINDIR=sbin                                 -DINSTALL_SCRIPTDIR=bin                                -DINSTALL_SQLBENCHDIR=share/mysql/bench                -DINSTALL_SUPPORTFILESDIR=share/mysql                  -DMYSQL_DATADIR=/srv/mysql                             -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock              -DWITH_EXTRA_CHARSETS=complex                          -DWITH_EMBEDDED_SERVER=ON                              -DTOKUDB_OK=0                                          .. &&
+cmake -DCMAKE_BUILD_TYPE=Release                       \
+      -DCMAKE_INSTALL_PREFIX=/usr                      \
+      -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;       \
+      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
+      -DINSTALL_MANDIR=share/man                       \
+      -DINSTALL_MYSQLSHAREDIR=share/mysql              \
+      -DINSTALL_MYSQLTESTDIR=share/mysql/test          \
+      -DINSTALL_PLUGINDIR=lib/mysql/plugin             \
+      -DINSTALL_SBINDIR=sbin                           \
+      -DINSTALL_SCRIPTDIR=bin                          \
+      -DINSTALL_SQLBENCHDIR=share/mysql/bench          \
+      -DINSTALL_SUPPORTFILESDIR=share/mysql            \
+      -DMYSQL_DATADIR=/srv/mysql                       \
+      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock        \
+      -DWITH_EXTRA_CHARSETS=complex                    \
+      -DWITH_EMBEDDED_SERVER=ON                        \
+      -DTOKUDB_OK=0                                    \
+      .. &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/server/databases/sqlite.xml
===================================================================
--- trunk/blfs/server/databases/sqlite.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/server/databases/sqlite.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -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/postfix.xml
===================================================================
--- trunk/blfs/server/mail/postfix.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/server/mail/postfix.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -93,7 +93,8 @@
 <screen role="root">
 <userinput>groupadd -g 32 postfix &&
 groupadd -g 33 postdrop &&
-useradd -c "Postfix Daemon User" -d /var/spool/postfix -g postfix         -s /bin/false -u 32 postfix &&
+useradd -c "Postfix Daemon User" -d /var/spool/postfix -g postfix \
+        -s /bin/false -u 32 postfix &&
 chown -v postfix:postfix /var/mail</userinput>
 </screen>
     </sect3>
@@ -114,7 +115,7 @@
         un sed :
       </para>
 <screen>
-<userinput>sed -i 's/.x08//g' README_FILES/*</userinput>
+<userinput>sed -i 's/.\x08//g' README_FILES/*</userinput>
 </screen>
       <para>
         L'arborescence des sources de <application>Postfix</application> ne contient pas
@@ -205,14 +206,21 @@
         <application>Postfix</application> en lançant les commandes suivantes :
       </para>
 <screen>
-<userinput>make CCARGS="-DUSE_TLS -I/usr/include/openssl/                                  -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"      AUXLIBS="-lssl -lcrypto -lsasl2"                                   makefiles &&
+<userinput>make CCARGS="-DUSE_TLS -I/usr/include/openssl/                     \
+             -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" \
+     AUXLIBS="-lssl -lcrypto -lsasl2"                              \
+     makefiles &&
 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>sh postfix-install -non-interactive    daemon_directory=/usr/lib/postfix    manpage_directory=/usr/share/man    html_directory=/usr/share/doc/postfix-&postfix-version;/html    readme_directory=/usr/share/doc/postfix-&postfix-version;/readme</userinput>
+<userinput>sh postfix-install -non-interactive \
+   daemon_directory=/usr/lib/postfix \
+   manpage_directory=/usr/share/man \
+   html_directory=/usr/share/doc/postfix-&postfix-version;/html \
+   readme_directory=/usr/share/doc/postfix-&postfix-version;/readme</userinput>
 </screen>
     </sect3>
   </sect2>

Modified: trunk/blfs/server/other/unbound.xml
===================================================================
--- trunk/blfs/server/other/unbound.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/server/other/unbound.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -75,7 +75,6 @@
       <xref linkend="swig"/> (pour les liaisons Python)
       <xref linkend="doxygen"/> (pour la documentation html) et
       <ulink url="http://dnstap.info/">dnstap</ulink>
-
     </para>
     <para condition="html" role="usernotes">Notes utilisateur :
       <ulink url="&blfs-wiki;/unbound"/>
@@ -91,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>
@@ -166,7 +169,8 @@
          <systemitem class="username">root</systemitem>:
       </para>
 <screen role="root">
-<userinput>sed -i '/request /isupersede domain-name-servers 127.0.0.1;'        /etc/dhcp/dhclient.conf</userinput>
+<userinput>sed -i '/request /i\supersede domain-name-servers 127.0.0.1;' \
+       /etc/dhcp/dhclient.conf</userinput>
 </screen>
       <para>
         Pour une configuration avancée, regardez le fichier <filename>/etc/unbound/unbound.conf</filename>
@@ -180,8 +184,9 @@
         suivant en tant qu'utilisateur
         <systemitem class="username">root</systemitem> :
       </para>
-<screen role="root"><userinput>unbound-anchor</userinput></screen>
-
+<screen role="root">
+<userinput>unbound-anchor</userinput>
+</screen>
     </sect3>
     <sect3 id="unbound-init">
       <title>Script de démarrage</title>

Modified: trunk/blfs/template/template.xml
===================================================================
--- trunk/blfs/template/template.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/template/template.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -82,10 +82,14 @@
     <para>Enable the following options in the kernel configuration
     and recompile the kernel if necessary:</para>
 <screen>
-<literal>Master section:
-  Subsection:
-    Required Option: M or Y
-    Incompatible option: N</literal>
+<literal>Master section --->
+  Subsection --->
+    [*]     Required parameter                     [CONFIG_REQU_PAR]
+    <*>     Required parameter (not as module)     [CONFIG_REQU_PAR_NMOD]
+    <*/M>   Required parameter (could be a module) [CONFIG_REQU_PAR_MOD]
+    <*/M/ > Optional parameter                     [CONFIG_OPT_PAR]
+    [ ] Incompatible parameter                     [CONFIG_INCOMP_PAR]
+    < > Incompatible parameter (even as module)    [CONFIG_INCOMP_PAR_MOD]</literal>
 </screen>
     <para>Select the appropriate sub-options that appear when the above options
     are selected.</para>

Modified: trunk/blfs/x/installing/libevdev.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/x/installing/libva.xml
===================================================================
--- trunk/blfs/x/installing/libva.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/libva.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -124,7 +124,7 @@
     </para>
 <screen>
 <userinput>mkdir -p m4              &&
-autoreconf   -f          &&
+autoreconf   -fi         &&
 ./configure $XORG_CONFIG &&
 make</userinput>
 </screen>

Modified: trunk/blfs/x/installing/mesalib.xml
===================================================================
--- trunk/blfs/x/installing/mesalib.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/mesalib.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -115,7 +115,21 @@
      Installez <application>MesaLib</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"               --prefix=$XORG_PREFIX                      --sysconfdir=/etc                          --enable-texture-float                     --enable-gles1                             --enable-gles2                             --enable-openvg                            --enable-osmesa                            --enable-xa                                --enable-gbm                               --enable-gallium-egl                       --enable-gallium-gbm                       --enable-glx-tls                           --with-egl-platforms="drm,x11"             --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
+<userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
+            --prefix=$XORG_PREFIX          \
+            --sysconfdir=/etc              \
+            --enable-texture-float         \
+            --enable-gles1                 \
+            --enable-gles2                 \
+            --enable-openvg                \
+            --enable-osmesa                \
+            --enable-xa                    \
+            --enable-gbm                   \
+            --enable-gallium-egl           \
+            --enable-gallium-gbm           \
+            --enable-glx-tls               \
+            --with-egl-platforms="drm,x11" \
+            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/installing/x7app.xml
===================================================================
--- trunk/blfs/x/installing/x7app.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7app.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -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-ati.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-ati.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver-ati.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -93,7 +93,9 @@
 <screen>
 <literal>Device Drivers  --->
   Graphics support --->
-    ATI Radeon: Y or M</literal>
+    Direct rendering Manager --->
+      <*> Direct Rendering Manager (XFree86 ... support) ---> [CONFIG_DRM]
+      <*> ATI Radeon                                          [CONFIG_DRM_RADEON]</literal>
 </screen>
       <indexterm zone="xorg-ati-driver xorg-ati-driver-kernel">
         <primary sortas="d-xorg-ati-driver">xorg-ati-driver</primary>

Modified: trunk/blfs/x/installing/x7driver-cirrus.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-cirrus.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver-cirrus.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -75,7 +75,9 @@
 <screen>
 <literal>Device Drivers  --->
   Graphics support --->
-    Cirrus driver for QEMU emulated device: Y or M</literal>
+    Direct rendering Manager --->
+      <*> Direct Rendering Manager (XFree86 ... support) ---> [CONFIG_DRM]
+      <*> Cirrus driver for QEMU emulated device              [CONFIG_DRM_CIRRUS_QEMU]</literal>
 </screen>
       <indexterm zone="xorg-cirrus-driver xorg-cirrus-driver-kernel">
         <primary sortas="d-xorg-cirrus-driver">xorg-cirrus-driver</primary>

Modified: trunk/blfs/x/installing/x7driver-intel.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-intel.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver-intel.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -80,9 +80,11 @@
 <screen>
 <literal>Device Drivers  --->
   Graphics support --->
-    Intel I810: Y or M
-    Intel 8xx/9xx/G3x/G4x/HD Graphics: Y or M
-      Enable modesetting on intel by default: Y</literal>
+    Direct rendering Manager --->
+      <*> Direct Rendering Manager (XFree86 ... support) ---> [CONFIG_DRM]
+      <*> Intel I810                                          [CONFIG_DRM_I810]
+      <*> Intel 8xx/9xx/G3x/G4x/HD Graphics                   [CONFIG_DRM_I915]
+      [*]   Enable modesetting on intel by default            [CONFIG_DRM_I915_KMS]</literal>
 </screen>
       <indexterm zone="xorg-intel-driver xorg-intel-driver-kernel">
         <primary sortas="d-xorg-intel-driver">xorg-intel-driver</primary>

Modified: trunk/blfs/x/installing/x7driver-nouveau.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-nouveau.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver-nouveau.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -83,8 +83,10 @@
 <screen>
 <literal>Device Drivers  --->
   Graphics support --->
-    Nouveau (nVidia) cards: Y or M
-      Support for backlight control: Y</literal>
+    Direct rendering Manager --->
+      <*> Direct Rendering Manager (XFree86 ... support) ---> [CONFIG_DRM]
+      <*> Nouveau (NVIDIA) cards                              [CONFIG_DRM_NOUVEAU]
+      [*]   Support for backlight control                     [CONFIG_DRM_NOUVEAU_BACKLIGHT]</literal>
 </screen>
       <indexterm zone="xorg-nouveau-driver xorg-nouveau-driver-kernel">
         <primary sortas="d-xorg-nouveau-driver">xorg-nouveau-driver</primary>

Modified: trunk/blfs/x/installing/x7driver-vesa.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-vesa.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver-vesa.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -76,8 +76,9 @@
 <screen>
 <literal>Device Drivers  --->
   Graphics support --->
-    -*- Support for frame buffer devices --->
-      VESA VGA graphics support: Y</literal>
+    Frame buffer Devices --->
+      <*> Support for frame buffer devices ---> [CONFIG_FB]
+      [*] VESA VGA graphics support             [CONFIG_FB_VESA]</literal>
 </screen>
       <indexterm zone="xorg-vesa-driver xorg-vesa-driver-kernel">
         <primary sortas="d-xorg-vesa-driver">xorg-vesa-driver</primary>

Modified: trunk/blfs/x/installing/x7driver-vmware.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-vmware.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver-vmware.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -75,8 +75,9 @@
 <literal>Device Drivers  --->
   Graphics support  --->
     Direct Rendering Manager  --->
-      DRM driver for VMware Virtual GPU: Y or M
-        Enable framebuffer console under vmwgfx by default: Y</literal>
+      <*> Direct Rendering Manager (XFree86 ... support) --->  [CONFIG_DRM]
+      <*> DRM driver for VMware Virtual GPU                    [CONFIG_DRM_VMWGFX]
+      [*]   Enable framebuffer console under vmwgfx by default [CONFIG_DRM_VMWGFX_FBCON]</literal>
 </screen>
       <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
         <primary sortas="d-xorg-vmware-driver">xorg-vmware-driver</primary>

Modified: trunk/blfs/x/installing/x7driver-wacom.xml
===================================================================
--- trunk/blfs/x/installing/x7driver-wacom.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver-wacom.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -82,9 +82,10 @@
       </para>
 <screen>
 <literal>Device Drivers  --->
-  Input device support  --->
-    [*] Tablets  --->
-      Wacom Intuos/Graphire tablet support (USB): Y or M</literal>
+  HID support  --->
+    <*/M> HID bus support                                      [CONFIG_HID]
+            Special HID drivers --->
+              <*/M> Wacom Intuos/Graphire tablet support (USB) [CONFIG_HID_WACOM]</literal>
 </screen>
       <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
         <primary sortas="d-xorg-wacom-driver">xorg-wacom-driver</primary>

Modified: trunk/blfs/x/installing/x7driver.xml
===================================================================
--- trunk/blfs/x/installing/x7driver.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/x7driver.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -4,7 +4,6 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
   <!ENTITY BLFS76 "http://www.fr.linuxfromscratch.org/view/blfs-7.6.fr/x/x7driver.html">
-
 ]>
 <sect1 id="xorg7-driver" xreflabel="Xorg Drivers">
   <?dbhtml filename="x7driver.html"?>

Modified: trunk/blfs/x/installing/xorg-server.xml
===================================================================
--- trunk/blfs/x/installing/xorg-server.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/installing/xorg-server.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -91,7 +91,12 @@
 <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-dmx                                --enable-glamor                             --enable-install-setuid                     --enable-suid-wrapper            &&
+<userinput>./configure $XORG_CONFIG                    \
+           --with-xkb-output=/var/lib/xkb   \
+           --enable-dmx                     \
+           --enable-glamor                  \
+           --enable-install-setuid          \
+           --enable-suid-wrapper            &&
 make</userinput>
 </screen>
     <para>Pour tester la construction, tapez : <command>make check</command>.</para>

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

Modified: trunk/blfs/x/lib/at-spi2-core.xml
===================================================================
--- trunk/blfs/x/lib/at-spi2-core.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/lib/at-spi2-core.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -92,7 +92,8 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc &&
 make</userinput>
 </screen>
     <para>

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

Modified: trunk/blfs/x/lib/gtk+3.xml
===================================================================
--- trunk/blfs/x/lib/gtk+3.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/lib/gtk+3.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -106,7 +106,11 @@
       suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                         --sysconfdir=/etc                     --enable-broadway-backend             --enable-x11-backend                  --disable-wayland-backend &&
+<userinput>./configure --prefix=/usr             \
+            --sysconfdir=/etc         \
+            --enable-broadway-backend \
+            --enable-x11-backend      \
+            --disable-wayland-backend &&
 make</userinput>
 </screen>
      <para>

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

Modified: trunk/blfs/x/wm/sawfish.xml
===================================================================
--- trunk/blfs/x/wm/sawfish.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/x/wm/sawfish.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -96,7 +96,6 @@
       vous pouvez trouver cela sur <ulink
       url="http://download.tuxfamily.org/sawfish/themes/FAQ.html/">
       FAQ de sawfish</ulink>.</para>
-
     </sect3>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/xfce/apps/midori.xml
===================================================================
--- trunk/blfs/xfce/apps/midori.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xfce/apps/midori.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -93,7 +93,11 @@
 <screen>
 <userinput>mkdir -v build &&
 cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=/usr                              -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version;       -DUSE_ZEITGEIST=OFF                                      ..  &&
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DUSE_ZEITGEIST=OFF         \
+      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
+      ..  &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/xfce/core/xfce4-power-manager.xml
===================================================================
--- trunk/blfs/xfce/core/xfce4-power-manager.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xfce/core/xfce4-power-manager.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -101,7 +101,8 @@
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
     </para>
 <screen role="root">
-<userinput>make docdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;      imagesdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;/images install</userinput>
+<userinput>make docdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version; \
+     imagesdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;/images install</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/xfce/core/xfce4-session.xml
===================================================================
--- trunk/blfs/xfce/core/xfce4-session.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xfce/core/xfce4-session.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -75,8 +75,6 @@
     <para role="required runtime">
       <xref linkend="xfdesktop"/>
     </para>
-
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/xfce4-session"/>
     </para>

Modified: trunk/blfs/xfce/core/xfce4-xkb-plugin.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/xincludes/texoptional.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/blfs/xsoft/graphweb/firefox.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xsoft/graphweb/firefox.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -129,11 +129,7 @@
    Créez le fichier en tapant la commande suivante : </para>
 <screen>
 <userinput>cat > mozconfig << "EOF"
-<literal># If you have a multicore machine, firefox will now use all the cores by
-# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
-# by uncommenting the next line and setting a valid number of CPU cores.
-#mk_add_options MOZ_MAKE_FLAGS="-j1"
-# If you have installed DBus-Glib comment out this line:
+<literal># If you have installed DBus-Glib comment out this line:
 ac_add_options --disable-dbus
 # If you have installed dbus-glib, and you have installed (or will install)
 # wireless-tools, and you wish to use geolocation web services, comment out
@@ -195,12 +191,10 @@
       car ce paramètre apporte des meilleures performances et des binaires plus petits.
       Cependant, si vous ne voulez pas mettre à jour gcc, désactivez ce paramètre avec:
     </para>
-<screen><userinput>test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&
-</userinput>
+<screen>
+<userinput>test $(uname -m) = "i686" && sed -i 's/enable-optimize/&=-O2/' mozconfig || true</userinput>
 </screen>
-
  </note>
-
     <para>
   Compilez <application>Firefox</application> en lançant les commandes
     suivantes :</para>
@@ -211,7 +205,7 @@
      </para></note>
  
 <screen>
-<userinput>test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&
+<userinput>MOZ_MAKE_FLAGS='-j<replaceable><number></replaceable>' \
 make -f client.mk</userinput>
 </screen>
      <para>
@@ -222,13 +216,13 @@
       multi-coeurs. Si c'est ce que vous voulez, effacez la ligne avec
       <envar>MOZ_MAKE_FLAGS</envar> dans la commande précédente.
     </para>
-
     <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 -f client.mk install INSTALL_SDK= &&
+<userinput>MOZ_MAKE_FLAGS='-j<replaceable><number></replaceable>' \
+make -f client.mk install INSTALL_SDK= &&
 mkdir -pv /usr/lib/mozilla/plugins &&
 ln -sfv ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput>
 </screen>
@@ -239,8 +233,6 @@
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>
-
-
     <para>
      <command>make -f client.mk ...</command> : Les produits Mozilla
     sont enpaquetés pour permettre l'utilisation d'un fichier de configuration qui peut
@@ -299,7 +291,8 @@
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 StartupNotify=true</literal>
 EOF
-ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png         /usr/share/pixmaps/firefox.png</userinput>
+ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
+        /usr/share/pixmaps/firefox.png</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/xsoft/graphweb/seamonkey.xml
===================================================================
--- trunk/blfs/xsoft/graphweb/seamonkey.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xsoft/graphweb/seamonkey.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -76,7 +76,6 @@
       <xref linkend="sqlite"/> et
       <xref linkend="yasm"/>
    </para>
-
     <note>
       <para>
         Si vous n'installez pas les dépendances recommandées, alors des copies internes de ses paquets seront utilisées.
@@ -132,51 +131,61 @@
     commande suivante :</para>
 <screen>
 <?dbfo keep-together="auto"?><userinput>cat > mozconfig << "EOF"
-<literal># If you have a multicore machine you can speed up the build by running
-# several jobs at once, but if you have a single core, delete this line:
-mk_add_options MOZ_MAKE_FLAGS="-j$(getconf _NPROCESSORS_ONLN)"
-# If you have installed Yasm delete this option:
-ac_add_options --disable-webm
-# If you have installed DBus-Glib delete this option:
+<literal># If you have a multicore machine, all cores will be used by default.
+# If desired, you can reduce the number of cores used, e.g. to 1, by
+# uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
+# If you have installed DBus-Glib comment out this line:
 ac_add_options --disable-dbus
-# If you have installed wireless-tools delete this option:
+# If you have installed dbus-glib, and you have installed (or will install)
+# wireless-tools, and you wish to use geolocation web services, comment out
+# this line
 ac_add_options --disable-necko-wifi
-# If you have installed libnotify delete this option:
+# If you have installed libnotify comment out this line:
 ac_add_options --disable-libnotify
-# Comment out following option if you have PulseAudio installed
-ac_add_options --disable-pulseaudio
 # 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 do *not* have GStreamer 0.x.y, uncomment this line:
 #ac_add_options --disable-gstreamer
 # or uncomment this line, if you have GStreamer 1.x.y
 #ac_add_options --enable-gstreamer=1.0
-# Uncomment these if you have installed them:
-# ac_add_options --enable-startup-notification
-# ac_add_options --enable-system-hunspell
-# ac_add_options --enable-system-sqlite
-# ac_add_options --with-system-libevent
-# ac_add_options --with-system-libvpx
-# ac_add_options --with-system-nspr
-# ac_add_options --with-system-nss
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-build-dir
+# Uncomment these lines if you have installed optional dependencies:
+#ac_add_options --enable-system-hunspell
+#ac_add_options --enable-startup-notification
+# Comment out following option if you have PulseAudio installed
+ac_add_options --disable-pulseaudio
+# If you have not installed Yasm then uncomment this line:
+#ac_add_options --disable-webm
+# Comment out following options if you have not installed
+# recommended dependencies:
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+# The BLFS editors recommend not changing anything below this line:
+ac_add_options --prefix=/usr
+ac_add_options --enable-application=suite
 ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-installer
-ac_add_options --disable-static
+ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
-ac_add_options --enable-shared
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+ac_add_options --enable-gio
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-url-classifier
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
-ac_add_options --prefix=/usr
+ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
-ac_add_options --with-system-zlib</literal>
+ac_add_options --with-system-zlib
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-build-dir</literal>
 EOF</userinput>
 </screen>
 <note>
@@ -188,17 +197,16 @@
       car ce paramètre apporte des meilleures performances et des binaires plus petits.
       Cependant, si vous ne voulez pas mettre à jour gcc, désactivez ce paramètre avec:
     </para>
-<screen><userinput>test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig ||true &&</userinput>
+<screen>
+<userinput>test $(uname -m) = "i686" && sed -i 's/enable-optimize/&=-O2/' mozconfig || true</userinput>
 </screen>
 </note>
-
     <note><para>
       Si vous compilez <application>SeaMonkey</application> dans un chroot, soyez certain que vous avez
        la variable d'environnement 
       <envar>SHELL</envar> initialisée ou déclarez
       <envar>SHELL=/bin/sh</envar> avant le premier make suivant.
     </para></note>
-
      <para>
       Le répertoire moz-build-dir doit exister et correspondre à la valeur utilisée dans
       mozconfig (aprés) pour le répertoire des objets (MOZ_OBJDIR):
@@ -217,8 +225,7 @@
 </screen>
     </note>
 <screen>
-<userinput>test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&
-make -f client.mk</userinput>
+<userinput>make -f client.mk</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests. Néanmoins, si <application>X</application>
     est en cours d'exécution, on peut
@@ -229,7 +236,7 @@
     commandes suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make -f client.mk install INSTALL_SDK= &&
-cp -v moz-build-dir/mozilla/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput>
+cp -v moz-build-dir/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput>
 </screen>
  
     <bridgehead renderas="sect3" id="devel-seamonkey" xreflabel="Seamonkey">
@@ -315,7 +322,8 @@
 StartupNotify=true
 Terminal=false
 EOF
-ln -sfv /usr/lib/seamonkey-&seamonkey-version;/chrome/icons/default/seamonkey.png         /usr/share/pixmaps</userinput>
+ln -sfv /usr/lib/seamonkey-&seamonkey-version;/chrome/icons/default/seamonkey.png \
+        /usr/share/pixmaps</userinput>
 </screen>
   </sect2>
   <sect2 role="content">

Modified: trunk/blfs/xsoft/office/libreoffice.xml
===================================================================
--- trunk/blfs/xsoft/office/libreoffice.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xsoft/office/libreoffice.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -16,21 +16,12 @@
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
   <!ENTITY libreoffice-translations-md5sum        "6e405e2b499ce28bce1e926bcb7268da">
   <!ENTITY libreoffice-translations-size          "122 Mo">
-  <!-- This package has some peculiarities, some discussed in the text.
-  Two values for SBU and buildsize are given due to the large difference
-  measured by editors, depending on architecture and sometimes installé
-  dependencies (with-system... -->
+  
   <!ENTITY libreoffice-buildsize          "8.7 Go (548 Mo installé), with translations">
   <!ENTITY libreoffice-time               "74 SBU (using parallelism=4), with translations">
-  <!-- [bdubbs]  For version 4.3.2.2 Built on x86_64 using -\-with-parallelism=4 -->
-  <!-- [fo] For version 4.3.1.2 I've got, for i686, statistcs over the upper
-  boundaries for x86_64 of previous versions, thus, temporarily, decided to use
-  single statistcs, instead of a range.
-  -->
-  <!-- This package has some peculiarities, some discussed in the text.
-  Two values for SBU and buildsize are given due to the large difference
-  measured by editors, depending on architecture and sometimes installé
-  dependencies (with-system... -->
+  
+  
+  
 ]>
 <sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-dlversion;">
   <?dbhtml filename="libreoffice.html"?>
@@ -305,10 +296,48 @@
     </para>
 <screen>
 <userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &&
-sed -e "/gzip -f/d"       -e "s|.1.gz|.1|g"     -i bin/distro-install-desktop-integration &&
+sed -e "/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 &&
-./autogen.sh --prefix=$LO_PREFIX                      --sysconfdir=/etc                        --with-vendor="BLFS"                     --with-lang="en-US pt-BR"                --with-help                              --with-myspell-dicts                     --with-alloc=system                      --without-java                           --without-system-dicts                   --disable-gconf                          --disable-odk                            --disable-postgresql-sdbc                --enable-release-build=yes               --enable-python=system                   --with-system-boost                      --with-system-clucene                    --with-system-cairo                      --with-system-curl                       --with-system-expat                      --with-system-graphite                   --with-system-harfbuzz                   --with-system-icu                        --with-system-jpeg                       --with-system-lcms2                      --with-system-libpng                     --with-system-libxml                     --with-system-mesa-headers               --with-system-neon                       --with-system-npapi-headers              --with-system-nss                        --with-system-odbc                       --with-system-openldap                   --with-system-openssl                    --with-system-poppler                    --with-system-redland                    --with-system-zlib                       --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput>
+./autogen.sh --prefix=$LO_PREFIX         \
+             --sysconfdir=/etc           \
+             --with-vendor="BLFS"        \
+             --with-lang="en-US pt-BR"   \
+             --with-help                 \
+             --with-myspell-dicts        \
+             --with-alloc=system         \
+             --without-java              \
+             --without-system-dicts      \
+             --disable-gconf             \
+             --disable-odk               \
+             --disable-postgresql-sdbc   \
+             --enable-release-build=yes  \
+             --enable-python=system      \
+             --with-system-boost         \
+             --with-system-clucene       \
+             --with-system-cairo         \
+             --with-system-curl          \
+             --with-system-expat         \
+             --with-system-graphite      \
+             --with-system-harfbuzz      \
+             --with-system-icu           \
+             --with-system-jpeg          \
+             --with-system-lcms2         \
+             --with-system-libpng        \
+             --with-system-libxml        \
+             --with-system-mesa-headers  \
+             --with-system-neon          \
+             --with-system-npapi-headers \
+             --with-system-nss           \
+             --with-system-odbc          \
+             --with-system-openldap      \
+             --with-system-openssl       \
+             --with-system-poppler       \
+             --with-system-redland       \
+             --with-system-zlib          \
+             --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput>
 </screen>
 <para>
    Les instructions suivantes vont seulement construire le paquet sans lancer aucune
@@ -327,7 +356,8 @@
 <screen role="root">
 <userinput>make distro-pack-install                                  &&
 install -v -m755 -d $LO_PREFIX/share/appdata              &&
-install -v -m644    sysui/desktop/appstream-appdata/*.xml                     $LO_PREFIX/share/appdata</userinput>
+install -v -m644    sysui/desktop/appstream-appdata/*.xml \
+                    $LO_PREFIX/share/appdata</userinput>
 </screen>
     <para>
        Si vous avez installé dans <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
@@ -339,28 +369,30 @@
        (il peut être nécessaire de se déconnecter de la session actuelle, avant que les icones apparaissent):
     </para>
 <screen role="root">
-<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/
-done
-unset i</userinput>
+<userinput>if [ "$LO_PREFIX" != "/usr" ]; then
+   mkdir -pv /usr/share/pixmaps 
+   for i in writer base calc draw impress math startcenter writer
+   do
+     ln -svf $LO_PREFIX/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
+             /usr/share/pixmaps/
+   done
+   unset i
+fi</userinput>
 </screen>
-
     <para>
        Si vous installez dans <filename
        class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>,
        créez les liens vers les pages de manuel. Soyez certain que la variable d'environnement
        LO_PREFIX est définie pour l'utilisateur root.
     </para>
-<screen role="root"><userinput>if [ "$LO_PREFIX" != "/usr" ]; then
+<screen role="root">
+<userinput>if [ "$LO_PREFIX" != "/usr" ]; then
    for i in $LO_PREFIX/share/man/man1/*; do
       ln -svf $i /usr/share/man/man1/
    done
    unset i
-fi</userinput></screen>
-
-
+fi</userinput>
+</screen>
 </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>

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

Modified: trunk/blfs/xsoft/other/icedtea-web.xml
===================================================================
--- trunk/blfs/xsoft/other/icedtea-web.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xsoft/other/icedtea-web.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -80,7 +80,10 @@
     <para>Installer <application>IcedTea-Web</application> en exécutant les commandes
 	suivantes:</para>
 <screen>
-<userinput>./configure --prefix=${JAVA_HOME}/jre                --with-jdk-home=${JAVA_HOME}             --disable-docs                           --mandir=${JAVA_HOME}/man &&
+<userinput>./configure --prefix=${JAVA_HOME}/jre    \
+            --with-jdk-home=${JAVA_HOME} \
+            --disable-docs               \
+            --mandir=${JAVA_HOME}/man &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas livré avec une suite de tests.</para>

Modified: trunk/blfs/xsoft/other/pidgin.xml
===================================================================
--- trunk/blfs/xsoft/other/pidgin.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xsoft/other/pidgin.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -96,7 +96,6 @@
     <para role="optional">
       <xref linkend="xdg-utils"/>
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/pidgin"/></para>
   </sect2>
@@ -108,7 +107,16 @@
       <quote>--disable-idn</quote>. Compilez <application>Pidgin</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                   --sysconfdir=/etc               --disable-avahi                 --disable-gtkspell              --disable-gstreamer             --disable-meanwhile             --disable-idn                   --disable-nm                    --disable-vv                    --disable-tcl &&
+<userinput>./configure --prefix=/usr       \
+            --sysconfdir=/etc   \
+            --disable-avahi     \
+            --disable-gtkspell  \
+            --disable-gstreamer \
+            --disable-meanwhile \
+            --disable-idn       \
+            --disable-nm        \
+            --disable-vv        \
+            --disable-tcl &&
 make</userinput>
 </screen>
     <para>Si vous avez installé <xref linkend="doxygen"/>

Modified: trunk/blfs/xsoft/other/rox-filer.xml
===================================================================
--- trunk/blfs/xsoft/other/rox-filer.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xsoft/other/rox-filer.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -62,8 +62,8 @@
       (par example, si un script est lancé) vous devez activer le support dnotify dans votre noyau.
       Dans <command>make menuconfig</command> :</para>
 <screen>
-<literal>Filesystems --->
-  [*] Dnotify support</literal>
+<literal>File systems --->
+  [*] Dnotify support   [CONFIG_DNOTIFY]</literal>
 </screen>
     <para>Sauvegardez le nouveau <filename>.config</filename> et ensuite compiler le noyau.</para>
     <indexterm zone="rox-filer rox-filer-kernel">

Modified: trunk/blfs/xsoft/other/thunderbird.xml
===================================================================
--- trunk/blfs/xsoft/other/thunderbird.xml	2014-12-09 12:02:26 UTC (rev 6698)
+++ trunk/blfs/xsoft/other/thunderbird.xml	2014-12-09 12:50:59 UTC (rev 6699)
@@ -182,7 +182,8 @@
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbuild</literal>
+# Presently, this option is broken
+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbuild</literal>
 EOF</userinput>
 </screen>
     <para>
@@ -279,7 +280,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