[lfs-fr] r1007 - in trunk/blfs: general/genlib stylesheets stylesheets/lfs-xsl stylesheets/lfs-xsl/docbook-xsl-snapshot stylesheets/lfs-xsl/docbook-xsl-snapshot/common stylesheets/lfs-xsl/docbook-xsl-snapshot/fo stylesheets/lfs-xsl/docbook-xsl-snapshot/html stylesheets/lfs-xsl/docbook-xsl-snapshot/lib stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml stylesheets/lfs-xsl/pdf stylesheets/lfs-xsl/xhtml template

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 11 Oct 16:50:31 PDT 2009


Author: jmengual
Date: 2009-10-12 01:50:31 +0200 (Mon, 12 Oct 2009)
New Revision: 1007

Modified:
   trunk/blfs/general/genlib/aspell.xml
   trunk/blfs/general/genlib/dbus-bindings.xml
   trunk/blfs/general/genlib/expat.xml
   trunk/blfs/general/genlib/fam.xml
   trunk/blfs/general/genlib/gamin.xml
   trunk/blfs/general/genlib/gdbm.xml
   trunk/blfs/general/genlib/genlib.xml
   trunk/blfs/stylesheets/blfs-chunked.xsl
   trunk/blfs/stylesheets/blfs-nochunks.xsl
   trunk/blfs/stylesheets/blfs-pdf.xsl
   trunk/blfs/stylesheets/dump-commands.xsl
   trunk/blfs/stylesheets/lfs-xsl/chunk-master.xsl
   trunk/blfs/stylesheets/lfs-xsl/chunk-slave.xsl
   trunk/blfs/stylesheets/lfs-xsl/chunkfast.xsl
   trunk/blfs/stylesheets/lfs-xsl/common.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl
   trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
   trunk/blfs/stylesheets/lfs-xsl/lfs-l10n.xml
   trunk/blfs/stylesheets/lfs-xsl/lfs-print.css
   trunk/blfs/stylesheets/lfs-xsl/lfs.css
   trunk/blfs/stylesheets/lfs-xsl/nochunks.xsl
   trunk/blfs/stylesheets/lfs-xsl/pdf.xsl
   trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-admon.xsl
   trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-index.xsl
   trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-lists.xsl
   trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
   trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
   trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-xref.xsl
   trunk/blfs/stylesheets/lfs-xsl/profile.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-index.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
   trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
   trunk/blfs/stylesheets/patcheslist.xsl
   trunk/blfs/stylesheets/wget-list.xsl
   trunk/blfs/template/README
   trunk/blfs/template/template.xml
Log:
Traduction blfs


Modified: trunk/blfs/general/genlib/aspell.xml
===================================================================
--- trunk/blfs/general/genlib/aspell.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/general/genlib/aspell.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,163 +1,340 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY aspell-download-http "http://gnu.mirror.mcgill.ca/aspell/aspell-&aspell-version;.tar.gz">
-<!ENTITY aspell-download-ftp  "ftp://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
-<!ENTITY aspell-md5sum        "8fa031d0eb37a5538aa6fefa657e707f">
-<!ENTITY aspell-size          "1.6 MB">
-<!ENTITY aspell-buildsize     "39.3 MB">
-<!ENTITY aspell-time          "0.74 SBU">
+  <!ENTITY aspell-download-http "http://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
+  <!ENTITY aspell-download-ftp  "ftp://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
+  <!ENTITY aspell-md5sum        "bc80f0198773d5c05086522be67334eb">
+  <!ENTITY aspell-size          "1.7 Mio">
+  <!ENTITY aspell-buildsize     "34 Mio (Additional 8 Mio for EN dictionary)">
+  <!ENTITY aspell-time          "0.6 SBU">
 ]>
 
 <sect1 id="aspell" xreflabel="Aspell-&aspell-version;">
-<sect1info>
-<othername>$LastChangedBy: randy $</othername>
-<date>$Date: 2005-07-29 07:17:28 $</date>
-</sect1info>
-<?dbhtml filename="aspell.html"?>
-<title>Aspell-&aspell-version;</title>
+  <?dbhtml filename="aspell.html"?>
 
-<sect2>
-<title>Introduction à <application>Aspell</application></title>
+  <sect1info>
+    <othername>$LastChangedBy: ken $</othername>
+    <date>$Date: 2008-12-06 22:41:01 +0100 (sam 06 déc 2008) $</date>
+  </sect1info>
 
-<para>Le paquetage <application>Aspell</application> contient un programme
-interactif de vérification d'orthographe et les biblikothèques
-d'<application>Aspell</application>. <application>Aspell</application> peut être
-utilisé soit en tant que bibliothèque soit en tant que vérificateur
-d'orthographe indépendant.</para>
+  <title>Aspell-&aspell-version;</title>
 
-<sect3><title>Informations sur le paquetage</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Téléchargement (HTTP) : <ulink
-url="&aspell-download-http;"/></para></listitem>
-<listitem><para>Téléchargement (FTP) : <ulink
-url="&aspell-download-ftp;"/></para></listitem>
-<listitem><para>Téléchargement de la somme MD5 : &aspell-md5sum;</para></listitem>
-<listitem><para>Taille du téléchargement :&aspell-size;</para></listitem>
-<listitem><para>Estimation de l'espace disque requis :
-&aspell-buildsize;</para></listitem>
-<listitem><para>Estimation du temps de construction :
-&aspell-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="aspell">
+    <primary sortas="a-Aspell">Aspell</primary>
+  </indexterm>
 
-<sect3><title>Téléchargements supplémentaires</title>
-<para>Vous aurez besoin de télécharger au moins un dictionnaire. Le lien
-ci-dessous vous amène à une page contenant les liens vers les dictionnaires
-de plusieurs langues.</para>
+  <sect2 role="package">
+    <title>Introduction à Aspell</title>
 
-<itemizedlist spacing='compact'>
-<listitem><para>Dictionnaire d'Aspell : <ulink 
-url="ftp://ftp.gnu.org/gnu/aspell/dict"/></para></listitem>
-</itemizedlist>
-</sect3>
+    <para>Le paquet <application>Aspell</application> contient un programme
+    interactif de vérification d'orthographe et les bibliothèques
+    <application>Aspell</application>. Vous pouvez utiliser <application>Aspell</application> 
+    soit comme une bibliothèque soit comme un vérificateur d'orthographe indépendant.</para>
 
-<sect3><title>Dépendances d'<application>Aspell</application></title>
-<sect4><title>Requis</title>
-<para><xref linkend="which"/></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Téléchargement (HTTP) : <ulink url="&aspell-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Téléchargement (FTP) : <ulink url="&aspell-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Somme de contrôle MD5 du téléchargement : &aspell-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Taille du téléchargement : &aspell-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation de l'espace disque requis : &aspell-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation du temps de construction : &aspell-time;</para>
+      </listitem>
+    </itemizedlist>
 
-</sect2>
+    <bridgehead renderas="sect3">Téléchargements supplémentaires</bridgehead>
+    <para>Vous aurez besoin de télécharger au moins un dictionnaire. Le lien ci-dessous
+    vous amènera sur une page contenant des liens vers des dictionnaires en plusieurs
+    langues.</para>
 
-<sect2>
-<title>Installation de <application>Aspell</application></title>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Dictionnaires Aspell : <ulink
+        url="ftp://ftp.gnu.org/gnu/aspell/dict"/></para>
+      </listitem>
+    </itemizedlist>
 
-<para>Installez <application>Aspell</application> en exécutant les commandes
-suivantes :</para>
+    <!--<bridgehead renderas="sect3">Aspell Dependencies</bridgehead>
 
-<screen><userinput><command>./configure --prefix=/usr &&
-make &&
-make install</command></userinput></screen>
+    <bridgehead renderas="sect4">Requises</bridgehead>
+    <para role="required"><xref linkend="which"/></para>-->
 
-</sect2>
+    <!-- <bridgehead renderas="sect4">Facultatives</bridgehead>
+    <para role="optional"><xref linkend="tetex"/></para> -->
 
-<sect2>
-<title>Configurer <application>Aspell</application></title>
+    <para condition="html" role="usernotes">Notes utilisateur :
+    <ulink url="&blfs-wiki;/aspell"/></para>
 
-<sect3><title>Informations de configuration</title>
+  </sect2>
 
-<para>Après avoir installé <application>Aspell</application>, vous devez
-configurer au moins un dictionnaire. Installez un dictionnaire ou plus en
-exécutant les commandes suivantes :</para>
+  <sect2 role="installation">
+    <title>Installation d'Aspell</title>
 
-<screen><userinput><command>./configure &&
-make &&
-make install</command></userinput></screen>
-</sect3>
+    <para>Installez <application>Aspell</application> en lançant les commandes
+    suivantes :</para>
 
-</sect2>
+<screen><userinput>./configure --prefix=/usr &&
+make</userinput></screen>
 
-<sect2>
-<title>Contenu</title>
+    <!-- <para>Pre-built HTML documentation is included in the package. If you have
+    <application>teTeX</application> installed et you wish to build additional
+    formats of the documentation, issue any or all of the following
+    suivantes :</para>
 
-<para>Le paquetage <application>Aspell</application> contenu
-<command>aspell</command>, 
-<command>aspell-import</command>, 
-<command>precat</command>, 
-<command>preunzip</command>, 
-<command>prezip</command>, 
-<command>prezip-bin</command>, 
-<command>pspell-config</command>, 
-<command>run-with-aspell</command>, 
-<command>word-list-compress</command>, 
-des filtres, des dictionnaires, des scripts de compatibilité et les
-bibliothèques <filename class='libraryfile'>libaspell</filename> et
-<filename class='libraryfile'>libpspell</filename>.</para>
+<screen><userinput>make -C manual pdf &&
+make -C manual pdf &&
+make -C manual ps &&
+cd manual &&
+makeinfo -plaintext -o aspell.txt aspell.texi &&
+makeinfo -plaintext -o aspell-dev.txt aspell-dev.texi &&
+cd ..</userinput></screen> -->
 
-</sect2>
+    <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
 
-<sect2><title>Description</title>
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 
-<sect3><title>aspell</title>
-<para><command>aspell</command> est un outil fonctionnant comme le remplacement
-de <command>ispell -a</command>, en tant que vérificateur indépendant, en tant
-qu'outil pour tester les fonctionnalités d'<application>Aspell</application> et
-en tant qu'outil de gestion des dictionnaires.</para></sect3>
+<screen role="root"><userinput>make install &&
+install -v -m755 -d /usr/share/doc/aspell-&aspell-version;/aspell{,-dev}.html &&
+install -v -m644 manual/aspell.html/* \
+    /usr/share/doc/aspell-&aspell-version;/aspell.html &&
+install -v -m644 manual/aspell-dev.html/* \
+    /usr/share/doc/aspell-&aspell-version;/aspell-dev.html</userinput></screen>
 
-<sect3><title>aspell-import</title>
-<para><command>aspell-import</command> importe de vieux dictionnaires personnels
-dans <application>Aspell</application>.</para></sect3>
+  <!-- <para>If you built additional formats of the documentation, install them
+  by issuing the following command as the
+  <systemitem class="username">root</systemitem> :</para>
 
-<sect3><title>precat</title>
-<para><command>precat</command> décompresse un fichier compressé avec
-<command>prezip</command> sur stdout.</para></sect3>
+<screen role="root"><userinput>install -v -m644 manual/aspell{,-dev}.{ps,pdf,dvi,txt} \
+    /usr/share/doc/aspell-&aspell-version;</userinput></screen> -->
 
-<sect3><title>preunzip</title>
-<para><command>preunzip</command> décompresse un fichier compressé avec
-<command>prezip</command>.</para></sect3>
+  <para>Si vous n'envisagez pas d'installer <application>Ispell</application>, copiez le script enveloppe
+  <command>ispell</command> :</para>
 
-<sect3><title>prezip</title>
-<para><command>prezip</command> est un compresseur utilisé pour les listes de
-mots ou tout autre fichier texte similaire.</para></sect3>
+<screen role="root"><userinput>install -v -m 755 scripts/ispell /usr/bin/</userinput></screen>
 
-<sect3><title>prezip-bin</title>
-<para><command>prezip-bin</command> est appelé par les différents scripts
-emballé pour réaliser les options de compression et de décompression.
-</para></sect3>
+  <para>Si vous n'envisagez pas d'installer <application>Spell</application>,
+  copiez le script enveloppe <command>spell</command>:</para>
 
-<sect3><title>pspell-config</title>
-<para><command>pspell-config</command> affiche des informations sur
-l'installation de <filename class='libraryfile'>libpspell</filename>, principalement
-dans les scripts de construction.</para></sect3>
+<screen role="root"><userinput>install -v -m 755 scripts/spell /usr/bin/</userinput></screen>
 
-<sect3><title>run-with-aspell</title>
-<para><command>run-with-aspell</command> est un script aidant à l'utilisation
-d'<application>Aspell</application> comem remplacement d'<command>ispell</command>.
-</para></sect3>
+ </sect2>
 
-<sect3><title>word-list-compress</title>
-<para><command>word-list-compress</command> compresse et décompresse les listes
-de mots triés pour qu'elles soient utilisées avec le vérificateur d'orthographe
-<application>Aspell</application>.</para></sect3>
+ <!-- <sect2 role="commands">
+    <title>Explication des commandes</title>
 
-<sect3><title>Bibliothèques d'aspell</title>
-<para>Les bibliothèques <filename class='libraryfile'>lib{a,p}spell</filename>
-sont les interfaces pour la vérification d'orthographe.</para></sect3>
+    <para><command>make -C manual pdf</command>: This command is listed twice
+    as the first time it runs it will display an error et abort, although it
+    creates the requested file. Running the command again ensures the other
+    file is also created.</para>
 
-</sect2>
+  </sect2> -->
 
+  <sect2 role="configuration">
+    <title>Configuration d'Aspell</title>
+
+    <sect3>
+      <title>Informations de configuration</title>
+
+      <para>Après avoir installé <application>Aspell</application>, vous devez paramétrer
+      au moins un dictionnaire. Installez un ou plusieurs dictionnaires en lançant
+      les commandes suivantes :</para>
+
+<screen><userinput>./configure &&
+make</userinput></screen>
+
+      <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contenu</title>
+
+    <segmentedlist>
+      <segtitle>Programmes installés</segtitle>
+      <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoires installés</segtitle>
+
+      <seglistitem>
+        <seg>aspell, aspell-import, precat, preunzip, prezip, prezip-bin,
+        pspell-config, run-with-aspell, word-list-compress et optionally,
+        ispell et spell</seg>
+        <seg>libaspell.so et libpspell.so</seg>
+        <seg>/usr/include/pspell et /usr/lib/aspell-0.60</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="aspell-prog">
+        <term><command>aspell</command></term>
+        <listitem>
+          <para>est un outil qui peut fonctionner en remplacement de
+          <command>ispell -a</command>, comme vérificateur d'orthographe indépendent,
+          comme outil de test pour tester des fonctionnalités
+          d'<application>Aspell</application> et comme outil pour la gestion
+          de dictionnaires.</para>
+          <indexterm zone="aspell aspell-prog">
+            <primary sortas="b-aspell">aspell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aspell-ispell">
+        <term><command>ispell</command></term>
+        <listitem>
+          <para>est une enveloppe d'<command>aspell</command> pour l'appeler en
+          mode <command>ispell</command> compatible.</para>
+          <indexterm zone="aspell aspell-ispell">
+            <primary sortas="b-ispell">ispell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aspell-spell">
+        <term><command>spell</command></term>
+        <listitem>
+<para>est une enveloppe d'<command>aspell</command> pour l'appeler en
+          mode <command>spell</command> compatible.</para>
+          <indexterm zone="aspell aspell-spell">
+            <primary sortas="b-spell">spell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aspell-import">
+        <term><command>aspell-import</command></term>
+        <listitem>
+          <para>importe de vieux dictionnaires personnels dans 
+          <application>Aspell</application>.</para>
+          <indexterm zone="aspell aspell-import">
+            <primary sortas="b-aspell-import">aspell-import</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="precat">
+        <term><command>precat</command></term>
+        <listitem>
+          <para>décompresse un fichier <command>prezip</command>pé sur la sortie standard.</para>
+          <indexterm zone="aspell precat">
+            <primary sortas="b-precat">precat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="preunzip">
+        <term><command>preunzip</command></term>
+        <listitem>
+          <para>décompresse un fichier <command>prezip</command>pé.</para>
+          <indexterm zone="aspell preunzip">
+            <primary sortas="b-preunzip">preunzip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="prezip">
+        <term><command>prezip</command></term>
+        <listitem>
+          <para>est un compresseur delta de préfixe, utilisé pour compresser des listes organisées de mots
+          ou d'autres fichiers textes semblables.</para>
+          <indexterm zone="aspell prezip">
+            <primary sortas="b-prezip">prezip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="prezip-bin">
+        <term><command>prezip-bin</command></term>
+        <listitem>
+          <para>est appelé par les scripts enveloppes pour effectuer
+          la compression et la décompression finales.</para>
+          <indexterm zone="aspell prezip-bin">
+            <primary sortas="b-prezip-bin">prezip-bin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pspell-config">
+        <term><command>pspell-config</command></term>
+        <listitem>
+          <para>affiche des informations sur l'installation
+          <filename class='libraryfile'>libpspell</filename>, souvent utilisé dans des
+          scripts de construction.</para>
+          <indexterm zone="aspell pspell-config">
+            <primary sortas="b-pspell-config">pspell-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="run-with-aspell">
+        <term><command>run-with-aspell</command></term>
+        <listitem>
+          <para>est un script pour aider à utiliser <application>Aspell</application> en remplacement
+          d'<command>ispell</command>.</para>
+          <indexterm zone="aspell run-with-aspell">
+            <primary sortas="b-run-with-aspell">run-with-aspell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="word-list-compress">
+        <term><command>word-list-compress</command></term>
+        <listitem>
+          <para>compresse ou décompresse des listes de mots classées pour une utilisation
+          avec le vérificateur d'orthographe <application>Aspell</application>.</para>
+          <indexterm zone="aspell word-list-compress">
+            <primary sortas="b-word-list-compress">word-list-compress</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libaspell">
+        <term><filename class='libraryfile'>libaspell.so</filename></term>
+        <listitem>
+          <para>contient des fonctions API de vérification d'orthographe.</para>
+          <indexterm zone="aspell libaspell">
+            <primary sortas="c-lib">libaspell.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpspell">
+        <term><filename class='libraryfile'>libpspell.so</filename></term>
+        <listitem>
+          <para>est une interface avec la bibliothèque
+          <filename class='libraryfile'>libaspell</filename>. Toutes les
+          fonctionnalités de vérification d'orthographe se trouvent maintenant dans
+          <filename class='libraryfile'>libaspell</filename> mais cette bibliothèque
+          est incluse pour une compatibilité rétroactive.</para>
+          <indexterm zone="aspell libpspell">
+            <primary sortas="c-libpspell">libpspell.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
 </sect1>
-

Modified: trunk/blfs/general/genlib/dbus-bindings.xml
===================================================================
--- trunk/blfs/general/genlib/dbus-bindings.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/general/genlib/dbus-bindings.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,23 +6,23 @@
 
   <!ENTITY dbus-glib-download-http "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-&dbus-glib-version;.tar.gz">
   <!ENTITY dbus-glib-download-ftp  " ">
-  <!ENTITY dbus-glib-md5sum        "0923d825a0aff2e4eb23338b630286fb">
-  <!ENTITY dbus-glib-size          "654 KB">
-  <!ENTITY dbus-glib-buildsize     "9 MB">
+  <!ENTITY dbus-glib-md5sum        "86ea60ba2118a1b9deafe8257f6a6a1a">
+  <!ENTITY dbus-glib-size          "688 Kio">
+  <!ENTITY dbus-glib-buildsize     "11 Mio">
   <!ENTITY dbus-glib-time          "0.2 SBU">
 
   <!ENTITY dbus-python-download-http "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
   <!ENTITY dbus-python-download-ftp  " ">
-  <!ENTITY dbus-python-md5sum        "024522ffba612f0d41b64269e925835c">
-  <!ENTITY dbus-python-size          "482 KB">
-  <!ENTITY dbus-python-buildsize     "6 MB">
-  <!ENTITY dbus-python-time          "0.1 SBU">
+  <!ENTITY dbus-python-md5sum        "562c78876219bf458d79a041af18293d">
+  <!ENTITY dbus-python-size          "494 Kio">
+  <!ENTITY dbus-python-buildsize     "12 Mio (includes installing all the documentation)">
+  <!ENTITY dbus-python-time          "0.3 SBU">
 
   <!ENTITY dbus-qt3-download-http "&files-anduin;/sources/dbus-qt3-&dbus-qt3-version;.tar.bz2">
   <!ENTITY dbus-qt3-download-ftp  " ">
   <!ENTITY dbus-qt3-md5sum        "307e119f501c207a437d1dd087c9af80">
-  <!ENTITY dbus-qt3-size          "390 KB">
-  <!ENTITY dbus-qt3-buildsize     "4 MB">
+  <!ENTITY dbus-qt3-size          "390 Kio">
+  <!ENTITY dbus-qt3-buildsize     "4 Mio">
   <!ENTITY dbus-qt3-time          "0.1 SBU">
 
   <!-- All the other bindings info should be here as well -->
@@ -33,7 +33,7 @@
 
   <sect1info>
     <othername>$LastChangedBy: randy $</othername>
-    <date>$Date: 2008-11-16 21:28:00 $</date>
+    <date>$Date: 2009-03-03 23:28:02 +0100 (mar 03 mar 2009) $</date>
   </sect1info>
 
   <title>D-Bus Bindings</title>
@@ -43,21 +43,20 @@
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to D-Bus Bindings</title>
+    <title>Introduction à D-Bus Bindings</title>
 
-    <para>The <application>D-Bus Bindings</application> are a group of packages
-    that contain programming language and platform interfaces to the D-Bus API.
-    This is useful for programmers to easily interface D-Bus with their
-    supported platform or language of choice. Some non-D-Bus packages will
-    require one or more of the Bindings packages in order to build
-    successfully.</para>
+    <para>Les <application>D-Bus Bindings</application> sont un ensemble de paquets
+    qui contiennent des langages de programmation et des interfaces de plateforme pour l'API
+    D-Bus. C'est utile pour les programmeurs pour faciliter l'interaction de 
+    D-Bus avec la plateforme supportée ou le langage de leur choix. Certains paquets non 
+    D-Bus exigeront un ou plusieurs paquets bindings afin de se construire
+    avec succès.</para>
 
-    <para>The <application>GLib</application>,
-    <application>Python</application> and <application>Qt3</application>
-    Bindings are included on this page. Other language bindings will be added
-    soon. Until then, see the <ulink
-    url="http://www.freedesktop.org/wiki/Software/DBusBindings">D-Bus
-    Bindings</ulink> page for information.</para>
+    <para>Les bindings <application>GLib</application>,
+    <application>Python</application> et <application>Qt3</application>
+    sont inclus sur cette page. D'autres bindings de langage seront bientôt ajoutés. En
+    attendant, voir la page <ulink url="http://www.freedesktop.org/wiki/Software/DBusBindings">D-Bus
+    Bindings</ulink> pour des informations.</para>
 
     <itemizedlist spacing="compact">
       <listitem>
@@ -73,68 +72,89 @@
 
   </sect2>
 
-  <!-- Below is 111 lines to cut and paste to create a new binding -->
+  <!-- Below is 111 lines to cut et paste to create a new binding -->
   <!-- Begin D-Bus GLib Bindings -->
   <sect2 id="dbus-glib" xreflabel="D-Bus GLib Bindings-&dbus-glib-version;">
-  <title>D-Bus GLib Bindings</title>
+  <title>Bindings D-Bus GLib</title>
 
   <indexterm zone="dbus-glib">
     <primary sortas="a-dbus-glib">D-Bus GLib Bindings</primary>
   </indexterm>
 
-    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&dbus-glib-download-http;"/></para>
+        <para>Téléchargement (HTTP) : <ulink url="&dbus-glib-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&dbus-glib-download-ftp;"/></para>
+        <para>Téléchargement (FTP) : <ulink url="&dbus-glib-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &dbus-glib-md5sum;</para>
+        <para>Somme de contrôle MD5 du téléchargement : &dbus-glib-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &dbus-glib-size;</para>
+        <para>Taille du téléchargement : &dbus-glib-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &dbus-glib-buildsize;</para>
+        <para>Estimation de l'espace disque requis : &dbus-glib-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &dbus-glib-time;</para>
+        <para>Estimation du temps de construction : &dbus-glib-time;</para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">D-Bus GLib Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
+    <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required"><xref linkend="dbus"/>,
-    <xref linkend="glib2"/>, and
+    <xref linkend="glib2"/> et
     <xref linkend="expat"/></para>
 
-    <para condition="html" role="usernotes">User Notes:
+    <bridgehead renderas="sect4">Facultatives to Build the API Documentation</bridgehead>
+    <para role="required"><xref linkend="doxygen"/></para>
+
+    <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/dbus-glib"/></para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of D-Bus GLib Bindings</title>
+    <title>Installation des bindings D-Bus</title>
 
-    <para>Install <application>D-Bus GLib Bindings</application> by
-    running the following commands:</para>
+    <para>Installez <application>D-Bus GLib Bindings</application> en
+    lançant les commandes suivantes :</para>
 
 <screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>Le paramètre <option>--enable-doxygen-docs</option> ne fonctionne pas
+    correctement. Si vous avez installé <application>Doxygen</application> et si vous souhaitez
+    construire la documentation de l'API, faites 
+    <command>doxygen</command>.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Pour tester les résultats, lancez : <command>make check</command>. Notez que
+    vous pouvez des tests plus compréhensibles en suivant la même méthode que celle utilisée
+    dans les instructions de <application>D-BUS</application>, ce qui implique de construire
+    le paquet deux fois.</para>
 
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
+
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <para>Si vous avez construit la documentation de l'API, installez-la en lançant les commandes
+    suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/dbus-glib-&dbus-glib-version;/api \
+                    /usr/share/man/man3dbus &&
+install -v -m644    doc/api/html/* \
+                    /usr/share/doc/dbus-glib-&dbus-glib-version;/api &&
+install -v -m644    doc/api/man/man3dbus/* \
+                    /usr/share/man/man3dbus</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
-    <title>Command Explanations</title>
+    <title>Explication des commandes</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
@@ -142,29 +162,30 @@
   </sect2>
 
   <sect2 role="content">
-    <title>Contents</title>
+    <title>Contenu</title>
 
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Bibliothèque installée</segtitle>
+      <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
         <seg>dbus-binding-tool</seg>
         <seg>libdbus-glib-1.{so,a}</seg>
-        <seg>/usr/share/gtk-doc/html/dbus-glib</seg>
+        <seg>/usr/share/gtk-doc/html/dbus-glib et optionally
+        /usr/share/doc/dbus-glib-&dbus-glib-version;/api</seg>
       </seglistitem>
     </segmentedlist>
 
     <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="glib-dbus-binding-tool">
         <term><command>dbus-binding-tool</command></term>
         <listitem>
-          <para>is a tool used to interface with the D-Bus API.</para>
+          <para>est un outil utilisé pour interagir avec l'API D-Bus.</para>
           <indexterm zone="dbus-glib glib-dbus-binding-tool">
             <primary sortas="b-dbus-binding-tool">dbus-binding-tool</primary>
           </indexterm>
@@ -174,8 +195,8 @@
       <varlistentry id="libdbus-glib-1">
         <term><filename class='libraryfile'>libdbus-glib-1.{so,a}</filename></term>
         <listitem>
-          <para>contains <application>GLib</application> interface functions
-          to the D-Bus API.</para>
+          <para>contient les fonctions d'interface <application>GLib</application> avec
+          l'API D-Bus.</para>
           <indexterm zone="dbus-glib libdbus-glib-1">
             <primary sortas="c-libdbus-glib-1">libdbus-glib-1.{so,a}</primary>
           </indexterm>
@@ -188,91 +209,94 @@
 
   <!-- Begin D-Bus Python Bindings -->
   <sect2 id="dbus-python" xreflabel="D-Bus Python Bindings-&dbus-python-version;">
-  <title>D-Bus Python Bindings</title>
+  <title>Bindings D-Bus Python</title>
 
   <indexterm zone="dbus-python">
     <primary sortas="a-dbus-python">D-Bus Python Bindings</primary>
   </indexterm>
 
-    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&dbus-python-download-http;"/></para>
+        <para>Téléchargement (HTTP) : <ulink url="&dbus-python-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&dbus-python-download-ftp;"/></para>
+        <para>Téléchargement (FTP) : <ulink url="&dbus-python-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &dbus-python-md5sum;</para>
+        <para>Somme de contrôle MD5 du téléchargement : &dbus-python-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &dbus-python-size;</para>
+        <para>Taille du téléchargement : &dbus-python-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &dbus-python-buildsize;</para>
+        <para>Estimation de l'espace disque requis : &dbus-python-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &dbus-python-time;</para>
+        <para>Estimation du temps de construction : &dbus-python-time;</para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">D-Bus Python Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/> and
+    <bridgehead renderas="sect4">Requises</bridgehead>
+    <para role="required"><xref linkend="python"/> et
     <xref linkend="dbus-glib"/></para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="required"><xref linkend="pkgconfig"/></para>
+    <bridgehead renderas="sect4">Facultatives</bridgehead>
+    <para role="optional"><ulink url="&gnome-download-http;/pygobject">PyGObject</ulink>
+    (nécessaire pour lancer la suite de tests)</para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink
-     url="&gnome-download-http;/pygobject"> PyGObject</ulink> (required to run
-     the test suite)</para>
+    <bridgehead renderas="sect4">Facultatives
+    (Nécessaire pour construire la documentation de l'API et HTML)</bridgehead>
+    <para role="optional"><ulink url="http://epydoc.sourceforge.net/">Epydoc</ulink>
+    et <ulink url="http://docutils.sourceforge.net/">Docutils</ulink></para>
 
-    <bridgehead renderas="sect4">Optional
-    (Required to build the API Documentation)</bridgehead>
-    <para role="optional"><ulink
-    url="http://epydoc.sourceforge.net/">Epydoc</ulink>
-    and <ulink url="http://docutils.sourceforge.net/">Docutils</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
+    <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/dbus-python"/></para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of D-Bus Python Bindings</title>
+    <title>Installation des bindings D-Bus Python</title>
 
-    <para>Install <application>D-Bus Python Bindings</application> by
-    running the following commands:</para>
+    <para>Installez <application>D-Bus Python Bindings</application> en
+    lançant les commandes suivantes :</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr \
+            --docdir=/usr/share/doc/dbus-python-&dbus-python-version; &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note you
-    must have <application>PyGObject</application> installed.</para>
+    <para>Pour tester les résultats, lancez : <command>make check</command>. Noteez que 
+    vous devez avoir installé <application>PyGObject</application>.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <para>Si vous avez construit la documentation de l'API, installez-la en lançant les commandes
+    suivantes en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/dbus-python-&dbus-python-version;/api &&
+install -v -m644    api/* \
+                    /usr/share/doc/dbus-python-&dbus-python-version;/api</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">
-    <title>Contents</title>
+    <title>Contenu</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Programmes installés</segtitle>
+      <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
+        <seg>Aucun</seg>
         <seg><application>Python</application>
         <application>D-Bus</application> modules</seg>
-        <seg>/usr/lib/python&python-majorver;/site-packages/dbus and
-        /usr/share/doc/dbus-python</seg>
+        <seg>/usr/lib/python&python-majorver;/site-packages/dbus et
+        /usr/share/doc/dbus-python-&dbus-python-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -280,90 +304,90 @@
 
   <!-- Begin D-Bus Qt3 Bindings -->
   <sect2 id="dbus-qt3" xreflabel="D-Bus Qt3 Bindings-&dbus-qt3-version;">
-  <title>D-Bus Qt3 Bindings</title>
+  <title>Bindings D-Bus Qt3</title>
 
   <indexterm zone="dbus-qt3">
     <primary sortas="a-dbus-qt3">D-Bus Qt3 Bindings</primary>
   </indexterm>
 
-    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&dbus-qt3-download-http;"/></para>
+        <para>Téléchargement (HTTP) : <ulink url="&dbus-qt3-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&dbus-qt3-download-ftp;"/></para>
+        <para>Téléchargement (FTP) : <ulink url="&dbus-qt3-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &dbus-qt3-md5sum;</para>
+        <para>Somme de contrôle MD5 du téléchargement : &dbus-qt3-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &dbus-qt3-size;</para>
+        <para>Taille du téléchargement : &dbus-qt3-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &dbus-qt3-buildsize;</para>
+        <para>Estimation de l'espace disque requis : &dbus-qt3-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &dbus-qt3-time;</para>
+        <para>Estimation du temps de construction : &dbus-qt3-time;</para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">D-Bus Qt3 Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus"/> and
+    <bridgehead renderas="sect4">Requises</bridgehead>
+    <para role="required"><xref linkend="dbus"/> et
     <xref linkend="qt"/></para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <bridgehead renderas="sect4">Recommandées</bridgehead>
     <para role="recommended"><xref linkend="pkgconfig"/></para>
 
-    <para condition="html" role="usernotes">User Notes:
+    <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/dbus-qt3"/></para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of D-Bus Qt3 Bindings</title>
+    <title>Installation des bindings D-Bus Qt3</title>
 
-    <para>Install <application>D-Bus Qt3 Bindings</application> by
-    running the following commands:</para>
+    <para>Installez <application>D-Bus Qt3 Bindings</application> en
+    lançant les commandes suivantes :</para>
 
 <screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</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>Contents</title>
+    <title>Contenu</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Programmes installés</segtitle>
+      <segtitle>Bibliothèque installée</segtitle>
+      <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
+        <seg>Aucun</seg>
         <seg>libdbus-qt-1.so</seg>
-        <seg>None</seg>
+        <seg>Aucun</seg>
       </seglistitem>
     </segmentedlist>
 
     <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libdbus-qt-1">
         <term><filename class='libraryfile'>libdbus-qt-1.{so,a}</filename></term>
         <listitem>
-          <para>contains <application>Qt3</application> interface functions
-          to the D-Bus API.</para>
+          <para>contient les fonctions d'interface <application>Qt3</application> avec l'API
+          D-Bus.</para>
           <indexterm zone="dbus-qt3 libdbus-qt-1">
             <primary sortas="c-libdbus-qt-1">libdbus-qt-1.{so,a}</primary>
           </indexterm>

Modified: trunk/blfs/general/genlib/expat.xml
===================================================================
--- trunk/blfs/general/genlib/expat.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/general/genlib/expat.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,79 +1,128 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY expat-download-http "http://prdownloads.sourceforge.net/expat/expat-&expat-version;.tar.gz">
-<!ENTITY expat-download-ftp " ">
-<!ENTITY expat-md5sum "aff487543845a82fe262e6e2922b4c8e">
-<!ENTITY expat-size "314 KB">
-<!ENTITY expat-buildsize "4.2 MB">
-<!ENTITY expat-time "0.11 SBU">
+  <!ENTITY expat-download-http "&sourceforge-repo;/expat/expat-&expat-version;.tar.gz">
+  <!ENTITY expat-download-ftp  " ">
+  <!ENTITY expat-md5sum        "ee8b492592568805593f81f8cdf2a04c">
+  <!ENTITY expat-size          "446 Kio">
+  <!ENTITY expat-buildsize     "6 Mio">
+  <!ENTITY expat-time          "0.1 SBU">
 ]>
 
 <sect1 id="expat" xreflabel="expat-&expat-version;">
-<sect1info>
-<othername>$LastChangedBy: randy $</othername>
-<date>$Date: 2005-07-29 07:17:28 $</date>
-</sect1info>
-<?dbhtml filename="expat.html"?>
-<title>expat-&expat-version;</title>
+  <?dbhtml filename="expat.html"?>
 
-<sect2>
-<title>Introduction à <application>expat</application></title>
+  <sect1info>
+    <othername>$LastChangedBy: randy $</othername>
+    <date>$Date: 2008-10-13 16:49:44 +0200 (lun 13 oct 2008) $</date>
+  </sect1info>
 
-<para>Le paquetage <application>expat</application> contient une bibliothèque C
-orienté flux pour analyser du <acronym>XML</acronym>.</para>
+  <title>Expat-&expat-version;</title>
 
-<sect3><title>Informations sur le paquetage</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Téléchargement (HTTP) : 
-<ulink url="&expat-download-http;"/></para></listitem>
-<listitem><para>Téléchargement (FTP) : 
-<ulink url="&expat-download-ftp;"/></para></listitem>
-<listitem><para>Téléchargement de la somme MD5 : &expat-md5sum;</para></listitem>
-<listitem><para>Taille du téléchargement :&expat-size;</para></listitem>
-<listitem><para>Estimation de l'espace disque requis : 
-&expat-buildsize;</para></listitem>
-<listitem><para>Estimation du temps de construction : 
-&expat-time;</para></listitem></itemizedlist></sect3>
+  <indexterm zone="expat">
+    <primary sortas="a-Expat">Expat</primary>
+  </indexterm>
 
-<sect3><title>Dépendances <application>expat</application></title>
-<sect4><title>Optionnel</title>
-<para><ulink url="http://check.sourceforge.net/">Check</ulink> 
-(pour exécuter les tests <command>make check</command>)</para>
-</sect4>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction à Expat</title>
 
-</sect2>
+    <para>Le paquet <application>Expat</application> contient une bibliothèque C orientée objet (stream)
+    pour parser du XML.</para>
 
-<sect2>
-<title>Installation de <application>expat</application></title>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Téléchargement (HTTP) : <ulink url="&expat-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Téléchargement (FTP) : <ulink url="&expat-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Somme de contrôle MD5 du téléchargement : &expat-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Taille du téléchargement : &expat-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation de l'espace disque requis : &expat-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation du temps de construction : &expat-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Installez <application>expat</application> en exécutant les commandes
-suivantes :</para>
+    <para condition="html" role="usernotes">Notes utilisateur :
+    <ulink url="&blfs-wiki;/expat"/></para>
 
-<screen><userinput><command>./configure --prefix=/usr &&
-make &&
-make install</command></userinput></screen>
+  </sect2>
 
-</sect2>
+  <sect2 role="installation">
+    <title>Installation d'Expat</title>
 
-<sect2>
-<title>Contenu</title>
+    <para>Installez <application>Expat</application> en lançant les commandes
+    suivantes :</para>
 
-<para>Le paquetage <application>expat</application> contient les bibliothèques
-<filename>libexpat</filename> et <command>xmlwf</command>.</para>
+<screen><userinput>./configure --prefix=/usr &&
+make</userinput></screen>
 
-</sect2>
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 
-<sect2><title>Description</title>
+<screen role="root"><userinput>make install &&
+install -v -m755 -d /usr/share/doc/expat-&expat-version; &&
+install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
 
-<sect3><title>xmlwf</title>
-<para><command>xmlwf</command> est un outil non validant pour vérifier si des
-documents <acronym>XML</acronym> sont bien formés.</para></sect3>
+    <para>Pour tester les résultats, lancez : <command>make check</command> en tant
+    qu'utilisateur non privilégié. Notez que vous devez faire cela après que le paquet a été
+    installé.</para>
 
-</sect2>
+  </sect2>
 
+  <sect2 role="content">
+    <title>Contenu</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Bibliothèque installée</segtitle>
+      <segtitle>Répertoire installé</segtitle>
+
+      <seglistitem>
+        <seg>xmlwf</seg>
+        <seg>libexpat.{so,a}</seg>
+        <seg>/usr/share/doc/expat-&expat-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xmlwf">
+        <term><command>xmlwf</command></term>
+        <listitem>
+          <para>est un outil de non validation pour vérifier si des documents
+          XML sont bien formatés ou pas.</para>
+          <indexterm zone="expat xmlwf">
+            <primary sortas="b-xmlwf">xmlwf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libexpat">
+        <term><filename class='libraryfile'>libexpat.{so,a}</filename></term>
+        <listitem>
+          <para>contient les fonctions API pour parser du XML.</para>
+          <indexterm zone="expat libexpat">
+            <primary sortas="c-libexpat">libexpat.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
 </sect1>

Modified: trunk/blfs/general/genlib/fam.xml
===================================================================
--- trunk/blfs/general/genlib/fam.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/general/genlib/fam.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,124 +1,183 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY fam-download-http "http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/fam-&fam-version;.tar.gz">
-<!ENTITY fam-download-ftp "ftp://oss.sgi.com/projects/fam/download/stable/fam-&fam-version;.tar.gz">
-<!ENTITY fam-md5sum "1bf3ae6c0c58d3201afc97c6a4834e39">
-<!ENTITY fam-size "320 KB">
-<!ENTITY fam-buildsize "6.9 MB">
-<!ENTITY fam-time "0.37 SBU">
+    <!-- Inserted as a reminder to do this. The mention of a test suite
+         is usually right before the root user installation commands. Please
+         delete these 12 (including one blank) lines after you are done.-->
+
+    <!-- Use one of the two mentions below about a test suite,
+         delete the line that is not applicable. Of course, if the
+         test suite uses syntax other than "make check", revise the
+         line to reflect the actual syntax to run the test suite -->
+
+    <!-- <para>Ce paquet n'est pas fourni avec une suite de tests.</para> -->
+    <!-- <para>Pour tester les résultats, lancez : <command>make check</command>.</para> -->
+
+  <!ENTITY fam-download-http "http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/fam-&fam-version;.tar.gz">
+  <!ENTITY fam-download-ftp "ftp://oss.sgi.com/projects/fam/download/stable/fam-&fam-version;.tar.gz">
+  <!ENTITY fam-md5sum "1bf3ae6c0c58d3201afc97c6a4834e39">
+  <!ENTITY fam-size "301 Kio">
+  <!ENTITY fam-buildsize "7.7 Mio">
+  <!ENTITY fam-time "0.26 SBU">
 ]>
 
 <sect1 id="fam" xreflabel="FAM-&fam-version;">
-<sect1info>
-<othername>$LastChangedBy: randy $</othername>
-<date>$Date: 2005-07-29 07:17:28 $</date>
-</sect1info>
-<?dbhtml filename="fam.html"?>
-<title>FAM-&fam-version;</title>
+  <?dbhtml filename="fam.html"?>
 
-<sect2>
-<title>Introduction à <application><acronym>FAM</acronym></application></title>
+  <sect1info>
+    <othername>$LastChangedBy: randy $</othername>
+    <date>$Date: 2007-04-04 21:42:53 +0200 (mer, 04 avr 2007) $</date>
+  </sect1info>
 
-<para>Le paquetage <application><acronym>FAM</acronym></application> contient
-un démon de surveillance de la modification de fichiers, très utile pour
-avertir les applications de modifications dans le système de fichiers.</para>
+  <title>FAM-&fam-version;</title>
 
-<sect3><title>Informations sur le paquetage</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Téléchargement (HTTP) : <ulink
-url="&fam-download-http;"/></para></listitem>
-<listitem><para>Téléchargement (FTP) : <ulink
-url="&fam-download-ftp;"/></para></listitem>
-<listitem><para>Téléchargement de la somme MD5 : &fam-md5sum;</para></listitem>
-<listitem><para>Taille du téléchargement :&fam-size;</para></listitem>
-<listitem><para>Estimation de l'espace disque requis :
-&fam-buildsize;</para></listitem>
-<listitem><para>Estimation du temps de construction :
-&fam-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="fam">
+    <primary sortas="a-FAM">FAM</primary>
+  </indexterm>
 
-<sect3><title>Téléchargements supplémentaires</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Dnotify patch (recommandé) : <ulink
-url="&patch-root;/fam-&fam-version;-dnotify-1.patch"/></para></listitem>
-</itemizedlist>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction à FAM</title>
 
-<sect3><title>Dépendances <application><acronym>FAM</acronym></application></title>
-<sect4><title>Requis</title>
-<para><xref linkend="portmap"/></para></sect4>
-</sect3>
+    <para>Le paquet <application>FAM</application> contient un moniteur de modifications de fichiers
+    (<foreignphrase>File Alteration Monitor</foreignphrase>) qui est utile pour notifier les applications de
+    modifications du système de fichiers.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Téléchargement (HTTP) : <ulink url="&fam-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Téléchargement (FTP) : <ulink url="&fam-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Somme de contrôle MD5 du téléchargement : &fam-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Taille du téléchargement : &fam-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation de l'espace disque requis : &fam-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation du temps de construction : &fam-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation de <application><acronym>FAM</acronym></application></title>
+    <bridgehead renderas="sect3">Téléchargements supplémentaires</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Correctif Dnotify (recommandé) :
+        <ulink url="&patch-root;/fam-&fam-version;-dnotify-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
 
-<para>Installez <application><acronym>FAM</acronym></application> en exécutant
-les commandes suivantes :</para>
+    <bridgehead renderas="sect3">FAM Dependencies</bridgehead>
 
-<screen><userinput><command>patch -Np1 -i ../fam-&fam-version;-dnotify-1.patch &&
-chmod 755 configure &&
+    <bridgehead renderas="sect4">Requises</bridgehead>
+    <para role="required"><xref linkend="portmap"/></para>
+
+    <para condition="html" role="usernotes">Notes utilisateur :
+    <ulink url="&blfs-wiki;/fam"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation de FAM</title>
+
+    <para>Installez <application>FAM</application> en lançant
+    les commandes suivantes :</para>
+
+<screen><userinput>patch -Np1 -i ../fam-&fam-version;-dnotify-1.patch &&
+chmod -v 755 configure &&
 autoreconf -f -i &&
 ./configure --prefix=/usr --sysconfdir=/etc &&
-make &&
-make install</command></userinput></screen>
+make</userinput></screen>
 
-</sect2>
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 
-<sect2>
-<title>Explications des commandes</title>
+<screen role="root"><userinput>make install</userinput></screen>
 
-<para><command>patch -Np1 -i ../fam-&fam-version;-dnotify-1.patch</command> : 
-Ce correctif active l'utilisation du mécanisme dnotify du noyau Linux par
-<application><acronym>FAM</acronym></application> pour informer le processus
-appelant des modifications de fichiers, plutôt que de demander la liste des
-modifications au système de fichiers à intervalle régulier.</para>
+  </sect2>
 
-<para><command>chmod 755 configure</command> : <command>configure</command>
-est configuré en lecture seule et <command>autoreconf</command> échouera si
-les droits ne sont pas modifiés.</para>
+  <sect2 role="commands">
+    <title>Explication des commandes</title>
 
-<para><command>autoreconf -f -i</command> : autotools doit reconstruire car
-le correctif dnotify affecte <filename>configure.ac</filename> et
-<filename>Makefile.am</filename>.</para>
+    <para><command>patch -Np1 -i ../fam-&fam-version;-dnotify-1.patch</command> :
+    Ce correctif permet à <application>FAM</application> d'utiliser
+    le mécanisme dnotify du noyau Linux pour informer le processus qui l'appelle des
+    modifications d'un fichier plutôt que de demander au système de fichiers ses
+    modifications.</para>
 
-</sect2>
+    <para><command>chmod -v 755 configure</command> : <command>configure</command> est
+    paramétré en lecture seule et <command>autoreconf</command> échouera si les droits ne sont pas
+    modifiés.</para>
 
-<sect2>
-<title>Configurer <application><acronym>FAM</acronym></application></title>
+    <para><command>autoreconf -f -i</command> : Autotools doit se reconstruire
+    car le correctif dnotify modifie <filename>configure.ac</filename> et
+    <filename>Makefile.am</filename>.</para>
 
-<sect3><title>Fichiers de configuration</title>
+  </sect2>
 
-<para><filename>/etc/rpc</filename>,
- <filename>/etc/fam.conf</filename>,
- <filename>/etc/inetd.conf</filename>,
- <filename>/etc/xinetd.d/fam</filename>
- ou <filename>/etc/xinetd.conf</filename>
- </para>
-</sect3>
+  <sect2 role="configuration">
+    <title>Configuration de FAM</title>
 
-<sect3><title>Informations de configuration</title>
+    <sect3 id='fam-config'>
+      <title>Fichiers de configuration</title>
 
-<para>Configurer FAM.</para>
+      <para><filename>/etc/rpc</filename>,
+      <filename>/etc/fam.conf</filename>,
+      <filename>/etc/inetd.conf</filename> or
+      <filename>/etc/xinetd.conf</filename> or
+      <filename>/etc/xinetd.d/fam</filename></para>
 
-<para>Si vous utilisez <application>inetd</application>, ajoutez l'entrée
-<application><acronym>FAM</acronym></application> à
-<filename>/etc/inetd.conf</filename> avec la commande suivante :</para>
+      <indexterm zone="fam fam-config">
+        <primary sortas="e-etc-rpc">/etc/rpc</primary>
+      </indexterm>
 
-<screen><userinput><command>echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/sbin/famd fam" \
-    >> /etc/inetd.conf</command></userinput></screen>
+      <indexterm zone="fam fam-config">
+        <primary sortas="e-etc-fam.conf">/etc/fam.conf</primary>
+      </indexterm>
 
-<para>Si vous utilisez <application>xinetd</application>, ajoutez une entrée à
-<filename>/etc/xinetd.conf</filename> avec la commande suivante (assurez-vous
-que le groupe "nogroup" existe) :</para>
+      <indexterm zone="fam fam-config">
+        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
+      </indexterm>
 
-<screen><userinput><command>cat >> /etc/xinetd.conf << "EOF"</command>
-    # description: FAM - file alteration monitor
+      <indexterm zone="fam fam-config">
+        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
+      </indexterm>
+
+      <indexterm zone="fam fam-config">
+        <primary sortas="e-etc-xinetd.d-sgi_fam">/etc/xinetd.d/sgi_fam</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Informations de configuration</title>
+
+      <para>Pour configurer le moniteur de modification de fichiers, effectuez les
+      instructions suivantes en tant qu'utilisateur <systemitem class='username'>root</systemitem>.</para>
+
+      <para>Si vous utilisez <command>inetd</command>, ajoutez l'entrée
+      <application>FAM</application> à
+      <filename>/etc/inetd.conf</filename> avec la commande suivante :</para>
+
+<screen role="root"><userinput>echo "sgi_fam/1-2 stream  rpc/tcp wait root /usr/sbin/famd fam" \
+    >> /etc/inetd.conf</userinput></screen>
+
+      <para>Si vous utilisez <command>xinetd</command>, la commande suivante va créer le
+      fichier <application>FAM</application> en tant que
+      <filename>/etc/xinetd.d/sgi_fam</filename> (assurez-vous que le groupe
+      <systemitem class="groupname">nogroup</systemitem> existe) :</para>
+
+<screen role="root"><userinput>cat >> /etc/xinetd.d/sgi_fam << "EOF"
+<literal># Début de /etc/xinetd.d/sgi_fam
+
+# description : FAM - file alteration monitor
     service sgi_fam
     {
         type            = RPC UNLISTED
@@ -131,38 +190,68 @@
         rpc_version     = 2
         rpc_number      = 391002
     }
-<command>EOF</command></userinput></screen>
 
-<para>Si vous n'avez pas installé un démon <command>inetd</command> et ne
-souhaitez pas en installer un, vous pouvez aussi démarrer
-<command>famd</command> lors du démarrage système en installant le script de
-démarrage <filename>/etc/rc.d/init.d/fam</filename> inclus dans le paquetage
-<xref linkend="intro-important-bootscripts"/>.</para>
+# Fin de /etc/xinetd.d/sgi_fam</literal>
+EOF</userinput></screen>
 
-<screen><userinput><command>make install-fam</command></userinput></screen>
+      <para id='fam-init'>Si vous n'avez pas installé de démon <command>inetd</command> et si
+      vous ne souhaitez pas en installer un, vous pouvez aussi démarrer
+      <command>famd</command> pendant l'amorçage du système en installant le script de démarrage
+      <filename>/etc/rc.d/init.d/fam</filename> inclu dans le paquet
+      <xref linkend="bootscripts"/>.</para>
 
-</sect3>
+<screen role="root"><userinput>make install-fam</userinput></screen>
 
-</sect2>
+      <indexterm zone="fam fam-init">
+        <primary sortas="f-fam">fam</primary>
+      </indexterm>
 
-<sect2>
-<title>Contenu</title>
+    </sect3>
 
-<para>Le paquetage <application><acronym>FAM</acronym></application> contient
-l'exécutable <command>famd</command> et les bibliothèques
-<filename>libfam</filename>.</para>
+  </sect2>
 
-</sect2>
+  <sect2 role="content">
+    <title>Contenu</title>
 
-<sect2><title>Description</title>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Bibliothèque installée</segtitle>
+      <segtitle>Répertoires installés</segtitle>
 
-<sect3><title>famd</title>
+      <seglistitem>
+        <seg>famd</seg>
+        <seg>libfam.{so,a}</seg>
+        <seg>Aucun</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para><command>famd</command> est le surveillant des modifications de fichiers.</para>
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect3>
+    <varlistentry id="famd">
+      <term><command>famd</command></term>
+      <listitem>
+        <para>est le démon du moniteur de modifications de fichiers.</para>
+        <indexterm zone="fam famd">
+          <primary sortas="b-famd">famd</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
 
-</sect2>
+    <varlistentry id="libfam">
+      <term><filename class='libraryfile'>libfam.{so,a}</filename></term>
+      <listitem>
+        <para>contient les fonctions qui supportent le moniteur d'affectation de fichiers.</para>
+        <indexterm zone="fam libfam">
+          <primary sortas="c-libfam">libfam.{so,a}</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
 
+    </variablelist>
+
+  </sect2>
+
 </sect1>
-

Modified: trunk/blfs/general/genlib/gamin.xml
===================================================================
--- trunk/blfs/general/genlib/gamin.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/general/genlib/gamin.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,9 +6,9 @@
 
   <!ENTITY gamin-download-http "http://www.gnome.org/~veillard/gamin/sources/gamin-&gamin-version;.tar.gz">
   <!ENTITY gamin-download-ftp  "&gentoo-ftp-repo;/gamin-&gamin-version;.tar.gz">
-  <!ENTITY gamin-md5sum        "2d3a6a70df090ed923238e381e6c2982">
-  <!ENTITY gamin-size          "632 KB">
-  <!ENTITY gamin-buildsize     "6 MB">
+  <!ENTITY gamin-md5sum        "b4ec549e57da470c04edd5ec2876a028">
+  <!ENTITY gamin-size          "639 Kio">
+  <!ENTITY gamin-buildsize     "6.7 Mio">
   <!ENTITY gamin-time          "0.1 SBU (up to 3 minutes, processor independent, to run the test suite)">
 ]>
 
@@ -16,75 +16,79 @@
   <?dbhtml filename="gamin.html"?>
 
   <sect1info>
-    <othername>$LastChangedBy: dj $</othername>
-    <date>$Date: 2008-11-16 21:28:00 $</date>
+    <othername>$LastChangedBy: ken $</othername>
+    <date>$Date: 2009-03-26 19:48:23 +0100 (jeu 26 mar 2009) $</date>
   </sect1info>
 
   <title>Gamin-&gamin-version;</title>
 
+  <indexterm zone="gamin">
+    <primary sortas="a-Gamin">Gamin</primary>
+  </indexterm>
+
   <sect2 role="package">
-    <title>Introduction to Gamin</title>
+    <title>Introduction à Gamin</title>
 
-    <para>The <application>Gamin</application> package contains a
-    File Alteration Monitor which is useful for notifying applications of
-    changes to the file system. Gamin is compatible with <ulink
+    <para>Le paquet <application>Gamin</application> contient un moniteur de modifications de fichiers
+    (<foreignphrase>File Alteration Monitor</foreignphrase>) qui est utile pour notifier les applications de
+    modifications du système de fichiers. Gamin est compatible avec <ulink
     url="http://oss.sgi.com/projects/fam/">FAM</ulink>.</para>
 
-    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gamin-download-http;"/></para>
+        <para>Téléchargement (HTTP) : <ulink url="&gamin-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gamin-download-ftp;"/></para>
+        <para>Téléchargement (FTP) : <ulink url="&gamin-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &gamin-md5sum;</para>
+        <para>Somme de contrôle MD5 du téléchargement : &gamin-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &gamin-size;</para>
+        <para>Taille du téléchargement : &gamin-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &gamin-buildsize;</para>
+        <para>Estimation de l'espace disque requis : &gamin-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &gamin-time;</para>
+        <para>Estimation du temps de construction : &gamin-time;</para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Gamin Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
+    <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required"><xref linkend="glib2"/></para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
+    <bridgehead renderas="sect4">Facultatives</bridgehead>
     <para role="optional"><xref linkend="python"/></para>
 
     <!-- Though configure mentions these two packages, the build
-         system can and does absolutely nothing with them. Commenting
+         system can et does absolutely nothing with them. Commenting
          them out for now, as they cannot be used
     <xref linkend="gtk-doc"/> (for building API documentation),
     <xref linkend="doxygen"/> (for building documentation),
     -->
 
-    <para condition="html" role="usernotes">User Notes:
+    <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/gamin"/></para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Gamin</title>
+    <title>Installation de Gamin</title>
 
-    <para>Install <application>Gamin</application> by running the
-    following commands:</para>
+    <para>Installez <application>Gamin</application> en lançant les
+    commandes suivantes :</para>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note
-    that some tests may display errors.</para>
+    <para>Pour tester les résultats, lancez : <command>make check</command>. Notez qu'il
+    se peut que certains tests affichent des erreurs.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 
 <screen role="root"><userinput>make install &&
 install -v -m755 -d /usr/share/doc/gamin-&gamin-version; &&
@@ -92,48 +96,56 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Explication des commandes</title>
+
+    <para><option>--disable-static</option> : Ce paramètre empêche la plupart
+    des bibliothèques statiques de se construire.</para>
+
+  </sect2>
+
   <sect2 role="configuration">
-    <title>Configuring Gamin</title>
+    <title>Configuration de Gamin</title>
 
     <sect3>
-      <title>Configuration Information</title>
+      <title>Informations de configuration</title>
 
-      <para>No configuration is generally required and the default options
-      should work for most users. See
-      <ulink url="http://www.gnome.org/~veillard/gamin/config.html"/> for
-      details.</para>
+      <para>Aucune configuration n'est généralement nécessaire et les options par défaut
+      devraient fonctionner pour la plupart des utilisateurs. Voir 
+      <ulink url="http://www.gnome.org/~veillard/gamin/config.html"/> pour des
+      détails.</para>
 
     </sect3>
 
   </sect2>
 
   <sect2 role="content">
-    <title>Contents</title>
+    <title>Contenu</title>
 
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoire installé</segtitle>
 
       <seglistitem>
         <seg>gam_server</seg>
-        <seg>libfam.{so,a}, libgamin-1.{so,a}, libgamin_shared.a and
-        optionally, <application>Python</application> _gamin.{so,a}
+        <seg>libfam.{so,a}, libgamin-1.{so,a}, libgamin_shared.a et
+        éventuellement, <application>Python</application> _gamin.{so,a}
         module</seg>
         <seg>/usr/share/doc/gamin-&gamin-version;</seg>
       </seglistitem>
     </segmentedlist>
 
     <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
     <varlistentry id="gam_server">
       <term><command>gam_server</command></term>
       <listitem>
-        <para>is the file alteration monitor daemon that is started on demand
-        for each user.</para>
+        <para>est le démon du moniteur de modifications de fichiers qui se démarre à la
+        demande de chaque utilisateur.</para>
         <indexterm zone="gamin gam_server">
           <primary sortas="b-gam_server">gam_server</primary>
         </indexterm>
@@ -143,7 +155,7 @@
     <varlistentry id="libgamin">
       <term><filename class='libraryfile'>libgamin.{so,a}</filename></term>
       <listitem>
-        <para>contains functions that support the file allocation monitor.</para>
+        <para>contient les fonctions qui supportent le moniteur d'affectation de fichiers.</para>
         <indexterm zone="gamin libgamin">
           <primary sortas="c-libgamin">libgamin.{so,a}</primary>
         </indexterm>
@@ -153,7 +165,7 @@
     <varlistentry id="libfam">
       <term><filename class='libraryfile'>libfam.{so,a}</filename></term>
       <listitem>
-        <para>contains functions that provide compatibility with FAM.</para>
+        <para>contient les fonctions qui fournissent la compatibilité avec FAM.</para>
         <indexterm zone="gamin libfam">
           <primary sortas="c-libfam">libfam.{so,a}</primary>
         </indexterm>

Modified: trunk/blfs/general/genlib/gdbm.xml
===================================================================
--- trunk/blfs/general/genlib/gdbm.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/general/genlib/gdbm.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,99 +1,137 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY gdbm-download-http "http://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-download-ftp "ftp://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-md5sum "1d1b1d5c0245b1c00aff92da751e9aa1">
-<!ENTITY gdbm-size "223 KB">
-<!ENTITY gdbm-buildsize "4.1 MB">
-<!ENTITY gdbm-time "0.08 SBU">
+  <!ENTITY gdbm-download-http "http://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
+  <!ENTITY gdbm-download-ftp "ftp://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
+  <!ENTITY gdbm-md5sum "1d1b1d5c0245b1c00aff92da751e9aa1">
+  <!ENTITY gdbm-size "223 Kio">
+  <!ENTITY gdbm-buildsize "2.75 Mio">
+  <!ENTITY gdbm-time "0.08 SBU">
 ]>
 
 <sect1 id="gdbm" xreflabel="GDBM-&gdbm-version;">
-<sect1info>
-<othername>$LastChangedBy: randy $</othername>
-<date>$Date: 2005-07-29 07:17:28 $</date>
-</sect1info>
-<?dbhtml filename="gdbm.html"?>
-<title>GDBM-&gdbm-version;</title>
+  <?dbhtml filename="gdbm.html"?>
 
-<sect2>
-<title>Introduction à 
-<application><acronym>GDBM</acronym></application></title>
+  <sect1info>
+    <othername>$LastChangedBy: randy $</othername>
+    <date>$Date: 2007-04-04 21:42:53 +0200 (mer, 04 avr 2007) $</date>
+  </sect1info>
 
-<para>Le paquetage <application><acronym>GDBM</acronym></application> contient
-le gestionnaire de bases de données <acronym>GNU</acronym>. C'est une base de
-données au format fichier, stockant des paires clé/donné dans des fichiers
-autonomes. La donnée réelle de tout enregistrement en cours de stockage est
-indexée par une clé unique, permettant de la récupérer en moins de temps que
-si elle n'avait été stockée dans un fichier texte.</para>
+  <title>GDBM-&gdbm-version;</title>
 
-<sect3><title>Informations sur le paquetage</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Téléchargement (HTTP) : <ulink
-url="&gdbm-download-http;"/></para></listitem>
-<listitem><para>Téléchargement (FTP) : <ulink
-url="&gdbm-download-ftp;"/></para></listitem>
-<listitem><para>Téléchargement de la somme MD5 : &gdbm-md5sum;</para></listitem>
-<listitem><para>Taille du téléchargement :&gdbm-size;</para></listitem>
-<listitem><para>Estimation de l'espace disque requis :
-&gdbm-buildsize;</para></listitem>
-<listitem><para>Estimation du temps de construction :
-&gdbm-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gdbm">
+    <primary sortas="a-GDBM">GDBM</primary>
+  </indexterm>
 
-</sect2>
+  <sect2 role="package">
+    <title>Introduction à GDBM</title>
 
-<sect2>
-<title>Installation de
-<application><acronym>GDBM</acronym></application></title>
+    <para>Le paquet <application>GDBM</application> contient le gestionnaire de bases de données GNU
+    (<foreignphrase>GNU Database Manager</foreignphrase>). C'est une base de données de formats des fichiers du disque
+    qui stocke les clés/paires de données dans des fichiers uniques. Les données courantes de
+    n'importe quel enregistrement stocké sont indexées sous une clé unique,
+    qui peut être récupérée en moins de temps que si elles étaient stockées
+    dans un fichier texte.</para>
 
-<para>Installez <application><acronym>GDBM</acronym></application> en exécutant
-les commandes suivantes :</para>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Téléchargement (HTTP) : <ulink url="&gdbm-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Téléchargement (FTP) : <ulink url="&gdbm-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Somme de contrôle MD5 du téléchargement : &gdbm-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Taille du téléchargement : &gdbm-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation de l'espace disque requis : &gdbm-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation du temps de construction : &gdbm-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>./configure --prefix=/usr &&
-make &&
-make BINOWN=root BINGRP=root install</command></userinput></screen>
+    <para condition="html" role="usernotes">Notes utilisateur :
+    <ulink url="&blfs-wiki;/gdbm"/></para>
 
-<para>De plus, vous pourriez avoir besoin d'installer les en-têtes de
-compatibilité pour <application>DBM</application> et
-<application>NDBM</application> car certaines applications recherchent ces
-anciennes routines.</para>
+  </sect2>
 
-<screen><userinput><command>make BINOWN=root BINGRP=root install-compat</command></userinput></screen>
+  <sect2 role="installation">
+    <title>Installation de GDBM</title>
 
-</sect2>
+    <para>Installez <application>GDBM</application> en lançant
+    les commandes suivantes :</para>
 
-<sect2>
-<title>Explications des commandes</title>
+<screen><userinput>./configure --prefix=/usr &&
+make</userinput></screen>
 
-<para><command>make BINOWN=root BINGRP=root install</command> : cette
-commande surcharge les variables <varname>BINOWN</varname> et
-<varname>BINGRP</varname> dans le <filename>Makefile</filename> pour modifier
-le propriétaire des fichiers installés par root au lieu de bin.</para>
+    <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
 
-</sect2>
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 
-<sect2>
-<title>Contenu</title>
+<screen role="root"><userinput>make BINOWN=root BINGRP=root install</userinput></screen>
 
-<para>Le paquetage <application><acronym>GDBM</acronym></application> contient
-les bibliothèques <filename class="libraryfile">libgdbm</filename>.</para>
+    <para>En outre, il se peut que vous ayez besoin d'installer les en-têtes et la bibliothèque de compatibilité
+    avec <application>DBM</application>
+    et <application>NDBM</application> car certaines 
+    applications cherchent ces anciennes routines dbm.</para>
 
-</sect2>
+<screen role="root"><userinput>make BINOWN=root BINGRP=root install-compat</userinput></screen>
 
-<sect2><title>Description</title>
+  </sect2>
 
-<sect3><title>Bibliothèques gdbm</title>
-<para>Les bibliothèques <filename class="libraryfile">libgdbm</filename>
-contiennent des fonctions réalisant des opérations de routine en utilisant
-un hachage qu'il est possible d'étendre.</para>
-</sect3>
+  <sect2 role="commands">
+    <title>Explication des commandes</title>
 
-</sect2>
+    <para><command>make BINOWN=root BINGRP=root install</command> : Cette
+    commande écrase les variables <varname>BINOWN</varname> et
+    <varname>BINGRP</varname> dans <filename>Makefile</filename> en donnant à
+    <systemitem class='username'>root</systemitem> plutôt qu'à
+    l'utilisateur <systemitem class='username'>bin</systemitem> la propriété des
+    fichiers installés.</para>
 
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contenu</title>
+
+    <segmentedlist>
+      <segtitle>Programmes installés</segtitle>
+      <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoires installés</segtitle>
+
+      <seglistitem>
+        <seg>Aucun</seg>
+        <seg>libgdbm.{so,a} et libgdbm_compat.{so,a}</seg>
+        <seg>Aucun</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgdbm">
+        <term><filename class='libraryfile'>libgdbm.{so,a}</filename></term>
+        <listitem>
+          <para>contient les fonctions pour manipuler une base de données hachée.</para>
+          <indexterm zone="gdbm libgdbm">
+            <primary sortas="c-libgdbm">libgdbm.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
 </sect1>
 

Modified: trunk/blfs/general/genlib/genlib.xml
===================================================================
--- trunk/blfs/general/genlib/genlib.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/general/genlib/genlib.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,67 +1,91 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
  <!ENTITY % general-entities SYSTEM "../../general.ent">
  %general-entities;
-]> 
+]>
 
+<!--
+$LastChangedBy: wblaszcz $
+$Date: 2009-07-23 13:20:10 +0200 (jeu 23 jui 2009) $
+-->
+
 <chapter id="general-genlib">
-<?dbhtml filename="genlib.html"?>
-<title>Bibliothèques générales</title>
+  <?dbhtml filename="genlib.html"?>
 
-<para>Les bibliothèques contiennent du code souvent requis par plus d'un
-programme. Ceci a l'avantage que chaque programme n'a pas besoin de dupliquer
-du code (et donc de risquer d'introduire des bogues), il doit seulement
-appeler les fonctions des bibliothèques installées sur le système. L'exemple le
-plus évident de bibliothèque est <application>Glibc</application> qui est
-installé avec le livre <acronym>LFS</acronym>. Elle contient toutes les
-fonctions de la bibliothèque C que les programmes utilisent.</para>
+  <title>Bibliothèques générales</title>
 
-<para>Il existe deux types de bibliothèques : statique et partagée. Les
-bibliothèques partagées (habituellement <filename>libXXX.so</filename>) sont
-chargées en mémoire à partir de la copie partagée lors de l'exécution (d'où son
-nom). Les bibliothèques statiques (<filename>libXXX.a</filename>) sont réellement
-liées dans l'exécutable lui-même, rendant ainsi le programme plus gros. Assez
-souvent, vous trouverez les copies statiques et partagées de la même bibliothèque
-sur votre système.</para>
+  <para>Les bibliothèques contiennent du code qui est souvent exigé par un
+  ou plusieurs programmes. Ceci a l'avantage que chaque programme n'a pas besoin de dupliquer du code (risquant
+  d'introduire des bogues), il n'a qu'à appeler des fonctions de la bibliothèque installée sur
+  le szstème. L'exemple le plus parlant d'un ensemble de bibliothèques est 
+  <application>Glibc</application> qui est 
+  installée dans le livre LFS. Elle contient toutes les fonctions de la bibliothèque
+  <application>C</application> utilisées par les programmes.</para>
 
-<para>Habituellement, vous avez seulement besoin d'installer les bibliothèques
-quand vous installez des logiciels qui ont besoin des fonctionnalités qu'elles
-apportent. Dans le livre <acronym>BLFS</acronym>, chaque paquetage est présenté
-avec une liste des dépendances connues. Du coup, vous pouvez savoir de quelles
-bibliothèques vous aurez besoin avant d'installer ce programme. Si vous installez
-quelque chose sans utiliser les instructions de <acronym>BLFS</acronym>, les
-fichiers <filename>README</filename> ou <filename>INSTALL</filename> contiendront
-habituellement les détails des prérequis du programme.</para>
+  <para>Il y a deux types de bibliothèques : celles statiques et celles partagées.
+  Les bibliothèques partagées (en général <filename>libXXX.so</filename>) sont chargées en mémoire à partir d'une copie
+  partagée au moment de l'exécution (d'où leur nom). Les bibliothèques statiques
+  (<filename>libXXX.a</filename>) sont liées en définitive au fichier exécutable du programme
+  lui-même, rendant ainsi le fichier du programme plus gros. Le plus souvent,
+  vous trouverez à la fois des copies statiques et partagées de la Même bibliothèque
+  sur votre szstème.</para>
 
-<para>Certaines bibliothèques seront nécessaires à <emphasis>tout le
-monde</emphasis>. Dans ce chapitre, nous les listons, avec d'autres, et
-expliquons pourquoi vous pourriez vouloir les installer.</para>
+  <para>En général, vous n'avez besoin d'installer des bibliothèques que lorsque vous
+  installez un logiciel qui a besoin de la fonctionnalité qu'elle fournit. Dans
+  le livre BLFS, chaque paquet est présenté avec une liste de dépendances
+  (connues). Ainsi, vous pouvez savoir de quelles bibliothèques vous avez besoin
+  d'avoir avant l'installation de tel programme. Si vous installez quelque chose
+  sans utilisez les instructions de BLFS, le fichier <filename>README</filename> ou
+  <filename>INSTALL</filename> contiendra généralement les détails
+  des prérequis du programme.</para>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pcre.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="popt.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slang.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fam.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxml.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxml2.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxslt.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdbm.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib2.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libidl.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libcroco.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgsf.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libglade.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expat.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libesmtp.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aspell.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ispell.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slib.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gwrap.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lzo.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libpcap.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libusb.xml"/>
+  <para>Il y a des bibliothèques dont presque <emphasis>tout le monde</emphasis> aura besoin
+  à un moment ou un autre. Dans ce chapitre, nous listons celles-ci ainsi que d'autres
+  et nous expliquons pourquoi il se peut que vous vouliez les installer.</para>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pcre.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="popt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slang.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gamin.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxml2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxslt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgtkhtml.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdbm.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libidl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libcroco.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgsf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libglade.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libesmtp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aspell.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gwrap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lzo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libusb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libusb-compat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iso-codes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libidn.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdrm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dbus-bindings.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libpthread-stubs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pth.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libassuan.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgpg-error.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgcrypt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libksba.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mowgli.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mcs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtasn1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libunique.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="liboil.xml"/>
+
+  <!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxml.xml"/> -->
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ispell.xml"/> -->
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fam.xml"/> -->
+
 </chapter>

Modified: trunk/blfs/stylesheets/blfs-chunked.xsl
===================================================================
--- trunk/blfs/stylesheets/blfs-chunked.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/blfs-chunked.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 13:59:04 $
+$Date: 2007-07-07 12:24:03 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/blfs-nochunks.xsl
===================================================================
--- trunk/blfs/stylesheets/blfs-nochunks.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/blfs-nochunks.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 13:59:04 $
+$Date: 2007-07-07 12:24:03 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/blfs-pdf.xsl
===================================================================
--- trunk/blfs/stylesheets/blfs-pdf.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/blfs-pdf.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 13:59:04 $
+$Date: 2007-07-07 12:24:03 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/dump-commands.xsl
===================================================================
--- trunk/blfs/stylesheets/dump-commands.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/dump-commands.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,7 +6,7 @@
 
 <!--
 $LastChangedBy: randy $
-$Date: 2008-08-30 13:59:04 $
+$Date: 2007-01-18 20:38:19 +0100 (jeu, 18 jan 2007) $
 -->
 
 <!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
@@ -42,7 +42,7 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-      <!-- Creating dirs and files -->
+      <!-- Creating dirs et files -->
     <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
       <xsl:apply-templates select=".//screen"/>
     </exsl:document>

Modified: trunk/blfs/stylesheets/lfs-xsl/chunk-master.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/chunk-master.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/chunk-master.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/lfs-xsl/chunk-slave.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/chunk-slave.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/chunk-slave.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -10,7 +10,7 @@
                 version="1.0">
 
    <!-- Second level chunked output template.
-        Sets global params and include customized elements templates. -->
+        Sets global params et include customized elements templates. -->
 
     <!-- Upstream XHTML presentation templates -->
   <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
@@ -45,7 +45,7 @@
     <!-- No XML declaration -->
   <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
 
-    <!-- Control generation of ToCs and LoTs -->
+    <!-- Control generation of ToCs et LoTs -->
   <xsl:param name="generate.toc">
     book      toc,title
     preface   toc

Modified: trunk/blfs/stylesheets/lfs-xsl/chunkfast.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/chunkfast.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/chunkfast.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -31,7 +31,7 @@
 
   <xsl:template name="process-chunk-element">
     <xsl:choose>
-      <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
+      <xsl:when test="$chunk.fast != 0 et function-available('exsl:node-set')">
         <xsl:variable name="genid" select="generate-id()"/>
 
         <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
@@ -43,7 +43,7 @@
         <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
 
         <xsl:choose>
-          <xsl:when test="$onechunk != 0 and parent::*">
+          <xsl:when test="$onechunk != 0 et parent::*">
             <xsl:apply-imports/>
           </xsl:when>
           <xsl:otherwise>
@@ -56,7 +56,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:choose>
-          <xsl:when test="$onechunk != 0 and not(parent::*)">
+          <xsl:when test="$onechunk != 0 et not(parent::*)">
             <xsl:call-template name="chunk-all-sections"/>
           </xsl:when>
           <xsl:when test="$onechunk != 0">

Modified: trunk/blfs/stylesheets/lfs-xsl/common.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/common.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/common.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,14 +2,14 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
-  <!-- This stylesheet contains common params and templates for all outputs. -->
+  <!-- This stylesheet contains common params et templates for all outputs. -->
 
     <!-- This file contains our localization strings (for internationalization) -->
   <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
@@ -25,7 +25,7 @@
 
     <!-- The Index title:
            We create this param to can have gentext support in both
-           the Index page title and links that point to the Index page.
+           the Index page title et links that point to the Index page.
            It also allow us to change the title, if wanted.
            Note: To change the title involves creating the appropiate
            entries in lfs-l10n.xml -->
@@ -41,7 +41,7 @@
   </xsl:template>
 
     <!-- indexterm:
-           Dropping unneeded anchors and fo:wraper elemments. -->
+           Dropping unneeded anchors et fo:wraper elemments. -->
     <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
   <xsl:template match="indexterm"/>
 
@@ -67,7 +67,7 @@
     </xsl:variable>
     <xsl:variable name="component.label">
       <xsl:if test="$section.label.includes.component.label != 0
-                    and $parent.is.component != 0">
+                    et $parent.is.component != 0">
         <xsl:variable name="parent.label">
           <xsl:apply-templates select=".." mode="label.markup"/>
         </xsl:variable>
@@ -98,7 +98,7 @@
     <!-- sect2 label.markup:
            Skip numeration for sect2 with empty title. -->
     <!-- The original template is in {docbook-xsl}/common/labels.xsl
-         It match also sect3, sect4, and sect5, that are unchanged. -->
+         It match also sect3, sect4, et sect5, that are unchanged. -->
   <xsl:template match="sect2" mode="label.markup">
       <!-- label the parent -->
       <xsl:variable name="parent.section.label">
@@ -140,7 +140,7 @@
       <xsl:call-template name="label.this.section"/>
     </xsl:variable>
     <xsl:choose>
-      <xsl:when test="$is.numbered != 0 and not(ancestor::preface/sect1)">
+      <xsl:when test="$is.numbered != 0 et not(ancestor::preface/sect1)">
         <xsl:call-template name="gentext.template">
           <xsl:with-param name="context" select="'title-numbered'"/>
           <xsl:with-param name="name">
@@ -193,12 +193,12 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <xsl:if test="$template = '' and $verbose != 0">
+    <xsl:if test="$template = '' et $verbose != 0">
       <xsl:message>
         <xsl:text>object.xref.markup: empty xref template</xsl:text>
         <xsl:text> for linkend="</xsl:text>
         <xsl:value-of select="@id|@xml:id"/>
-        <xsl:text>" and @xrefstyle="</xsl:text>
+        <xsl:text>" et @xrefstyle="</xsl:text>
         <xsl:value-of select="$xrefstyle"/>
         <xsl:text>"</xsl:text>
       </xsl:message>
@@ -438,7 +438,7 @@
             <xsl:value-of select="$total"/>
             <xsl:text>  KB</xsl:text>
           </xsl:when>
-          <xsl:when test="$total > '1000' and $total < '5000'">
+          <xsl:when test="$total > '1000' et $total < '5000'">
             <xsl:value-of select="substring($total,1,1)"/>
             <xsl:text>,</xsl:text>
             <xsl:value-of select="substring($total,2)"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,15 +6,15 @@
 Copyright (C) 2005-2007 The DocBook Project
 
 Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
+obtaining a copy of this software et associated documentation
 files (the ``Software''), to deal in the Software without
 restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the
+copy, modify, merge, publish, distribute, sublicense, et/or
+sell copies of the Software, et to permit persons to whom the
 Software is furnished to do so, subject to the following
 conditions:
 
-The above copyright notice and this permission notice shall be
+The above copyright notice et this permission notice shall be
 included in all copies or substantial portions of the Software.
 
 Except as contained in this notice, the names of individuals
@@ -24,9 +24,9 @@
 from the individuals in question.
 
 Any stylesheet derived from this Software that is publically
-distributed will be identified with a different name and the
+distributed will be identified with a different name et the
 version strings in any derived Software will be changed so that
-no possibility of confusion between the derived package and this
+no possibility of confusion between the derived package et this
 Software will exist.
 
 Warranty
@@ -43,5 +43,5 @@
 Contacting the Author
 ---------------------
 The DocBook XSL stylesheets are maintained by Norman Walsh,
-<ndw at nwalsh.com>, and members of the DocBook Project,
+<ndw at nwalsh.com> et members of the DocBook Project,
 <docbook-developers at sf.net>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION	2009-10-11 23:50:31 UTC (rev 1007)
@@ -18,7 +18,7 @@
 <xsl:param name="DistroName">docbook-xsl</xsl:param>
 <xsl:param name="PreviousRelease">1.72.0</xsl:param>
 <xsl:param name="PreviousReleaseRevision">6549</xsl:param>
-<xsl:param name="Revision">$Revision: 1.1 $</xsl:param>
+<xsl:param name="Revision">$Revision: 7105 $</xsl:param>
 <xsl:param name="VersionFileURL">$URL: https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl/VERSION $</xsl:param>
 
 <xsl:strip-space elements="fm:*"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -7,12 +7,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: common.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: common.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -20,7 +20,7 @@
   <info>
     <title>Common » Base Template Reference</title>
     <releaseinfo role="meta">
-      $Id: common.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+      $Id: common.xsl 7431 2008-05-09 13:00:42Z randy $
     </releaseinfo>
   </info>
   <!-- * yes, partintro is a valid child of a reference... -->
@@ -86,7 +86,7 @@
 
 <refdescription id="is.component-desc">
 <para>This template returns '1' if the specified node is a component
-(Chapter, Appendix, etc.), and '0' otherwise.</para>
+(Chapter, Appendix, etc.), et '0' otherwise.</para>
 </refdescription>
 
 <refparameter id="is.component-params">
@@ -101,7 +101,7 @@
 
 <refreturn id="is.component-returns">
 <para>This template returns '1' if the specified node is a component
-(Chapter, Appendix, etc.), and '0' otherwise.</para>
+(Chapter, Appendix, etc.), et '0' otherwise.</para>
 </refreturn>
 </doc:template>
 
@@ -126,7 +126,7 @@
 
 <refdescription id="is.section-desc">
 <para>This template returns '1' if the specified node is a section
-(Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
+(Section, Sect1, Sect2, etc.), et '0' otherwise.</para>
 </refdescription>
 
 <refparameter id="is.section-params">
@@ -141,7 +141,7 @@
 
 <refreturn id="is.section-returns">
 <para>This template returns '1' if the specified node is a section
-(Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
+(Section, Sect1, Sect2, etc.), et '0' otherwise.</para>
 </refreturn>
 </doc:template>
 
@@ -406,7 +406,7 @@
       <xsl:value-of select="$label"/>
     </xsl:when>
     <xsl:when test="$deflabel = 'number'
-                    and local-name(.) = 'question'">
+                    et local-name(.) = 'question'">
       <xsl:apply-templates select="ancestor::qandaset[1]"
                            mode="number"/>
       <xsl:choose>
@@ -501,7 +501,7 @@
     <xsl:otherwise>
       <xsl:choose>
         <!-- Handle case when personname contains only general markup (DocBook 5.0) -->
-        <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)">
+        <xsl:when test="$node/self::personname et not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)">
           <xsl:apply-templates select="$node/node()"/>
         </xsl:when>
         <xsl:when test="$style = 'family-given'">
@@ -528,10 +528,10 @@
   <xsl:param name="node" select="."/>
 
   <!-- The family-given style applies a convention for identifying given -->
-  <!-- and family names in locales where it may be ambiguous -->
+  <!-- et family names in locales where it may be ambiguous -->
   <xsl:apply-templates select="$node//surname[1]"/>
 
-  <xsl:if test="$node//surname and $node//firstname">
+  <xsl:if test="$node//surname et $node//firstname">
     <xsl:text> </xsl:text>
   </xsl:if>
 
@@ -545,7 +545,7 @@
 
   <xsl:apply-templates select="$node//surname[1]"/>
 
-  <xsl:if test="$node//surname and $node//firstname">
+  <xsl:if test="$node//surname et $node//firstname">
     <xsl:text>, </xsl:text>
   </xsl:if>
 
@@ -567,7 +567,7 @@
     <xsl:apply-templates select="$node//firstname[1]"/>
   </xsl:if>
 
-  <xsl:if test="$node//othername and $author.othername.in.middle != 0">
+  <xsl:if test="$node//othername et $author.othername.in.middle != 0">
     <xsl:if test="$node//honorific or $node//firstname">
       <xsl:text> </xsl:text>
     </xsl:if>
@@ -576,7 +576,7 @@
 
   <xsl:if test="$node//surname">
     <xsl:if test="$node//honorific or $node//firstname
-                  or ($node//othername and $author.othername.in.middle != 0)">
+                  or ($node//othername et $author.othername.in.middle != 0)">
       <xsl:text> </xsl:text>
     </xsl:if>
     <xsl:apply-templates select="$node//surname[1]"/>
@@ -591,13 +591,13 @@
 <xsl:template name="person.name.list">
   <!-- Return a formatted string representation of the contents of
        the current element. The current element must contain one or
-       more AUTHORs, CORPAUTHORs, OTHERCREDITs, and/or EDITORs.
+       more AUTHORs, CORPAUTHORs, OTHERCREDITs, et/or EDITORs.
 
        John Doe
      or
-       John Doe and Jane Doe
+       John Doe et Jane Doe
      or
-       John Doe, Jane Doe, and A. Nonymous
+       John Doe, Jane Doe, et A. Nonymous
   -->
   <xsl:param name="person.list"
              select="author|corpauthor|othercredit|editor"/>
@@ -612,13 +612,13 @@
       </xsl:call-template>
 
       <xsl:choose>
-        <xsl:when test="$person.count = 2 and $count = 1">
+        <xsl:when test="$person.count = 2 et $count = 1">
           <xsl:call-template name="gentext.template">
             <xsl:with-param name="context" select="'authorgroup'"/>
             <xsl:with-param name="name" select="'sep2'"/>
           </xsl:call-template>
         </xsl:when>
-        <xsl:when test="$person.count > 2 and $count+1 = $person.count">
+        <xsl:when test="$person.count > 2 et $count+1 = $person.count">
           <xsl:call-template name="gentext.template">
             <xsl:with-param name="context" select="'authorgroup'"/>
             <xsl:with-param name="name" select="'seplast'"/>
@@ -760,7 +760,7 @@
 <!-- ====================================================================== -->
 
 <xsl:template name="filename-basename">
-  <!-- We assume all filenames are really URIs and use "/" -->
+  <!-- We assume all filenames are really URIs et use "/" -->
   <xsl:param name="filename"></xsl:param>
   <xsl:param name="recurse" select="false()"/>
 
@@ -814,11 +814,11 @@
 <!-- ====================================================================== -->
 
 <doc:template name="select.mediaobject" xmlns="">
-<refpurpose>Selects and processes an appropriate media object from a list</refpurpose>
+<refpurpose>Selects et processes an appropriate media object from a list</refpurpose>
 
 <refdescription id="select.mediaobject-desc">
 <para>This template takes a list of media objects (usually the
-children of a mediaobject or inlinemediaobject) and processes
+children of a mediaobject or inlinemediaobject) et processes
 the "right" object.</para>
 
 <para>This template relies on a template named
@@ -867,7 +867,7 @@
 
 <refdescription id="select.mediaobject.index-desc">
 <para>This template takes a list of media objects (usually the
-children of a mediaobject or inlinemediaobject) and determines
+children of a mediaobject or inlinemediaobject) et determines
 the "right" object. It returns the position of that object
 to be used by the calling template.</para>
 
@@ -915,12 +915,12 @@
   <xsl:choose>
     <!-- Test for objects preferred by role -->
     <xsl:when test="$use.role.for.mediaobject != 0
-               and $preferred.mediaobject.role != ''
-               and $olist[@role = $preferred.mediaobject.role]">
+               et $preferred.mediaobject.role != ''
+               et $olist[@role = $preferred.mediaobject.role]">
 
       <!-- Get the first hit's position index -->
       <xsl:for-each select="$olist">
-        <xsl:if test="@role = $preferred.mediaobject.role and
+        <xsl:if test="@role = $preferred.mediaobject.role et
              not(preceding-sibling::*[@role = $preferred.mediaobject.role])">
           <xsl:value-of select="position()"/>
         </xsl:if>
@@ -928,10 +928,10 @@
     </xsl:when>
 
     <xsl:when test="$use.role.for.mediaobject != 0
-               and $olist[@role = $stylesheet.result.type]">
+               et $olist[@role = $stylesheet.result.type]">
       <!-- Get the first hit's position index -->
       <xsl:for-each select="$olist">
-        <xsl:if test="@role = $stylesheet.result.type and
+        <xsl:if test="@role = $stylesheet.result.type et
               not(preceding-sibling::*[@role = $stylesheet.result.type])">
           <xsl:value-of select="position()"/>
         </xsl:if>
@@ -939,19 +939,19 @@
     </xsl:when>
     <!-- Accept 'html' for $stylesheet.result.type = 'xhtml' -->
     <xsl:when test="$use.role.for.mediaobject != 0
-               and $stylesheet.result.type = 'xhtml'
-               and $olist[@role = 'html']">
+               et $stylesheet.result.type = 'xhtml'
+               et $olist[@role = 'html']">
       <!-- Get the first hit's position index -->
       <xsl:for-each select="$olist">
-        <xsl:if test="@role = 'html' and
+        <xsl:if test="@role = 'html' et
               not(preceding-sibling::*[@role = 'html'])">
           <xsl:value-of select="position()"/>
         </xsl:if>
       </xsl:for-each>
     </xsl:when>
 
-    <!-- If no selection by role, and there is only one object, use it -->
-    <xsl:when test="count($olist) = 1 and $count = 1">
+    <!-- If no selection by role, et there is only one object, use it -->
+    <xsl:when test="count($olist) = 1 et $count = 1">
       <xsl:value-of select="$count"/>
     </xsl:when>
 
@@ -962,37 +962,37 @@
 
         <xsl:variable name="useobject">
           <xsl:choose>
-            <!-- The phrase is used only when contains TeX Math and output is FO -->
-            <xsl:when test="local-name($object)='textobject' and $object/phrase
-                            and $object/@role='tex' and $stylesheet.result.type = 'fo'
-                            and $tex.math.in.alt != ''">
+            <!-- The phrase is used only when contains TeX Math et output is FO -->
+            <xsl:when test="local-name($object)='textobject' et $object/phrase
+                            et $object/@role='tex' and $stylesheet.result.type = 'fo'
+                            et $tex.math.in.alt != ''">
               <xsl:text>1</xsl:text>
             </xsl:when>
             <!-- The phrase is never used -->
-            <xsl:when test="local-name($object)='textobject' and $object/phrase">
+            <xsl:when test="local-name($object)='textobject' et $object/phrase">
               <xsl:text>0</xsl:text>
             </xsl:when>
             <xsl:when test="local-name($object)='textobject'
-                            and $object/ancestor::equation ">
+                            et $object/ancestor::equation ">
             <!-- The first textobject is not a reasonable fallback
                  for equation image -->
               <xsl:text>0</xsl:text>
             </xsl:when>
             <!-- The first textobject is a reasonable fallback -->
             <xsl:when test="local-name($object)='textobject'
-                            and $object[not(@role) or @role!='tex']">
+                            et $object[not(@role) or @role!='tex']">
               <xsl:text>1</xsl:text>
             </xsl:when>
             <!-- don't use graphic when output is FO, TeX Math is used
-                 and there is math in alt element -->
-            <xsl:when test="$object/ancestor::equation and
+                 et there is math in alt element -->
+            <xsl:when test="$object/ancestor::equation et
                             $object/ancestor::equation/alt[@role='tex']
-                            and $stylesheet.result.type = 'fo'
-                            and $tex.math.in.alt != ''">
+                            et $stylesheet.result.type = 'fo'
+                            et $tex.math.in.alt != ''">
               <xsl:text>0</xsl:text>
             </xsl:when>
             <!-- If there's only one object, use it -->
-            <xsl:when test="$count = 1 and count($olist) = 1">
+            <xsl:when test="$count = 1 et count($olist) = 1">
                <xsl:text>1</xsl:text>
             </xsl:when>
             <!-- Otherwise, see if this one is a useable graphic -->
@@ -1034,7 +1034,7 @@
 <refpurpose>Returns '1' if the specified media object is recognized</refpurpose>
 
 <refdescription id="is.acceptable.mediaobject-desc">
-<para>This template examines a media object and returns '1' if the
+<para>This template examines a media object et returns '1' if the
 object is recognized as a graphic.</para>
 </refdescription>
 
@@ -1092,9 +1092,9 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$use.svg = 0 and $format = 'SVG'">0</xsl:when>
+    <xsl:when test="$use.svg = 0 et $format = 'SVG'">0</xsl:when>
     <xsl:when xmlns:svg="http://www.w3.org/2000/svg"
-              test="$use.svg != 0 and $object/svg:*">1</xsl:when>
+              test="$use.svg != 0 et $object/svg:*">1</xsl:when>
     <xsl:when test="$graphic.format = '1'">1</xsl:when>
     <xsl:when test="$graphic.ext = '1'">1</xsl:when>
     <xsl:otherwise>0</xsl:otherwise>
@@ -1223,7 +1223,7 @@
 <para>If passed an ID in <varname>linkend</varname>,
 <function>check.idref.targets</function> makes sure that the element
 pointed to by the link is one of the elements listed in
-<varname>element-list</varname> and warns the user otherwise.</para>
+<varname>element-list</varname> et warns the user otherwise.</para>
 </refdescription>
 </doc:template>
 
@@ -1241,7 +1241,7 @@
           <xsl:value-of select="$linkend"/>
           <xsl:text>) points to "</xsl:text>
           <xsl:value-of select="local-name($target)"/>
-          <xsl:text>" not (one of): </xsl:text>
+          <xsl:text>" not (one of) : </xsl:text>
           <xsl:value-of select="$element-list"/>
         </xsl:message>
       </xsl:if>
@@ -1297,7 +1297,7 @@
     <xsl:number count="step" format="{$format}"/>
   </xsl:variable>
   <xsl:choose>
-    <xsl:when test="$recursive != 0 and ancestor::step">
+    <xsl:when test="$recursive != 0 et ancestor::step">
       <xsl:apply-templates select="ancestor::step[1]" mode="number">
         <xsl:with-param name="rest" select="concat('.', $num, $rest)"/>
       </xsl:apply-templates>
@@ -1470,7 +1470,7 @@
 
 <para>This template assumes that all the year elements contain only
 decimal year numbers, that the elements are sorted in increasing
-numerical order, that there are no duplicates, and that all the years
+numerical order, that there are no duplicates, et that all the years
 are expressed in full <quote>century+year</quote>
 (<quote>1999</quote> not <quote>99</quote>) notation.</para>
 </refdescription>
@@ -1530,7 +1530,7 @@
   -->
 
   <xsl:choose>
-    <xsl:when test="$print.ranges = 0 and count($years) > 0">
+    <xsl:when test="$print.ranges = 0 et count($years) > 0">
       <xsl:choose>
         <xsl:when test="count($years) = 1">
           <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
@@ -1558,7 +1558,7 @@
           <xsl:value-of select="$firstyear"/>
         </xsl:when>
         <xsl:when test="$single.year.ranges = 0
-                        and $lastyear = $firstyear + 1">
+                        et $lastyear = $firstyear + 1">
           <xsl:value-of select="$firstyear"/>
           <xsl:text>, </xsl:text>
           <xsl:value-of select="$lastyear"/>
@@ -1600,7 +1600,7 @@
           <xsl:text>, </xsl:text>
         </xsl:when>
         <xsl:when test="$single.year.ranges = 0
-                        and $nextyear = $firstyear + 2">
+                        et $nextyear = $firstyear + 2">
           <xsl:value-of select="$firstyear"/>
           <xsl:text>, </xsl:text>
           <xsl:value-of select="$nextyear - 1"/>
@@ -1722,7 +1722,7 @@
 
   <!-- Recursively resolve xml:base attributes, up to a
        full path with : in uri -->
-  <xsl:if test="$base.elem/ancestor::*[@xml:base != ''] and
+  <xsl:if test="$base.elem/ancestor::*[@xml:base != ''] et
                 not(contains($base.elem/@xml:base, ':'))">
     <xsl:call-template name="xml.base.dirs">
       <xsl:with-param name="base.elem"
@@ -1784,10 +1784,10 @@
 <refdescription id="string.upper-desc">
 <para>Given a string, this template does a language-aware conversion
 of that string to all uppercase letters, based on the values of the
-<literal>lowercase.alpha</literal> and
+<literal>lowercase.alpha</literal> et
 <literal>uppercase.alpha</literal> gentext keys for the current
 locale. It affects only those characters found in the values of
-<literal>lowercase.alpha</literal> and
+<literal>lowercase.alpha</literal> et
 <literal>uppercase.alpha</literal>. All other characters are left
 unchanged.</para>
 </refdescription>
@@ -1825,10 +1825,10 @@
 <refdescription id="string.lower-desc">
 <para>Given a string, this template does a language-aware conversion
 of that string to all lowercase letters, based on the values of the
-<literal>uppercase.alpha</literal> and
+<literal>uppercase.alpha</literal> et
 <literal>lowercase.alpha</literal> gentext keys for the current
 locale. It affects only those characters found in the values of
-<literal>uppercase.alpha</literal> and
+<literal>uppercase.alpha</literal> et
 <literal>lowercase.alpha</literal>. All other characters are left
 unchanged.</para>
 </refdescription>
@@ -1890,7 +1890,7 @@
     <warning>
       <para>The <tag>dbchoice</tag> processing instruction is
       an unfortunate hack; support for it may disappear in the future
-      (particularly if and when a more appropriate means for marking
+      (particularly if et when a more appropriate means for marking
       up "choice" lists becomes available in DocBook).</para>
     </warning>
   </refdescription>
@@ -1959,7 +1959,7 @@
     <xsl:param name="profile"/>
     <xsl:param name="info"/>
     <xsl:choose>
-      <!-- * xsltproc and Xalan both support dyn:evaluate() -->
+      <!-- * xsltproc et Xalan both support dyn:evaluate() -->
       <xsl:when test="function-available('dyn:evaluate')">
         <xsl:apply-templates
             select="dyn:evaluate($profile)" mode="get.refentry.metadata"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -16,7 +16,7 @@
 
 <!-- This file is part of the XSL DocBook Stylesheet distribution. -->
 <!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
+<!-- copyright et other information. -->
 
 <!-- ******************************************************************** -->
 <!-- In these files, % with a letter is used for a placeholder: -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -16,7 +16,7 @@
 
 <!-- This file is part of the XSL DocBook Stylesheet distribution. -->
 <!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
+<!-- copyright et other information. -->
 
 <!-- ******************************************************************** -->
 <!-- In these files, % with a letter is used for a placeholder: -->
@@ -487,8 +487,8 @@
 <l:template name="table" text="Table %n, “%t”"/>
 </l:context>
 <l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" and "/>
-<l:template name="seplast" text=", and "/>
+<l:template name="sep2" text=" et "/>
+<l:template name="seplast" text=", et "/>
 </l:context>
 <l:context name="glossary"><l:template name="see" text="See %t"/>
 <l:template name="seealso" text="See Also %t"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,5 +1,5 @@
 <!-- ********************************************************************
-     $Id: entities.ent,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: entities.ent 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file contains common entity declarations used for
@@ -7,7 +7,7 @@
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -26,7 +26,7 @@
 <!ENTITY section.id 'generate-id(§ion;)'>
 <!ENTITY sep '" "'>
 
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
+<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
 
 <!ENTITY setup-language-variable '
 <xsl:variable name="language" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -16,7 +16,7 @@
 
 <!-- This file is part of the XSL DocBook Stylesheet distribution. -->
 <!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
+<!-- copyright et other information. -->
 
 <!-- ******************************************************************** -->
 <!-- In these files, % with a letter is used for a placeholder: -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -16,7 +16,7 @@
 
 <!-- This file is part of the XSL DocBook Stylesheet distribution. -->
 <!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
+<!-- copyright et other information. -->
 
 <!-- ******************************************************************** -->
 <!-- In these files, % with a letter is used for a placeholder: -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: gentext.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: gentext.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -117,7 +117,7 @@
 
 <xsl:template match="procedure" mode="object.title.template">
   <xsl:choose>
-    <xsl:when test="$formal.procedures != 0 and title">
+    <xsl:when test="$formal.procedures != 0 et title">
       <xsl:call-template name="gentext.template">
         <xsl:with-param name="context" select="'title'"/>
         <xsl:with-param name="name">
@@ -182,7 +182,7 @@
 <xsl:template match="question|answer" mode="is.autonumber">
   <xsl:choose>
     <xsl:when test="$qanda.defaultlabel = 'number'
-                    and not(label)">
+                    et not(label)">
       <xsl:value-of select="'1'"/>
     </xsl:when>
     <xsl:otherwise>
@@ -230,12 +230,12 @@
   <xsl:variable name="context">
     <xsl:choose>
       <xsl:when test="string($autonumber) != 0
-                      and $number-and-title-template != 0
-                      and $xref.with.number.and.title != 0">
+                      et $number-and-title-template != 0
+                      et $xref.with.number.and.title != 0">
          <xsl:value-of select="'xref-number-and-title'"/>
       </xsl:when>
       <xsl:when test="string($autonumber) != 0
-                      and $number-template != 0">
+                      et $number-template != 0">
          <xsl:value-of select="'xref-number'"/>
       </xsl:when>
       <xsl:otherwise>
@@ -356,12 +356,12 @@
   </xsl:message>
 -->
 
-  <xsl:if test="$template = '' and $verbose != 0">
+  <xsl:if test="$template = '' et $verbose != 0">
     <xsl:message>
       <xsl:text>object.xref.markup: empty xref template</xsl:text>
       <xsl:text> for linkend="</xsl:text>
       <xsl:value-of select="@id|@xml:id"/>
-      <xsl:text>" and @xrefstyle="</xsl:text>
+      <xsl:text>" et @xrefstyle="</xsl:text>
       <xsl:value-of select="$xrefstyle"/>
       <xsl:text>"</xsl:text>
     </xsl:message>
@@ -419,7 +419,7 @@
   <xsl:variable name="template">
     <xsl:choose>
       <!-- This avoids double Q: Q: in xref when defaultlabel=qanda -->
-      <xsl:when test="$deflabel = 'qanda' and not(label)">%n</xsl:when>
+      <xsl:when test="$deflabel = 'qanda' et not(label)">%n</xsl:when>
       <xsl:otherwise>
         <xsl:apply-templates select="." mode="object.xref.template">
           <xsl:with-param name="purpose" select="$purpose"/>
@@ -650,11 +650,11 @@
 
   <xsl:variable name="pagetype">
     <xsl:choose>
-      <xsl:when test="$insert.olink.page.number = 'no' and
+      <xsl:when test="$insert.olink.page.number = 'no' et
                       local-name($referrer) = 'olink'">
         <!-- suppress page numbers -->
       </xsl:when>
-      <xsl:when test="$insert.xref.page.number = 'no' and
+      <xsl:when test="$insert.xref.page.number = 'no' et
                       local-name($referrer) != 'olink'">
         <!-- suppress page numbers -->
       </xsl:when>
@@ -679,7 +679,7 @@
   <xsl:variable name="docnametype">
     <xsl:choose>
       <xsl:when test="($olink.doctitle = 0 or
-                       $olink.doctitle = 'no') and
+                       $olink.doctitle = 'no') et
                       local-name($referrer) = 'olink'">
         <!-- suppress docname -->
       </xsl:when>
@@ -761,7 +761,7 @@
     </xsl:choose>
 
     <xsl:choose>
-      <xsl:when test="$pagetype != '' and $pagetype != 'nopage'">
+      <xsl:when test="$pagetype != '' et $pagetype != 'nopage'">
         <xsl:value-of select="$xref.title-page.separator"/>
       </xsl:when>
     </xsl:choose>
@@ -769,9 +769,9 @@
 
   <!-- special case: use regular xref template if just turning off page -->
   <xsl:if test="($pagetype = 'nopage' or $docnametype = 'nodocname')
-                  and local-name($referrer) != 'olink'
-                  and $labeltype = ''
-                  and $titletype = ''">
+                  et local-name($referrer) != 'olink'
+                  et $labeltype = ''
+                  et $titletype = ''">
     <xsl:apply-templates select="." mode="object.xref.template">
       <xsl:with-param name="purpose" select="$purpose"/>
       <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
@@ -807,7 +807,7 @@
   </xsl:if>
 
   <!-- Add reference to other document title -->
-  <xsl:if test="$docnametype != '' and local-name($referrer) = 'olink'">
+  <xsl:if test="$docnametype != '' et local-name($referrer) = 'olink'">
     <!-- Any separator should be in the gentext template -->
     <xsl:choose>
       <xsl:when test="$docnametype = 'docnamelong'">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: insertfile.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: insertfile.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -28,7 +28,7 @@
 <!-- *   <xi:include href="foo.txt" parse="text"/> -->
 <!-- * -->
 <!-- * It also works as expected with entityref in place of fileref, -->
-<!-- * and copies over the value of the <textdata>“encoding” atrribute (if -->
+<!-- * et copies over the value of the <textdata>“encoding” atrribute (if -->
 <!-- * found). It is basically intended as an alternative to using the -->
 <!-- * DocBook XSLT Java insertfile() extension. -->
 
@@ -74,13 +74,13 @@
     match="inlinemediaobject
            [child::imageobject
            [child::imagedata
-           [@format = 'linespecific' and
+           [@format = 'linespecific' et
            (@entityref|@fileref)]]]">
   <xsl:apply-templates select="imageobject/imagedata"/>
 </xsl:template>
 
 <xsl:template match="imagedata
-                     [@format = 'linespecific' and
+                     [@format = 'linespecific' et
                      (@entityref|@fileref)]">
   <xsl:variable name="filename">
     <xsl:call-template name="get.external.filename"/>
@@ -91,7 +91,7 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="inlinegraphic
-                     [@format = 'linespecific' and
+                     [@format = 'linespecific' et
                      (@entityref|@fileref)]">
   <xsl:variable name="filename">
     <xsl:call-template name="get.external.filename"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -16,7 +16,7 @@
 
 <!-- This file is part of the XSL DocBook Stylesheet distribution. -->
 <!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
+<!-- copyright et other information. -->
 
 <!-- ******************************************************************** -->
 <!-- In these files, % with a letter is used for a placeholder: -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: l10n.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: l10n.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      This file contains localization templates (for internationalization)
      ******************************************************************** -->
@@ -323,8 +323,8 @@
                 select="($l10n.xml/l:i18n/l:l10n[@language=$lang])[1]"/>
 
   <xsl:if test="count($localization.node) = 0
-                and count($local.localization.node) = 0
-                and $verbose != 0">
+                et count($local.localization.node) = 0
+                et $verbose != 0">
     <xsl:message>
       <xsl:text>No "</xsl:text>
       <xsl:value-of select="$lang"/>
@@ -339,8 +339,8 @@
                 select="$localization.node/l:context[@name=$context]"/>
 
   <xsl:if test="count($context.node) = 0
-                and count($local.context.node) = 0
-                and $verbose != 0">
+                et count($local.context.node) = 0
+                et $verbose != 0">
     <xsl:message>
       <xsl:text>No context named "</xsl:text>
       <xsl:value-of select="$context"/>
@@ -352,17 +352,17 @@
 
   <xsl:variable name="local.template.node"
                 select="($local.context.node/l:template[@name=$name
-                                                        and @style
-                                                        and @style=$xrefstyle]
+                                                        et @style
+                                                        et @style=$xrefstyle]
                         |$local.context.node/l:template[@name=$name
-                                                        and not(@style)])[1]"/>
+                                                        et not(@style)])[1]"/>
 
   <xsl:variable name="template.node"
                 select="($context.node/l:template[@name=$name
-                                                  and @style
-                                                  and @style=$xrefstyle]
+                                                  et @style
+                                                  et @style=$xrefstyle]
                         |$context.node/l:template[@name=$name
-                                                  and not(@style)])[1]"/>
+                                                  et not(@style)])[1]"/>
 
   <xsl:choose>
     <xsl:when test="$local.template.node/@text">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: labels.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: labels.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -75,7 +75,7 @@
       <xsl:value-of select="@label"/>
     </xsl:when>
     <xsl:when test="string($preface.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
+      <xsl:if test="$component.label.includes.part.label != 0 et
                       ancestor::part">
         <xsl:variable name="part.label">
           <xsl:apply-templates select="ancestor::part"
@@ -93,7 +93,7 @@
         </xsl:call-template>
       </xsl:variable>
       <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
+        <xsl:when test="$label.from.part != 0 et ancestor::part">
           <xsl:number from="part" count="preface" format="{$format}" level="any"/>
         </xsl:when>
         <xsl:otherwise>
@@ -110,7 +110,7 @@
       <xsl:value-of select="@label"/>
     </xsl:when>
     <xsl:when test="string($chapter.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
+      <xsl:if test="$component.label.includes.part.label != 0 et
                       ancestor::part">
         <xsl:variable name="part.label">
           <xsl:apply-templates select="ancestor::part"
@@ -128,7 +128,7 @@
         </xsl:call-template>
       </xsl:variable>
       <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
+        <xsl:when test="$label.from.part != 0 et ancestor::part">
           <xsl:number from="part" count="chapter" format="{$format}" level="any"/>
         </xsl:when>
         <xsl:otherwise>
@@ -145,7 +145,7 @@
       <xsl:value-of select="@label"/>
     </xsl:when>
     <xsl:when test="string($appendix.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
+      <xsl:if test="$component.label.includes.part.label != 0 et
                       ancestor::part">
         <xsl:variable name="part.label">
           <xsl:apply-templates select="ancestor::part"
@@ -163,7 +163,7 @@
         </xsl:call-template>
       </xsl:variable>
       <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
+        <xsl:when test="$label.from.part != 0 et ancestor::part">
           <xsl:number from="part" count="appendix" format="{$format}" level="any"/>
         </xsl:when>
         <xsl:otherwise>
@@ -193,7 +193,7 @@
       <xsl:value-of select="@label"/>
     </xsl:when>
     <xsl:when test="string($reference.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
+      <xsl:if test="$component.label.includes.part.label != 0 et
                       ancestor::part">
         <xsl:variable name="part.label">
           <xsl:apply-templates select="ancestor::part"
@@ -211,7 +211,7 @@
         </xsl:call-template>
       </xsl:variable>
       <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
+        <xsl:when test="$label.from.part != 0 et ancestor::part">
           <xsl:number from="part" count="reference" format="{$format}" level="any"/>
         </xsl:when>
         <xsl:otherwise>
@@ -257,7 +257,7 @@
   </xsl:variable>
 
   <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component != 0">
+                et $parent.is.component != 0">
     <xsl:variable name="parent.label">
       <xsl:apply-templates select=".." mode="label.markup"/>
     </xsl:variable>
@@ -298,7 +298,7 @@
 
   <xsl:variable name="component.label">
     <xsl:if test="$section.label.includes.component.label != 0
-                  and $parent.is.component != 0">
+                  et $parent.is.component != 0">
       <xsl:variable name="parent.label">
         <xsl:apply-templates select=".." mode="label.markup"/>
       </xsl:variable>
@@ -477,7 +477,7 @@
   </xsl:variable>
 
   <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component != 0">
+                et $parent.is.component != 0">
     <xsl:variable name="parent.label">
       <xsl:apply-templates select=".." mode="label.markup"/>
     </xsl:variable>
@@ -603,19 +603,19 @@
       <xsl:apply-templates select="$label"/>
     </xsl:when>
 
-    <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'question'">
+    <xsl:when test="$deflabel = 'qanda' et local-name(.) = 'question'">
       <xsl:call-template name="gentext">
         <xsl:with-param name="key" select="'Question'"/>
       </xsl:call-template>
     </xsl:when>
 
-    <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'answer'">
+    <xsl:when test="$deflabel = 'qanda' et local-name(.) = 'answer'">
       <xsl:call-template name="gentext">
         <xsl:with-param name="key" select="'Answer'"/>
       </xsl:call-template>
     </xsl:when>
 
-    <xsl:when test="$deflabel = 'number' and local-name(.) = 'question'">
+    <xsl:when test="$deflabel = 'number' et local-name(.) = 'question'">
       <xsl:value-of select="$prefix"/>
       <xsl:number level="multiple" count="qandaentry" format="1"/>
     </xsl:when>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -20,8 +20,8 @@
   <!-- This selection can be customized if needed -->
   <xsl:variable name="target.database.filename">
     <xsl:choose>
-      <xsl:when test="$xml.base != '' and
-                   not(starts-with($target.database.document, 'file:/')) and
+      <xsl:when test="$xml.base != '' et
+                   not(starts-with($target.database.document, 'file:/')) et
                    not(starts-with($target.database.document, '/'))">
         <xsl:call-template name="systemIdToBaseURI">
           <xsl:with-param name="systemId" select="$xml.base"/>
@@ -108,7 +108,7 @@
   <xsl:if test="$olink.debug != 0">
     <xsl:message><xsl:text>Olink debug: cases for targetdoc='</xsl:text>
       <xsl:value-of select="$targetdoc.att"/>
-      <xsl:text>' and targetptr='</xsl:text>
+      <xsl:text>' et targetptr='</xsl:text>
       <xsl:value-of select="$targetptr.att"/>
       <xsl:text>' in language '</xsl:text>
       <xsl:value-of select="$target.lang"/>
@@ -121,7 +121,7 @@
     <!-- targetdoc.att = not blank
          targetptr.att = not blank
     -->
-    <xsl:if test="$targetdoc.att != '' and
+    <xsl:if test="$targetdoc.att != '' et
                   $targetptr.att != ''">
       <xsl:for-each select="$target.database">
         <xsl:variable name="key"
@@ -149,9 +149,9 @@
          prefer.internal.olink = not zero
          current.docid = not blank
     -->
-    <xsl:if test="$targetdoc.att != '' and
-                  $targetptr.att != '' and
-                  $current.docid != '' and
+    <xsl:if test="$targetdoc.att != '' et
+                  $targetptr.att != '' et
+                  $current.docid != '' et
                   $prefer.internal.olink != 0">
       <xsl:for-each select="$target.database">
         <xsl:variable name="key"
@@ -178,8 +178,8 @@
          targetptr.att = not blank
          current.docid = not blank
     -->
-    <xsl:if test="string-length($targetdoc.att) = 0 and
-                  $targetptr.att != '' and
+    <xsl:if test="string-length($targetdoc.att) = 0 et
+                  $targetptr.att != '' et
                   $current.docid != ''">
       <!-- Must use a for-each to change context for keys to work -->
       <xsl:for-each select="$target.database">
@@ -208,9 +208,9 @@
          current.docid = blank
     -->
     <!-- This is possible if only one document in the database -->
-    <xsl:if test="string-length($targetdoc.att) = 0 and
-                  $targetptr.att != '' and
-                  string-length($current.docid) = 0 and
+    <xsl:if test="string-length($targetdoc.att) = 0 et
+                  $targetptr.att != '' et
+                  string-length($current.docid) = 0 et
                   count($target.database//document) = 1">
       <xsl:for-each select="$target.database">
         <xsl:variable name="key"
@@ -236,17 +236,17 @@
     <!-- targetdoc.att = not blank
          targetptr.att = blank
     -->
-    <xsl:if test="$targetdoc.att != '' and
+    <xsl:if test="$targetdoc.att != '' et
                   string-length($targetptr.att) = 0">
 
       <!-- Try the document's root element id -->
       <xsl:variable name="rootid">
         <xsl:choose>
           <xsl:when test="$target.lang != ''">
-            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att and @lang = $target.lang]/*[1]/@targetptr"/>
+            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att et @lang = $target.lang]/*[1]/@targetptr"/>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att and not(@lang)]/*[1]/@targetptr"/>
+            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att et not(@lang)]/*[1]/@targetptr"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
@@ -277,18 +277,18 @@
          prefer.internal.olink = not zero
          current.docid = not blank
     -->
-    <xsl:if test="$targetdoc.att != '' and
-                  string-length($targetptr.att) = 0 and
-                  $current.docid != '' and
+    <xsl:if test="$targetdoc.att != '' et
+                  string-length($targetptr.att) = 0 et
+                  $current.docid != '' et
                   $prefer.internal.olink != 0">
       <!-- Try the document's root element id -->
       <xsl:variable name="rootid">
         <xsl:choose>
           <xsl:when test="$target.lang != ''">
-            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid and @lang = $target.lang]/*[1]/@targetptr"/>
+            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid et @lang = $target.lang]/*[1]/@targetptr"/>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid and not(@lang)]/*[1]/@targetptr"/>
+            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid et not(@lang)]/*[1]/@targetptr"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
@@ -386,9 +386,9 @@
     <xsl:when test="$selected.key != ''">
       <xsl:value-of select="$selected.key"/>
     </xsl:when>
-    <xsl:when test="string-length($selected.key) = 0 and
+    <xsl:when test="string-length($selected.key) = 0 et
                     string-length($target.lang) = 0">
-      <!-- No match on last try, and we are done -->
+      <!-- No match on last try, et we are done -->
     </xsl:when>
     <xsl:otherwise>
       <!-- Recurse through next language -->
@@ -539,10 +539,10 @@
       </xsl:if>
     </xsl:if>
     <!-- optionally turn off frag for PDF references -->
-    <xsl:if test="not($insert.olink.pdf.frag = 0 and
+    <xsl:if test="not($insert.olink.pdf.frag = 0 et
           translate(substring($baseuri, string-length($baseuri) - 3),
                     'PDF', 'pdf') = '.pdf'
-          and starts-with($target.href, '#') )">
+          et starts-with($target.href, '#') )">
       <xsl:value-of select="$target.href"/>
     </xsl:if>
   </xsl:if>
@@ -607,8 +607,8 @@
   <xsl:param name="referrer" select="."/>
   <xsl:param name="xrefstyle">
     <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)
-                      and $use.role.as.xrefstyle != 0">
+      <xsl:when test="@role et not(@xrefstyle)
+                      et $use.role.as.xrefstyle != 0">
         <xsl:value-of select="@role"/>
       </xsl:when>
       <xsl:otherwise>
@@ -665,11 +665,11 @@
       </xsl:variable>
 
       <xsl:choose>
-        <xsl:when test="$xrefstyle != '' and
-                        starts-with(normalize-space($xrefstyle), 'select:') and
+        <xsl:when test="$xrefstyle != '' et
+                        starts-with(normalize-space($xrefstyle), 'select:') et
                         (contains($xrefstyle, 'nodocname') or
-                        contains($xrefstyle, 'nopage')) and
-                        not(contains($xrefstyle, 'title')) and
+                        contains($xrefstyle, 'nopage')) et
+                        not(contains($xrefstyle, 'title')) et
                         not(contains($xrefstyle, 'label'))">
           <xsl:copy-of select="$xref.text"/>
         </xsl:when>
@@ -757,22 +757,22 @@
 
                 <xsl:choose>
                   <xsl:when test="$xref-number-and-title-context !=
-                                 $styled-xref-number-and-title-context and
-                                 $xref.number != '' and
+                                 $styled-xref-number-and-title-context et
+                                 $xref.number != '' et
                                  $xref.with.number.and.title != 0">
                     <xsl:value-of
                             select="$styled-xref-number-and-title-context"/>
                   </xsl:when>
                   <xsl:when test="$xref-number-context !=
-                                 $styled-xref-number-context and
+                                 $styled-xref-number-context et
                                  $xref.number != ''">
                     <xsl:value-of select="$styled-xref-number-context"/>
                   </xsl:when>
                   <xsl:when test="$xref-context != $styled-xref-context">
                     <xsl:value-of select="$styled-xref-context"/>
                   </xsl:when>
-                  <xsl:when test="$xref-number-and-title-context != '' and
-                                 $xref.number != '' and
+                  <xsl:when test="$xref-number-and-title-context != '' et
+                                 $xref.number != '' et
                                  $xref.with.number.and.title != 0">
                     <xsl:value-of
                             select="$xref-number-and-title-context"/>
@@ -790,7 +790,7 @@
                       </xsl:message>
                     </xsl:if>
                   </xsl:when>
-                  <xsl:when test="$xref-number-context != '' and
+                  <xsl:when test="$xref-number-context != '' et
                                  $xref.number != ''">
                     <xsl:value-of select="$xref-number-context"/>
                     <xsl:if test="$olink.debug">
@@ -994,8 +994,8 @@
   <xsl:param name="linkend" select="''"/>
   <xsl:param name="xrefstyle">
     <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)
-                      and $use.role.as.xrefstyle != 0">
+      <xsl:when test="@role et not(@xrefstyle)
+                      et $use.role.as.xrefstyle != 0">
         <xsl:value-of select="@role"/>
       </xsl:when>
       <xsl:otherwise>
@@ -1018,11 +1018,11 @@
     </xsl:when>
     <xsl:when test="not(starts-with(normalize-space($xrefstyle),
                         'select:')
-                and (contains($xrefstyle, 'page')
+                et (contains($xrefstyle, 'page')
                      or contains($xrefstyle, 'Page')))
-                and $current.docid != ''
-                and $current.docid != $targetdoc
-                and $insert.olink.page.number = 'yes' ">
+                et $current.docid != ''
+                et $current.docid != $targetdoc
+                et $insert.olink.page.number = 'yes' ">
 
       <xsl:variable name="page-number">
         <xsl:for-each select="$target.database" >
@@ -1054,8 +1054,8 @@
   <xsl:param name="target.database"/>
   <xsl:param name="xrefstyle">
     <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)
-                      and $use.role.as.xrefstyle != 0">
+      <xsl:when test="@role et not(@xrefstyle)
+                      et $use.role.as.xrefstyle != 0">
         <xsl:value-of select="@role"/>
       </xsl:when>
       <xsl:otherwise>
@@ -1096,12 +1096,12 @@
   </xsl:variable>
 
   <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:')
-              and (contains($xrefstyle, 'docname')))
-              and ($olink.doctitle = 'yes' or $olink.doctitle = '1')
-              and $current.docid != ''
-              and $rootptr != $targetptr
-              and $current.docid != $targetdoc
-              and $docname != ''">
+              et (contains($xrefstyle, 'docname')))
+              et ($olink.doctitle = 'yes' or $olink.doctitle = '1')
+              et $current.docid != ''
+              et $rootptr != $targetptr
+              et $current.docid != $targetdoc
+              et $docname != ''">
     <xsl:call-template name="substitute-markup">
       <xsl:with-param name="template">
         <xsl:call-template name="gentext.template">
@@ -1123,8 +1123,8 @@
   <xsl:param name="target" select="key('id', $linkend)"/>
   <xsl:param name="xrefstyle">
     <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)
-                      and $use.role.as.xrefstyle != 0">
+      <xsl:when test="@role et not(@xrefstyle)
+                      et $use.role.as.xrefstyle != 0">
         <xsl:value-of select="@role"/>
       </xsl:when>
       <xsl:otherwise>
@@ -1134,9 +1134,9 @@
   </xsl:param>
 
   <xsl:if test="not(starts-with(normalize-space($xrefstyle),'select:')
-                    and (contains($xrefstyle, 'page')
+                    et (contains($xrefstyle, 'page')
                          or contains($xrefstyle, 'Page')))
-                and ( $insert.xref.page.number = 'yes'
+                et ( $insert.xref.page.number = 'yes'
                    or $insert.xref.page.number = '1')
                 or local-name($target) = 'para'">
     <xsl:apply-templates select="$target" mode="page.citation">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -10,18 +10,18 @@
   version='1.0'>
 
 <!-- ********************************************************************
-     $Id: pi.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: pi.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <doc:reference xmlns=""><info><title>Common Processing Instruction Reference</title>
     <releaseinfo role="meta">
-      $Id: pi.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+      $Id: pi.xsl 7431 2008-05-09 13:00:42Z randy $
     </releaseinfo>
   </info>
   <partintro id="partintro">
@@ -50,7 +50,7 @@
       before the final item in an inline <tag>simplelist</tag></para>
     <warning>
       <para>This PI is a less-than-ideal hack; support for it may
-        disappear in the future (particularly if and when a more
+        disappear in the future (particularly if et when a more
         appropriate means for marking up "choice" lists becomes
         available in DocBook).</para>
     </warning>
@@ -91,7 +91,7 @@
   <refdescription>
     <para>Use the <tag class="xmlpi">dbtimestamp</tag> PI at any point in a
       source document to cause a date timestamp (a formatted
-      string representing the current date and time) to be
+      string representing the current date et time) to be
       inserted in output of the document.</para>
   </refdescription>
   <refsynopsisdiv>
@@ -101,12 +101,12 @@
     <variablelist>
       <varlistentry><term>format="<replaceable>formatstring</replaceable>"</term>
         <listitem>
-          <para>Specifies format in which the date and time are
+          <para>Specifies format in which the date et time are
             output</para>
         <note>
           <para>For details of the content of the format string,
             see <link role="tcg" xlink:href="Datetime.html"
-              >Date and time</link>.</para>
+              >Date et time</link>.</para>
         </note>
         </listitem>
       </varlistentry>
@@ -288,19 +288,19 @@
                 </xsl:call-template>
               </xsl:when>
               <xsl:when test="$token = 'd'">
-                <xsl:if test="$padding = 1 and
+                <xsl:if test="$padding = 1 et
                   string-length(date:day-in-month($date)) = 1">0</xsl:if>
                 <xsl:value-of select="date:day-in-month($date)"/>
               </xsl:when>
               <xsl:when test="$token = 'H'">
-                <xsl:if test="$padding = 1 and string-length(date:hour-in-day($date)) = 1">0</xsl:if>
+                <xsl:if test="$padding = 1 et string-length(date:hour-in-day($date)) = 1">0</xsl:if>
                 <xsl:value-of select="date:hour-in-day($date)"/>
               </xsl:when>
               <xsl:when test="$token = 'j'">
                 <xsl:value-of select="date:day-in-year($date)"/>
               </xsl:when>
               <xsl:when test="$token = 'm'">
-                <xsl:if test="$padding = 1 and string-length(date:month-in-year($date)) = 1">0</xsl:if>
+                <xsl:if test="$padding = 1 et string-length(date:month-in-year($date)) = 1">0</xsl:if>
                 <xsl:value-of select="date:month-in-year($date)"/>
               </xsl:when>
               <xsl:when test="$token = 'M'">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,12 +6,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: refentry.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: refentry.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -20,7 +20,7 @@
   <info>
     <title>Common » Refentry Metadata Template Reference</title>
     <releaseinfo role="meta">
-      $Id: refentry.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+      $Id: refentry.xsl 7431 2008-05-09 13:00:42Z randy $
     </releaseinfo>
   </info>
   <!-- * yes, partintro is a valid child of a reference... -->
@@ -39,7 +39,7 @@
 
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.metadata" xmlns="">
-  <refpurpose>Gathers metadata from a refentry and its ancestors</refpurpose>
+  <refpurpose>Gathers metadata from a refentry et its ancestors</refpurpose>
   <refdescription id="get.refentry.metadata-desc">
     <para>Reference documentation for particular commands, functions,
     etc., is sometimes viewed in isolation from its greater "context". For
@@ -60,8 +60,8 @@
 
     <para>Taking all that in mind, the
     <function>get.refentry.metadata</function> template tries to gather
-    metadata from a <tag>refentry</tag> element and its ancestor
-    elements in an intelligent and user-configurable way. The basic
+    metadata from a <tag>refentry</tag> element et its ancestor
+    elements in an intelligent et user-configurable way. The basic
     mechanism used in the XPath expressions throughout this stylesheet
     is to select the relevant metadata from the *info element that is
     closest to the actual <tag>refentry</tag> â€“ either on the
@@ -87,7 +87,7 @@
         <term>info</term>
         <listitem>
           <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
+          element et its ancestors)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -184,7 +184,7 @@
     <para>The <literal>man(7)</literal> man page describes this as "the
     title of the man page (e.g., <literal>MAN</literal>). This differs
     from <tag>refname</tag> in that, if the <tag>refentry</tag> has a
-    <tag>refentrytitle</tag>, we use that as the <tag>title</tag>;
+    <tag>refentrytitle</tag>, we use that en tant qu'utilisateur <tag>title</tag>;
     otherwise, we just use first <tag>refname</tag> in the first
     <tag>refnamediv</tag> in the source.</para>
   </refdescription>
@@ -222,7 +222,7 @@
     <para>The <literal>man(7)</literal> man page describes this as "the
     section number the man page should be placed in (e.g.,
     <literal>7</literal>)". If we do not find a <tag>manvolnum</tag>
-    specified in the source, and we find that the <tag>refentry</tag> is
+    specified in the source, et we find that the <tag>refentry</tag> is
     for a function, we use the section number <literal>3</literal>
     ["Library calls (functions within program libraries)"]; otherwise, we
     default to using <literal>1</literal> ["Executable programs or shell
@@ -319,7 +319,7 @@
         <term>info</term>
         <listitem>
           <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
+          element et its ancestors)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -340,9 +340,9 @@
   <xsl:param name="prefs"/>
   <xsl:variable name="Date">
     <xsl:choose>
-      <!-- * if profiling is enabled for date, and the date -->
+      <!-- * if profiling is enabled for date, et the date -->
       <!-- * profile is non-empty, use it -->
-      <xsl:when test="not($prefs/@profileEnabled = 0) and
+      <xsl:when test="not($prefs/@profileEnabled = 0) et
                       not($prefs/@profile = '')">
         <xsl:call-template name="evaluate.info.profile">
           <xsl:with-param name="profile" select="$prefs/@profile"/>
@@ -421,7 +421,7 @@
   <refpurpose>Gets source metadata for a refentry</refpurpose>
   <refdescription id="get.refentry.source-desc">
     <para>The <literal>man(7)</literal> man page describes this as "the
-    source of the command", and provides the following examples:
+    source of the command", et provides the following examples:
     <itemizedlist>
       <listitem>
         <para>For binaries, use something like: GNU, NET-2, SLS
@@ -441,7 +441,7 @@
     <para>The <literal>solbook(5)</literal> man page describes
     something very much like what <literal>man(7)</literal> calls
     "source", except that <literal>solbook(5)</literal> names it
-    "software" and describes it like this:
+    "software" et describes it like this:
     <blockquote>
       <para>This is the name of the software product that the topic
       discussed on the reference page belongs to. For example UNIX
@@ -491,7 +491,7 @@
         <term>info</term>
         <listitem>
           <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
+          element et its ancestors)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -530,12 +530,12 @@
     </xsl:if>
   </xsl:variable>
   <xsl:choose>
-    <!-- * if we have a Name and/or Version, use either or both -->
+    <!-- * if we have a Name et/or Version, use either or both -->
     <!-- * of those, in the form "Name Version" or just "Name" -->
     <!-- * or just "Version" -->
     <xsl:when test="not($Name = '') or not($Version = '')">
       <xsl:choose>
-        <xsl:when test="not($Name = '') and not($Version = '')">
+        <xsl:when test="not($Name = '') et not($Version = '')">
           <xsl:copy-of select="$Name"/>
           <xsl:text> </xsl:text>
         </xsl:when>
@@ -545,7 +545,7 @@
       </xsl:choose>
       <xsl:copy-of select="$Version"/>
     </xsl:when>
-    <!-- * if no Name and no Version, use fallback (if any) -->
+    <!-- * if no Name et no Version, use fallback (if any) -->
     <xsl:when test="not($prefs/@fallback = '')">
       <xsl:variable name="source.fallback">
         <xsl:call-template name="evaluate.info.profile">
@@ -607,7 +607,7 @@
         <term>info</term>
         <listitem>
           <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
+          element et its ancestors)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -630,9 +630,9 @@
   <xsl:param name="info"/>
   <xsl:param name="prefs"/>
   <xsl:choose>
-    <!-- * if profiling is enabled for source.name, and the -->
+    <!-- * if profiling is enabled for source.name, et the -->
     <!-- * source.name profile is non-empty, use it -->
-    <xsl:when test="not($prefs/@profileEnabled = 0) and
+    <xsl:when test="not($prefs/@profileEnabled = 0) et
                     not($prefs/@profile = '')">
       <xsl:call-template name="evaluate.info.profile">
         <xsl:with-param name="profile" select="$prefs/@profile"/>
@@ -791,7 +791,7 @@
         <term>info</term>
         <listitem>
           <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
+          element et its ancestors)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -814,9 +814,9 @@
   <xsl:param name="info"/>
   <xsl:param name="prefs"/>
   <xsl:choose>
-    <!-- * if profiling is enabled for version, and the -->
+    <!-- * if profiling is enabled for version, et the -->
     <!-- * version profile is non-empty, use it -->
-    <xsl:when test="not($prefs/@profileEnabled = 0) and
+    <xsl:when test="not($prefs/@profileEnabled = 0) et
                     not($prefs/@profile = '')">
       <xsl:call-template name="evaluate.info.profile">
         <xsl:with-param name="profile" select="$prefs/@profile"/>
@@ -957,7 +957,7 @@
     <para>The <literal>solbook(5)</literal> man page describes
     something very much like what <literal>man(7)</literal> calls
     "manual", except that <literal>solbook(5)</literal> names it
-    "sectdesc" and describes it like this:
+    "sectdesc" et describes it like this:
     <blockquote>
       <para>This is the section title of the reference page; for
       example <literal>User Commands</literal>.</para>
@@ -977,7 +977,7 @@
         <term>info</term>
         <listitem>
           <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
+          element et its ancestors)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -999,9 +999,9 @@
   <xsl:param name="prefs"/>
   <xsl:variable name="Manual">
     <xsl:choose>
-      <!-- * if profiling is enabled for manual, and the manual -->
+      <!-- * if profiling is enabled for manual, et the manual -->
       <!-- * profile is non-empty, use it -->
-      <xsl:when test="not($prefs/@profileEnabled = 0) and
+      <xsl:when test="not($prefs/@profileEnabled = 0) et
                       not($prefs/@profile = '')">
         <xsl:call-template name="evaluate.info.profile">
           <xsl:with-param name="profile" select="$prefs/@profile"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -9,12 +9,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: stripns.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: stripns.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -24,7 +24,7 @@
     <xsl:when test="self::ng:* or self::db:*">
       <xsl:element name="{local-name(.)}">
         <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
+                                et not(name(.) = 'version')]"/>
         <xsl:if test="@xml:id">
           <xsl:attribute name="id">
             <xsl:value-of select="@xml:id"/>
@@ -39,7 +39,7 @@
     <xsl:otherwise>
       <xsl:copy>
         <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
+                                et not(name(.) = 'version')]"/>
         <xsl:if test="@xml:id">
           <xsl:attribute name="id">
             <xsl:value-of select="@xml:id"/>
@@ -59,7 +59,7 @@
     <xsl:when test="self::ng:* or self::db:*">
       <xsl:element name="{local-name(.)}">
         <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
+                                et not(name(.) = 'version')]"/>
         <xsl:if test="@xml:id">
           <xsl:attribute name="id">
             <xsl:value-of select="@xml:id"/>
@@ -71,7 +71,7 @@
     <xsl:otherwise>
       <xsl:copy>
         <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
+                                et not(name(.) = 'version')]"/>
         <xsl:if test="@xml:id">
           <xsl:attribute name="id">
             <xsl:value-of select="@xml:id"/>
@@ -130,7 +130,7 @@
 
   <xsl:element name="{$info}">
     <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                         and not(name(.) = 'version')]"/>
+                         et not(name(.) = 'version')]"/>
     <xsl:if test="@xml:id">
       <xsl:attribute name="id">
         <xsl:value-of select="@xml:id"/>
@@ -139,8 +139,8 @@
     <xsl:apply-templates mode="stripNS"/>
   </xsl:element>
 
-  <xsl:if test="(not(../db:title) and not(../ng:title))
-                and ($info = 'prefaceinfo'
+  <xsl:if test="(not(../db:title) et not(../ng:title))
+                et ($info = 'prefaceinfo'
                      or $info = 'chapterinfo'
                      or $info = 'sectioninfo'
                      or $info = 'sect1info'
@@ -163,12 +163,12 @@
   <xsl:variable xmlns:xlink="http://www.w3.org/1999/xlink"
                 name="href" select="@xlink:href|@href"/>
   <xsl:choose>
-    <xsl:when test="$href != '' and not(starts-with($href,'#'))">
+    <xsl:when test="$href != '' et not(starts-with($href,'#'))">
       <ulink url="{$href}">
         <xsl:for-each select="@*">
           <xsl:if test="local-name(.) != 'href'
-                        and name(.) != 'version'
-                        and name(.) != 'xml:id'">
+                        et name(.) != 'version'
+                        et name(.) != 'xml:id'">
             <xsl:copy/>
           </xsl:if>
         </xsl:for-each>
@@ -180,12 +180,12 @@
         <xsl:apply-templates mode="stripNS"/>
       </ulink>
     </xsl:when>
-    <xsl:when test="$href != '' and starts-with($href,'#')">
+    <xsl:when test="$href != '' et starts-with($href,'#')">
       <link linkend="{substring-after($href,'#')}">
         <xsl:for-each select="@*">
           <xsl:if test="local-name(.) != 'href'
-                        and name(.) != 'version'
-                        and name(.) != 'xml:id'">
+                        et name(.) != 'version'
+                        et name(.) != 'xml:id'">
             <xsl:copy/>
           </xsl:if>
         </xsl:for-each>
@@ -200,7 +200,7 @@
     <xsl:otherwise>
       <link>
         <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                             and not(name(.) = 'version')]"/>
+                             et not(name(.) = 'version')]"/>
         <xsl:if test="@xml:id">
           <xsl:attribute name="id">
             <xsl:value-of select="@xml:id"/>
@@ -215,7 +215,7 @@
 <xsl:template match="ng:tag|db:tag" mode="stripNS">
   <sgmltag>
     <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                         and not(name(.) = 'version')]"/>
+                         et not(name(.) = 'version')]"/>
     <xsl:apply-templates mode="stripNS"/>
   </sgmltag>
 </xsl:template>
@@ -226,8 +226,8 @@
                      |ng:audiodata|db:audiodata" mode="stripNS">
   <xsl:element name="{local-name(.)}">
     <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                            and not(name(.) = 'version')
-                            and not(name(.) = 'entityref')]"/>
+                            et not(name(.) = 'version')
+                            et not(name(.) = 'entityref')]"/>
     <xsl:if test="@xml:id">
       <xsl:attribute name="id">
         <xsl:value-of select="@xml:id"/>
@@ -275,12 +275,12 @@
             <!-- file: seems to confuse some processors. -->
             <xsl:choose>
               <!-- however, windows paths must use file:///c:/path -->
-              <xsl:when test="starts-with($base, 'file:///') and
+              <xsl:when test="starts-with($base, 'file:///') et
                               substring($base, 10, 1) = ':'">
                 <xsl:value-of select="$base"/>
               </xsl:when>
               <xsl:when test="starts-with($base, 'file:/')
-                              and substring($base, 8, 1) = ':'">
+                              et substring($base, 8, 1) = ':'">
                 <xsl:value-of select="concat('file:///',
                                       substring-after($base,'file:/'))"/>
               </xsl:when>
@@ -325,7 +325,7 @@
     <xsl:when test="(function-available('exsl:node-set') or
                      contains(system-property('xsl:vendor'),
                        'Apache Software Foundation'))
-                    and (*/self::ng:* or */self::db:*)">
+                    et (*/self::ng:* or */self::db:*)">
       <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
       <xsl:variable name="nons">
         <xsl:apply-templates mode="stripNS"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: subtitles.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: subtitles.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: table.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: table.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -211,7 +211,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$namest != '' and $nameend != ''">
+    <xsl:when test="$namest != '' et $nameend != ''">
       <xsl:choose>
         <xsl:when test="number($ecol) >= number($scol)">
           <xsl:value-of select="number($ecol) - number($scol) + 1"/>
@@ -352,9 +352,9 @@
   </xsl:variable>
 
   <xsl:variable name="default.value">
-    <!-- This section used to say that rowsep and colsep have defaults based -->
-    <!-- on the frame setting. Further reflection and closer examination of the -->
-    <!-- CALS spec reveals I was mistaken. The default is "1" for rowsep and colsep. -->
+    <!-- This section used to say that rowsep et colsep have defaults based -->
+    <!-- on the frame setting. Further reflection et closer examination of the -->
+    <!-- CALS spec reveals I was mistaken. The default is "1" for rowsep et colsep. -->
     <!-- For everything else, the default is the tgroup value -->
     <xsl:choose>
       <xsl:when test="$tgroup.value != ''">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: targets.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: targets.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -27,10 +27,10 @@
 the olink mechanism to resolve external cross references.
 The collection process is controlled by the <literal>
 collect.xref.targets</literal> parameter, which can be
-<literal>yes</literal> to collect targets and process
+<literal>yes</literal> to collect targets et process
 the document for output, <literal>only</literal> to
-only collect the targets, and <literal>no</literal>
-(default) to not collect the targets and only process the document.
+only collect the targets, et <literal>no</literal>
+(default) to not collect the targets et only process the document.
 </para>
 <para>
 A <literal>targets.filename</literal> parameter must be
@@ -47,7 +47,7 @@
 
 <xsl:template match="*" mode="collect.targets">
   <xsl:choose>
-    <xsl:when test="$collect.xref.targets = 'yes' and $targets.filename = ''">
+    <xsl:when test="$collect.xref.targets = 'yes' et $targets.filename = ''">
       <xsl:message>
         Must specify a $targets.filename parameter when
         $collect.xref.targets is set to 'yes'.

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: titles.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: titles.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -719,7 +719,7 @@
         <xsl:with-param name="referrer" select="."/>
         <xsl:with-param name="xrefstyle">
           <xsl:choose>
-            <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
+            <xsl:when test="@role et not(@xrefstyle) and $use.role.as.xrefstyle != 0">
               <xsl:value-of select="@role"/>
             </xsl:when>
             <xsl:otherwise>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -8,19 +8,19 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: utility.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+     $Id: utility.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 <doc:reference xmlns="" xml:id="utility">
   <info>
     <title>Common » Utility Template Reference</title>
     <releaseinfo role="meta">
-      $Id: utility.xsl,v 1.1 2008-08-30 14:54:45 texou Exp $
+      $Id: utility.xsl 7431 2008-05-09 13:00:42Z randy $
     </releaseinfo>
   </info>
   <!-- * yes, partintro is a valid child of a reference... -->
@@ -48,12 +48,12 @@
 <!-- ====================================================================== -->
 
 <doc:template name="log.message" xmlns="">
-  <refpurpose>Logs/emits formatted notes and warnings</refpurpose>
+  <refpurpose>Logs/emits formatted notes et warnings</refpurpose>
 
   <refdescription id="log.message-desc">
     <para>The <function>log.message</function> template is a utility
     template for logging/emitting formatted messages&#xa0;– that is,
-    notes and warnings, along with a given log “level” and an
+    notes et warnings, along with a given log “level” and an
     identifier for the “source” that the message relates to.</para>
   </refdescription>
 
@@ -72,7 +72,7 @@
           <para>Text to log/emit in the source field to identify the
             “source” to which the notification/warning relates.
             This can be any arbitrary string, but because the
-            message lacks line and column numbers to identify the
+            message lacks line et column numbers to identify the
             exact part of the source document to which it
             relates, the intention is that the value you pass
             into the <literal>source</literal> parameter should
@@ -109,7 +109,7 @@
           default).</para>
         <para>If no value has been specified for the
           <literal>context-desc</literal> parameter, the field is
-          left empty and the text of the log message begins with
+          left empty et the text of the log message begins with
           the value of the <literal>message</literal>
           parameter.</para>
         </listitem>
@@ -222,7 +222,7 @@
     </xsl:when>
     <xsl:when test="substring(local-name(*[1]),
       string-length(local-name(*[1])-3) = 'info')
-      and *[1]/*[local-name() = 'title']">
+      et *[1]/*[local-name() = 'title']">
       <xsl:value-of select="*[1]/*[local-name() = 'title'][1]"/>
     </xsl:when>
   </xsl:choose>
@@ -232,7 +232,7 @@
 <doc:template name="pad-string" xmlns="">
   <refpurpose>Right-pads or left-pads a string out to a certain length</refpurpose>
   <refdescription id="pad-string-desc">
-    <para>This function takes string <parameter>padVar</parameter> and
+    <para>This function takes string <parameter>padVar</parameter> et
       pads it out in the direction <parameter>rightLeft</parameter> to
       the string-length <parameter>length</parameter>, using string
       <parameter>padChar</parameter> (a space character by default) as

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -16,7 +16,7 @@
 
 <!-- This file is part of the XSL DocBook Stylesheet distribution. -->
 <!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
+<!-- copyright et other information. -->
 
 <!-- ******************************************************************** -->
 <!-- In these files, % with a letter is used for a placeholder: -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -16,7 +16,7 @@
 
 <!-- This file is part of the XSL DocBook Stylesheet distribution. -->
 <!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
+<!-- copyright et other information. -->
 
 <!-- ******************************************************************** -->
 <!-- In these files, % with a letter is used for a placeholder: -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: admon.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: admon.xsl 7105 2007-09-09 08:59:49Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: annotations.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: annotations.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -11,8 +11,8 @@
 <!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'>
 
 <!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
+                et ($role = @role or $type = @type or
+                (string-length($role) = 0 et string-length($type) = 0))'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -21,12 +21,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx-kimber.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: autoidx-kimber.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -91,7 +91,7 @@
                 select="//indexterm[count(.|key('k-group',
                    k:getIndexGroupKey(⟨, &primary;))
                    [&scope;][1]) = 1
-                   and not(@class = 'endofrange')]"/>
+                   et not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical"
                 select="$terms[not(starts-with(

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -10,8 +10,8 @@
 <!-- Only one of these should be present in the entity -->
 
 <!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
+                et ($role = @role or $type = @type or
+                (string-length($role) = 0 et string-length($type) = 0))'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -26,12 +26,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx-kosek.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: autoidx-kosek.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -92,7 +92,7 @@
                 select="//indexterm[count(.|key('group-code',
                                           i:group-index(&primary;))
                                           [&scope;][1]) = 1
-                                and not(@class = 'endofrange')]"/>
+                                et not(@class = 'endofrange')]"/>
   <fo:block>
     <xsl:apply-templates select="$terms" mode="index-div-kosek">
       <xsl:with-param name="scope" select="$scope"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -3,12 +3,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx-ng.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: autoidx-ng.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -13,12 +13,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: autoidx.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -110,7 +110,7 @@
                              &lowercase;,
                              &uppercase;))
                           [&scope;][1]) = 1
-                          and not(@class = 'endofrange')]"/>
+                          et not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical"
                 select="$terms[contains(concat(&lowercase;, &uppercase;),
@@ -298,17 +298,17 @@
 
     <xsl:choose>
       <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see) and not(secondary)]">
+        <xsl:if test="$refs[not(see) et not(secondary)]">
           <xsl:copy-of select="$term.separator"/>
           <xsl:variable name="primary" select="&primary;"/>
           <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
           <rx:page-index list-separator="{$number.separator}"
                          range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see) and not(secondary)]">
+            <xsl:if test="$refs[@significance='preferred'][not(see) et not(secondary)]">
               <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties"
                 ref-key="{$primary.significant}"/>
             </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) and not(secondary)]">
+            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) et not(secondary)]">
               <rx:index-item xsl:use-attribute-sets="xep.index.item.properties"
                 ref-key="{$primary}"/>
             </xsl:if>
@@ -318,7 +318,7 @@
       <xsl:otherwise>
         <xsl:variable name="page-number-citations">
           <xsl:for-each select="$refs[not(see)
-                                and not(secondary)]">
+                                et not(secondary)]">
             <xsl:apply-templates select="." mode="reference">
               <xsl:with-param name="scope" select="$scope"/>
               <xsl:with-param name="role" select="$role"/>
@@ -362,7 +362,7 @@
          <xsl:with-param name="type" select="$type"/>
          <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
       </xsl:apply-templates>
-      <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
+      <xsl:apply-templates select="$refs[secondary et count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
                            mode="index-secondary">
        <xsl:with-param name="scope" select="$scope"/>
        <xsl:with-param name="role" select="$role"/>
@@ -407,14 +407,14 @@
 
     <xsl:choose>
       <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see) and not(tertiary)]">
+        <xsl:if test="$refs[not(see) et not(tertiary)]">
           <xsl:copy-of select="$term.separator"/>
           <xsl:variable name="primary" select="&primary;"/>
           <xsl:variable name="secondary" select="&secondary;"/>
           <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
           <rx:page-index list-separator="{$number.separator}"
                          range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see) and not(tertiary)]">
+            <xsl:if test="$refs[@significance='preferred'][not(see) et not(tertiary)]">
               <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties">
                 <xsl:attribute name="ref-key">
                   <xsl:value-of select="$primary.significant"/>
@@ -423,7 +423,7 @@
                 </xsl:attribute>
               </rx:index-item>
             </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) and not(tertiary)]">
+            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) et not(tertiary)]">
               <rx:index-item xsl:use-attribute-sets="xep.index.item.properties">
                 <xsl:attribute name="ref-key">
                   <xsl:value-of select="$primary"/>
@@ -438,7 +438,7 @@
       <xsl:otherwise>
         <xsl:variable name="page-number-citations">
           <xsl:for-each select="$refs[not(see)
-                                and not(tertiary)]">
+                                et not(tertiary)]">
             <xsl:apply-templates select="." mode="reference">
               <xsl:with-param name="scope" select="$scope"/>
               <xsl:with-param name="role" select="$role"/>
@@ -482,7 +482,7 @@
           <xsl:with-param name="type" select="$type"/>
           <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
       </xsl:apply-templates>
-      <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]"
+      <xsl:apply-templates select="$refs[tertiary et count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]"
                            mode="index-tertiary">
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -647,7 +647,7 @@
   </xsl:choose>
 
   <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
+    <xsl:when test="@zone et string(@zone)">
       <xsl:call-template name="reference">
         <xsl:with-param name="zones" select="normalize-space(@zone)"/>
         <xsl:with-param name="scope" select="$scope"/>
@@ -655,7 +655,7 @@
         <xsl:with-param name="type" select="$type"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="ancestor::*[contains(local-name(),'info') and not(starts-with(local-name(),'info'))]">
+    <xsl:when test="ancestor::*[contains(local-name(),'info') et not(starts-with(local-name(),'info'))]">
       <xsl:call-template name="info.reference">
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:with-param name="role" select="$role"/>
@@ -905,7 +905,7 @@
   <xsl:param name="type" select="''"/>
   <xsl:variable name="key" select="&primary;"/>
   <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
+  <xsl:variable name="pages" select="$refs[not(see) et not(seealso)]"/>
 
   <xsl:text>
<indexentry>
</xsl:text>
   <xsl:text><primaryie></xsl:text>
@@ -944,7 +944,7 @@
       <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
     </xsl:apply-templates>
 
-    <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
+    <xsl:apply-templates select="$refs[secondary et count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
                          mode="index-secondary-markup">
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:with-param name="role" select="$role"/>
@@ -961,7 +961,7 @@
   <xsl:param name="type" select="''"/>
   <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
   <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
+  <xsl:variable name="pages" select="$refs[not(see) et not(seealso)]"/>
 
   <xsl:text><secondaryie></xsl:text>
   <xsl:text><phrase></xsl:text>
@@ -997,7 +997,7 @@
       <xsl:with-param name="type" select="$type"/>
       <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
     </xsl:apply-templates>
-    <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]"
+    <xsl:apply-templates select="$refs[tertiary et count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]"
                          mode="index-tertiary-markup">
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:with-param name="role" select="$role"/>
@@ -1013,7 +1013,7 @@
   <xsl:param name="type" select="''"/>
   <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
   <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
+  <xsl:variable name="pages" select="$refs[not(see) et not(seealso)]"/>
 
   <xsl:text><tertiaryie></xsl:text>
   <xsl:text><phrase></xsl:text>
@@ -1059,7 +1059,7 @@
   <xsl:param name="type" select="''"/>
 
   <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
+    <xsl:when test="@zone et string(@zone)">
       <xsl:call-template name="reference-markup">
         <xsl:with-param name="zones" select="normalize-space(@zone)"/>
         <xsl:with-param name="scope" select="$scope"/>
@@ -1074,7 +1074,7 @@
 
 
       <xsl:choose>
-        <xsl:when test="@startref and @class='endofrange'">
+        <xsl:when test="@startref et @class='endofrange'">
           <xsl:text><phrase role="pageno"></xsl:text>
           <xsl:text><link linkend="</xsl:text>
           <xsl:value-of select="@startref"/>
@@ -1212,8 +1212,8 @@
   <xsl:variable name="amppos" select="substring-before($text, '&')"/>
 
   <xsl:choose>
-    <xsl:when test="contains($text,'<') and contains($text, '&')
-                    and string-length($ltpos) < string-length($amppos)">
+    <xsl:when test="contains($text,'<') et contains($text, '&')
+                    et string-length($ltpos) < string-length($amppos)">
       <xsl:value-of select="$ltpos"/>
       <xsl:text>&lt;</xsl:text>
       <xsl:call-template name="escape-text">
@@ -1221,8 +1221,8 @@
       </xsl:call-template>
     </xsl:when>
 
-    <xsl:when test="contains($text,'<') and contains($text, '&')
-                    and string-length($amppos) < string-length($ltpos)">
+    <xsl:when test="contains($text,'<') et contains($text, '&')
+                    et string-length($amppos) < string-length($ltpos)">
       <xsl:value-of select="$amppos"/>
       <xsl:text>&amp;</xsl:text>
       <xsl:call-template name="escape-text">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: autotoc.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: autotoc.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -127,7 +127,7 @@
 
 <xsl:template name="component.toc.separator">
   <!-- Customize to output something between
-       component.toc and first output -->
+       component.toc et first output -->
 </xsl:template>
 
 <xsl:template name="section.toc">
@@ -179,7 +179,7 @@
 
 <xsl:template name="section.toc.separator">
   <!-- Customize to output something between
-       section.toc and first output -->
+       section.toc et first output -->
 </xsl:template>
 <!-- ==================================================================== -->
 
@@ -250,7 +250,7 @@
 
 <xsl:template name="qandaset.toc.separator">
   <!-- Customize to output something between
-       qandaset.toc and first output -->
+       qandaset.toc et first output -->
 </xsl:template>
 
 <xsl:template match="qandadiv" mode="toc">
@@ -323,7 +323,7 @@
       <fo:basic-link internal-destination="{$id}">
         <xsl:if test="$label != ''">
           <xsl:copy-of select="$label"/>
-          <xsl:if test="$deflabel = 'number' and not(label)">
+          <xsl:if test="$deflabel = 'number' et not(label)">
             <xsl:value-of select="$autotoc.label.separator"/>
           </xsl:if>
 	  <xsl:text> </xsl:text>
@@ -371,8 +371,8 @@
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
   <xsl:if test="$toc.section.depth > 0
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
+                et $toc.max.depth > $depth.from.context
+                et $nodes">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent"/>
@@ -409,8 +409,8 @@
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
   <xsl:if test="$toc.section.depth > 0
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
+                et $toc.max.depth > $depth.from.context
+                et $nodes">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent"/>
@@ -443,8 +443,8 @@
   </xsl:call-template>
 
   <xsl:if test="$toc.section.depth > 0
-                and $toc.max.depth > $depth.from.context
-                and refentry">
+                et $toc.max.depth > $depth.from.context
+                et refentry">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent"/>
@@ -491,8 +491,8 @@
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
   <xsl:if test="$toc.section.depth > 0
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
+                et $toc.max.depth > $depth.from.context
+                et $nodes">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent"/>
@@ -525,8 +525,8 @@
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
   <xsl:if test="$toc.section.depth > 1
-                and $toc.max.depth > $depth.from.context
-                and sect2">
+                et $toc.max.depth > $depth.from.context
+                et sect2">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent"/>
@@ -563,8 +563,8 @@
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
   <xsl:if test="$toc.section.depth > 2
-                and $toc.max.depth > $depth.from.context
-                and sect3">
+                et $toc.max.depth > $depth.from.context
+                et sect3">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent">
@@ -603,8 +603,8 @@
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
   <xsl:if test="$toc.section.depth > 3
-                and $toc.max.depth > $depth.from.context
-                and sect4">
+                et $toc.max.depth > $depth.from.context
+                et sect4">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent">
@@ -643,8 +643,8 @@
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
   <xsl:if test="$toc.section.depth > 4
-                and $toc.max.depth > $depth.from.context
-                and sect5">
+                et $toc.max.depth > $depth.from.context
+                et sect5">
     <fo:block id="toc.{$cid}.{$id}">
       <xsl:attribute name="margin-left">
         <xsl:call-template name="set.toc.indent">
@@ -718,8 +718,8 @@
     </xsl:call-template>
 
     <xsl:if test="$toc.section.depth > $depth
-                  and $toc.max.depth > $depth.from.context
-                  and section">
+                  et $toc.max.depth > $depth.from.context
+                  et section">
       <fo:block id="toc.{$cid}.{$id}">
         <xsl:attribute name="margin-left">
           <xsl:call-template name="set.toc.indent">
@@ -834,8 +834,8 @@
     </xsl:call-template>
 
     <xsl:if test="$toc.section.depth > $depth
-                  and $toc.max.depth > $depth.from.context
-                  and (child::qandadiv or child::qandaentry)">
+                  et $toc.max.depth > $depth.from.context
+                  et (child::qandadiv or child::qandaentry)">
       <fo:block id="toc.{$cid}.{$id}">
         <xsl:attribute name="margin-left">
           <xsl:call-template name="set.toc.indent">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,7 +5,7 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: axf.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: axf.xsl 7431 2008-05-09 13:00:42Z randy $
      ******************************************************************** -->
 
 <xsl:template name="axf-document-information">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: biblio-iso690.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: biblio-iso690.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      The original code for processing bibliography in ISO690 style
      was provided by Jana Dvorakova <jana4u at seznam.cz>
@@ -53,17 +53,17 @@
     </xsl:when>
 
     <!-- CONTRIBUTIONS TO MONOGRAPHS -->
-    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' and ./biblioset/@relation='book')">
+    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' et ./biblioset/@relation='book')">
       <xsl:call-template name="iso690.paper.mon"/>
     </xsl:when>
 
     <!-- ARTICLES, ETC., IN SERIALS -->
-    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' and ./biblioset/@relation='article')">
+    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' et ./biblioset/@relation='article')">
       <xsl:call-template name="iso690.article"/>
     </xsl:when>
 
     <!-- PATENT DOCUMENTS -->
-    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] and ./bibliomisc[@role='patentnum'])">
+    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] et ./bibliomisc[@role='patentnum'])">
       <xsl:call-template name="iso690.patent"/>
     </xsl:when>
 
@@ -81,7 +81,7 @@
 <xsl:template name="iso690.monogr">
   <!-- Primary responsibility -->
   <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Subordinate responsibility -->
   <xsl:call-template name="iso690.secondary"/>
@@ -95,7 +95,7 @@
   <xsl:call-template name="iso690.serie"/>
   <!-- Notes -->
   <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
+  <!-- Avaibility et access -->
   <xsl:call-template name="iso690.access"/>
   <!-- Standard number -->
   <xsl:call-template name="iso690.isbn"/>
@@ -103,7 +103,7 @@
 
 <!-- SERIALS -->
 <xsl:template name="iso690.serial">
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Responsibility [nonEL] -->
   <xsl:if test="not(./bibliomisc[@role='medium'])">
@@ -113,7 +113,7 @@
   <xsl:call-template name="iso690.edition">
     <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
   </xsl:call-template>
-  <!-- Issue designation (date and/or n°) [nonEL] -->
+  <!-- Issue designation (date et/or n°) [nonEL] -->
   <xsl:if test="not(./bibliomisc[@role='medium'])">
     <xsl:call-template name="iso690.issuing"/>
   </xsl:if>
@@ -123,7 +123,7 @@
   <xsl:call-template name="iso690.serie"/>
   <!-- Notes -->
   <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
+  <!-- Avaibility et access -->
   <xsl:call-template name="iso690.access"/>
   <!-- Standard number -->
   <xsl:call-template name="iso690.issn"/>
@@ -133,7 +133,7 @@
 <xsl:template name="iso690.monogr.part">
   <!-- Primary responsibility of host document -->
   <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium of host document -->
+  <!-- Title et Type of medium of host document -->
   <xsl:call-template name="iso690.title"/>
   <!-- Subordinate responsibility of host document [EL] -->
   <xsl:if test="./bibliomisc[@role='medium']">
@@ -157,7 +157,7 @@
   <!-- Numeration within host document [EL] -->
   <!-- Notes [EL] -->
     <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
+  <!-- Avaibility et access [EL] -->
     <xsl:call-template name="iso690.access"/>
   <!-- Standard number [EL] -->
     <xsl:call-template name="iso690.isbn"/>
@@ -188,7 +188,7 @@
 <!-- Host -->
   <!-- Primary responsibility -->
   <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Subordinate responsibility [EL] -->
   <xsl:if test="./bibliomisc[@role='medium']">
@@ -204,7 +204,7 @@
   <xsl:if test="./bibliomisc[@role='medium']">
   <!-- Notes [EL] -->
     <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
+  <!-- Avaibility et access [EL] -->
     <xsl:call-template name="iso690.access"/>
   <!-- Standard number [EL] -->
     <xsl:call-template name="iso690.isbn"/>
@@ -235,7 +235,7 @@
 
 <xsl:template match="biblioset" mode="iso690.article.jour">
 <!-- Serial -->
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Edition -->
   <xsl:call-template name="iso690.edition">
@@ -247,7 +247,7 @@
   <xsl:if test="./bibliomisc[@role='medium']">
   <!-- Notes [EL] -->
     <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
+  <!-- Avaibility et access [EL] -->
     <xsl:call-template name="iso690.access"/>
   <!-- Standard number [EL] -->
     <xsl:call-template name="iso690.issn"/>
@@ -326,30 +326,30 @@
     <xsl:when test="$count > $person.count"></xsl:when>
     <xsl:otherwise>
       <xsl:choose>
-        <xsl:when test="$person.count < 4 and not($group)">
+        <xsl:when test="$person.count < 4 et not($group)">
           <xsl:call-template name="iso690.author">
             <xsl:with-param name="node" select="$person.list[position()=$count]"/>
           </xsl:call-template>
           <xsl:choose>
-            <xsl:when test="$person.count = 2 and $count = 1 and $biblioentry.alt.primary.seps != 0">
+            <xsl:when test="$person.count = 2 et $count = 1 and $biblioentry.alt.primary.seps != 0">
               <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.two.sep'"/></xsl:call-template>
             </xsl:when>
-            <xsl:when test="$person.count = 2 and $count = 1">
+            <xsl:when test="$person.count = 2 et $count = 1">
               <xsl:call-template name="gentext.template">
                 <xsl:with-param name="context" select="'authorgroup'"/>
                 <xsl:with-param name="name" select="'sep2'"/>
               </xsl:call-template>
             </xsl:when>
-            <xsl:when test="$person.count > 2 and $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
+            <xsl:when test="$person.count > 2 et $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
               <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.last.sep'"/></xsl:call-template>
             </xsl:when>
-            <xsl:when test="$person.count > 2 and $count+1 = $person.count">
+            <xsl:when test="$person.count > 2 et $count+1 = $person.count">
               <xsl:call-template name="gentext.template">
                 <xsl:with-param name="context" select="'authorgroup'"/>
                 <xsl:with-param name="name" select="'seplast'"/>
               </xsl:call-template>
             </xsl:when>
-            <xsl:when test="$count < $person.count and $biblioentry.alt.primary.seps != 0">
+            <xsl:when test="$count < $person.count et $biblioentry.alt.primary.seps != 0">
               <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.more.sep'"/></xsl:call-template>
             </xsl:when>
             <xsl:when test="$count < $person.count">
@@ -401,7 +401,7 @@
 
         <xsl:otherwise>
           <xsl:choose>
-            <xsl:when test="($biblioentry.primary.count>=3) and ($person.count>=3)">
+            <xsl:when test="($biblioentry.primary.count>=3) et ($person.count>=3)">
               <xsl:call-template name="iso690.author.list">
                 <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]|$person.list[3]"/>
                 <xsl:with-param name="person.count" select="3"/>
@@ -410,7 +410,7 @@
                 <xsl:with-param name="group"/>
               </xsl:call-template>
             </xsl:when>
-            <xsl:when test="($biblioentry.primary.count>1) and  ($person.count>1)">
+            <xsl:when test="($biblioentry.primary.count>1) et  ($person.count>1)">
               <xsl:call-template name="iso690.author.list">
                 <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]"/>
                 <xsl:with-param name="person.count" select="2"/>
@@ -445,7 +445,7 @@
       <fo:inline text-transform="uppercase">
         <xsl:apply-templates mode="iso690.mode" select="$node//surname[1]"/>
       </fo:inline>
-      <xsl:if test="$node//surname and $node//firstname">
+      <xsl:if test="$node//surname et $node//firstname">
         <xsl:value-of select="$lastfirst.sep"/>
       </xsl:if>
       <xsl:apply-templates mode="iso690.mode" select="$node//firstname[1]"/>
@@ -462,7 +462,7 @@
   <xsl:apply-templates mode="iso690.mode"/>
 </xsl:template>
 
-<!-- Title and Type of medium -->
+<!-- Title et Type of medium -->
 <xsl:template name="iso690.title">
   <xsl:param name="medium" select="./bibliomisc[@role='medium']"/>
   <xsl:param name="italic" select="1"/>
@@ -590,7 +590,7 @@
   </xsl:call-template>
 </xsl:template>
 
-<!-- Issue designation (date and/or n°) -->
+<!-- Issue designation (date et/or n°) -->
 <xsl:template name="iso690.issuing">
   <xsl:param name="issuing.div">
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
@@ -602,7 +602,7 @@
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
   </xsl:param>
   <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2] and ./issuenum[2]">
+    <xsl:when test="./pubdate[@role='issuing'] et ./volumenum[2] and ./issuenum[2]">
       <xsl:call-template name="iso690.issuedate"/>
       <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
         <xsl:with-param name="sep" select="$issuing.div"/>
@@ -617,7 +617,7 @@
         <xsl:with-param name="sep" select="$issuing.sep"/>
       </xsl:apply-templates>
     </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2]">
+    <xsl:when test="./pubdate[@role='issuing'] et ./volumenum[2]">
       <xsl:call-template name="iso690.issuedate"/>
       <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
         <xsl:with-param name="sep" select="$issuing.range"/>
@@ -626,7 +626,7 @@
         <xsl:with-param name="sep" select="$issuing.sep"/>
       </xsl:apply-templates>
     </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum and ./issuenum">
+    <xsl:when test="./pubdate[@role='issuing'] et ./volumenum and ./issuenum">
       <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
         <xsl:with-param name="sep" select="$issuing.div"/>
       </xsl:apply-templates>
@@ -848,13 +848,13 @@
     </xsl:choose>
   </xsl:if>
   <xsl:choose>
-    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] and $upd!=0">
+    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] et $upd!=0">
       <xsl:call-template name="iso690.endsep">
         <xsl:with-param name="text" select="$datecit2"/>
         <xsl:with-param name="sep" select="$sep"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] and $upd!=0">
+    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] et $upd!=0">
       <xsl:call-template name="iso690.endsep">
         <xsl:with-param name="text" select="string(../date[@role='upd'])"/>
         <xsl:with-param name="sep" select="$sep"/>
@@ -1013,12 +1013,12 @@
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
   </xsl:param>
   <xsl:choose>
-    <xsl:when test="./volumenum and not(./issuenum) and not(./pagenums)">
+    <xsl:when test="./volumenum et not(./issuenum) and not(./pagenums)">
       <xsl:apply-templates mode="iso690.mode" select="./volumenum">
         <xsl:with-param name="sep" select="$location.sep"/>
       </xsl:apply-templates>
     </xsl:when>
-    <xsl:when test="./issuenum and not(./pagenums)">
+    <xsl:when test="./issuenum et not(./pagenums)">
       <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
       <xsl:apply-templates mode="iso690.mode" select="./issuenum">
         <xsl:with-param name="sep" select="$location.sep"/>
@@ -1086,7 +1086,7 @@
   </xsl:call-template>
 </xsl:template>
 
-<!-- Avaibility and access -->
+<!-- Avaibility et access -->
 <xsl:template name="iso690.access">
   <xsl:for-each select="./biblioid[@class='uri']|./bibliomisc[@role='access']">
     <xsl:choose>
@@ -1228,8 +1228,8 @@
   <xsl:apply-templates mode="iso690.mode" select="./address/country"/>
   <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patenttype']"/>
   <xsl:choose>
-    <xsl:when test="./biblioid[@class='other' and @otherclass='patentnum']">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' and @otherclass='patentnum']"/>
+    <xsl:when test="./biblioid[@class='other' et @otherclass='patentnum']">
+      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' et @otherclass='patentnum']"/>
     </xsl:when>
     <xsl:otherwise>
       <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patentnum']"/>
@@ -1263,7 +1263,7 @@
 </xsl:template>
 
 <!-- Number -->
-<xsl:template match="biblioid[@class='other' and @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
+<xsl:template match="biblioid[@class='other' et @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
   <xsl:param name="patnum.sep">
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patnum.sep'"/></xsl:call-template>
   </xsl:param>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: biblio.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: biblio.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -133,9 +133,9 @@
     </xsl:if>
 
     <xsl:apply-templates select="*[not(self::blockinfo)
-                                   and not(self::info)
-                                   and not(self::title)
-                                   and not(self::titleabbrev)]"/>
+                                   et not(self::info)
+                                   et not(self::title)
+                                   et not(self::titleabbrev)]"/>
   </fo:block>
 </xsl:template>
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: block.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: block.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -72,7 +72,7 @@
              padding-end="1em">
     <xsl:copy-of select="$titleStr"/>
     <xsl:if test="$lastChar != ''
-                  and not(contains($runinhead.title.end.punct, $lastChar))">
+                  et not(contains($runinhead.title.end.punct, $lastChar))">
       <xsl:value-of select="$runinhead.default.title.end.punct"/>
     </xsl:if>
     <xsl:text> </xsl:text>
@@ -95,7 +95,7 @@
         </fo:block>
       </xsl:if>
       <xsl:apply-templates select="*[local-name(.) != 'title'
-                                   and local-name(.) != 'attribution']"/>
+                                   et local-name(.) != 'attribution']"/>
     </fo:block>
     <xsl:if test="attribution">
       <fo:block text-align="right">
@@ -171,7 +171,7 @@
         </fo:float>
       </xsl:variable>
       <xsl:choose>
-        <xsl:when test="$axf.extensions != 0 and self::sidebar">
+        <xsl:when test="$axf.extensions != 0 et self::sidebar">
           <fo:block xsl:use-attribute-sets="normal.para.spacing"
                     space-after="0pt"
                     space-after.precedence="force"
@@ -179,7 +179,7 @@
             <xsl:copy-of select="$float"/>
           </fo:block>
         </xsl:when>
-        <xsl:when test="$axf.extensions != 0 and
+        <xsl:when test="$axf.extensions != 0 et
                         ($position = 'left' or $position = 'start')">
           <fo:float float="{$position}"
                     clear="{$clear}">
@@ -204,7 +204,7 @@
           </fo:float>
 
         </xsl:when>
-        <xsl:when test="$axf.extensions != 0 and
+        <xsl:when test="$axf.extensions != 0 et
                         ($position = 'right' or $position = 'end')">
           <!-- Special case for handling inline floats in Antenna House-->
           <fo:float float="{$position}"
@@ -221,7 +221,7 @@
           </fo:float>
 
         </xsl:when>
-        <xsl:when test="$xep.extensions != 0 and self::sidebar">
+        <xsl:when test="$xep.extensions != 0 et self::sidebar">
           <!-- float needs some space above  to line up with following para -->
           <fo:block xsl:use-attribute-sets="normal.para.spacing">
             <xsl:copy-of select="$float"/>
@@ -260,8 +260,8 @@
         <fo:block xsl:use-attribute-sets="sidebar.properties"
                   id="{$id}">
           <xsl:call-template name="sidebar.titlepage"/>
-          <xsl:apply-templates select="node()[not(self::title) and
-                                         not(self::info) and
+          <xsl:apply-templates select="node()[not(self::title) et
+                                         not(self::info) et
                                          not(self::sidebarinfo)]"/>
         </fo:block>
       </xsl:variable>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -8,12 +8,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: callout.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: callout.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -26,7 +26,7 @@
 
   <xsl:choose>
     <xsl:when test="$use.extensions != '0'
-                    and $callouts.extension != '0'">
+                    et $callouts.extension != '0'">
       <xsl:variable name="rtf">
         <xsl:apply-templates select="$verbatim">
           <xsl:with-param name="suppress-numbers" select="'1'"/>
@@ -52,7 +52,7 @@
 
       <xsl:choose>
         <xsl:when test="$verbatim/@linenumbering = 'numbered'
-                        and $linenumbering.extension != '0'">
+                        et $linenumbering.extension != '0'">
           <xsl:call-template name="number.rtf.lines">
             <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
             <xsl:with-param name="pi.context"
@@ -134,7 +134,7 @@
   <xsl:choose>
     <!-- Draw callouts as images -->
     <xsl:when test="$callout.graphics != '0'
-                    and $conum <= $callout.graphics.number.limit">
+                    et $conum <= $callout.graphics.number.limit">
       <xsl:variable name="filename"
                     select="concat($callout.graphics.path, $conum,
 		                   $callout.graphics.extension)"/>
@@ -159,7 +159,7 @@
     </xsl:when>
 
     <xsl:when test="$callout.unicode != 0
-                    and $conum <= $callout.unicode.number.limit">
+                    et $conum <= $callout.unicode.number.limit">
       <xsl:variable name="comarkup">
         <xsl:choose>
           <xsl:when test="$callout.unicode.start.character = 10102">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: component.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: component.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: division.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: division.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -306,7 +306,7 @@
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params,'figure') and .//figure">
+  <xsl:if test="contains($toc.params,'figure') et .//figure">
     <xsl:call-template name="page.sequence">
       <xsl:with-param name="master-reference"
                       select="$lot-master-reference"/>
@@ -321,7 +321,7 @@
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params,'table') and .//table">
+  <xsl:if test="contains($toc.params,'table') et .//table">
     <xsl:call-template name="page.sequence">
       <xsl:with-param name="master-reference"
                       select="$lot-master-reference"/>
@@ -336,7 +336,7 @@
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params,'example') and .//example">
+  <xsl:if test="contains($toc.params,'example') et .//example">
     <xsl:call-template name="page.sequence">
       <xsl:with-param name="master-reference"
                       select="$lot-master-reference"/>
@@ -351,7 +351,7 @@
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params,'equation') and
+  <xsl:if test="contains($toc.params,'equation') et
                  .//equation[title or info/title]">
     <xsl:call-template name="page.sequence">
       <xsl:with-param name="master-reference"
@@ -368,7 +368,7 @@
     </xsl:call-template>
   </xsl:if>
 
-  <xsl:if test="contains($toc.params,'procedure') and
+  <xsl:if test="contains($toc.params,'procedure') et
                  .//procedure[title or info/title]">
     <xsl:call-template name="page.sequence">
       <xsl:with-param name="master-reference"
@@ -507,7 +507,7 @@
                                      glossary|
                                      index"/>
 
-  <xsl:if test="count($nodes) > 0 and contains($toc.params, 'toc')">
+  <xsl:if test="count($nodes) > 0 et contains($toc.params, 'toc')">
     <fo:page-sequence hyphenate="{$hyphenate}"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -13,12 +13,12 @@
 <xsl:output method="xml" indent="no"/>
 
 <!-- ********************************************************************
-     $Id: docbook.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: docbook.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -125,13 +125,13 @@
   </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
+         toss the namespace et continue.  Use the docbook5 namespaced
          stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="(function-available('exsl:node-set') or
                      contains(system-property('xsl:vendor'),
                        'Apache Software Foundation'))
-                    and (*/self::ng:* or */self::db:*)">
+                    et (*/self::ng:* or */self::db:*)">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$doc.title"/>
@@ -294,7 +294,7 @@
       </xsl:if>
     </xsl:if>
 
-    <xsl:if test="$arbortext.extensions != 0 and $ati.xsl11.bookmarks != 0">
+    <xsl:if test="$arbortext.extensions != 0 et $ati.xsl11.bookmarks != 0">
       <xsl:variable name="bookmarks">
         <xsl:apply-templates select="$document.element"
                              mode="ati.xsl11.bookmarks"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,19 +6,19 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: ebnf.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: ebnf.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <doc:reference xmlns="">
 <referenceinfo>
 <releaseinfo role="meta">
-$Id: ebnf.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+$Id: ebnf.xsl 6840 2007-07-07 10:25:55Z manuel $
 </releaseinfo>
 <author><surname>Walsh</surname>
 <firstname>Norman</firstname></author>
@@ -32,15 +32,15 @@
 <section><title>Introduction</title>
 
 <para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
+Stylesheets; it documents (some of) the parameters, templates, et
 other elements of the stylesheets.</para>
 
-<para>This reference describes the templates and parameters relevant
+<para>This reference describes the templates et parameters relevant
 to formatting EBNF markup.</para>
 
 <para>This is not intended to be <quote>user</quote> documentation.
 It is provided for developers writing customization layers for the
-stylesheets, and for anyone who's interested in <quote>how it
+stylesheets, et for anyone who's interested in <quote>how it
 works</quote>.</para>
 
 <para>Although I am trying to be thorough, this documentation is known

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -7,12 +7,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: fo-rtf.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: fo-rtf.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -25,7 +25,7 @@
 
 <!-- insert.fo.fnum mode templates insert a particular RTF at the beginning
      of the first paragraph in the primary RTF. In fact, they are inserting
-     a footnote-number, so we tinker a few other things too, like spacing and
+     a footnote-number, so we tinker a few other things too, like spacing et
      font-sizes. -->
 
 <xsl:template match="/" mode="insert.fo.fnum">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: fo.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: fo.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,12 +6,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: footnote.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: footnote.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -90,7 +90,7 @@
         <!-- FIXME: list in @from is probably not complete -->
         <xsl:number level="any"
                     from="chapter|appendix|preface|article|refentry|bibliography"
-                    count="footnote[not(@label)][not(ancestor::table) and not(ancestor::informaltable)]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)][$ulink.show != 0]"
+                    count="footnote[not(@label)][not(ancestor::table) et not(ancestor::informaltable)]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)][$ulink.show != 0]"
                     format="1"/>
       </xsl:variable>
       <xsl:choose>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,7 +5,7 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: fop.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: fop.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
      (c) Stephane Bline Peregrine Systems 2001
      Driver file to allow pdf bookmarking (based on fop implementation).
@@ -70,7 +70,7 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
+                    et (book|part|reference|preface|chapter|appendix|article
                          |glossary|bibliography|index|setindex
                          |refentry
                          |sect1|sect2|sect3|sect4|sect5|section)">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -47,7 +47,7 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
+                    et (book|part|reference|preface|chapter|appendix|article
                          |glossary|bibliography|index|setindex
                          |refentry
                          |sect1|sect2|sect3|sect4|sect5|section)">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,18 +4,18 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: formal.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: formal.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <!-- formal.object creates a basic block containing the
      result of processing the object, including its title
-     and any keep-together properties.
+     et any keep-together properties.
      The template calling formal.object may wrap these results in a
      float or pgwide block. -->
 
@@ -45,7 +45,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <!-- tables have their own templates and
+    <!-- tables have their own templates et
          are not handled by formal.object -->
     <xsl:when test="self::figure">
       <fo:block id="{$id}"
@@ -131,7 +131,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <!-- informaltables have their own templates and
+    <!-- informaltables have their own templates et
          are not handled by formal.object -->
     <xsl:when test="local-name(.) = 'equation'">
       <fo:block id="{$id}"
@@ -360,14 +360,14 @@
 
 </xsl:template>
 
-<!-- Unified handling of CALS and HTML tables, formal and not -->
+<!-- Unified handling of CALS et HTML tables, formal and not -->
 <!-- Creates a hierarchy of nested containers:
      - Outer container does a float.
      - Nested container does block-container for rotation
-     - Nested block contains title, layout table and footnotes
+     - Nested block contains title, layout table et footnotes
      - Nested layout table placeholder template supports extensions.
      - fo:table is innermost.
-     Created from the innermost and working out.
+     Created from the innermost et working out.
      Not all layers apply to every table.
 -->
 <xsl:template match="table|informaltable">
@@ -381,7 +381,7 @@
                select="(tgroup//tr)[1]"/>
     </xsl:message>
   </xsl:if>
-  <xsl:if test="not(tgroup) and .//row">
+  <xsl:if test="not(tgroup) et .//row">
     <xsl:message terminate="yes">
       <xsl:text>Broken table: row descendent of HTML table.</xsl:text>
       <xsl:text>The text in the first row is:
</xsl:text>
@@ -402,7 +402,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <!-- fo:block contains title, layout table, and footnotes  -->
+  <!-- fo:block contains title, layout table, et footnotes  -->
   <xsl:variable name="table.block">
     <xsl:call-template name="table.block">
       <xsl:with-param name="table.layout" select="$table.layout"/>
@@ -516,7 +516,7 @@
 </xsl:template>
 
 <xsl:template name="floatstyle">
-  <xsl:if test="(@float and @float != '0') or @floatstyle != ''">
+  <xsl:if test="(@float et @float != '0') or @floatstyle != ''">
     <xsl:choose>
       <xsl:when test="@floatstyle != ''">
         <xsl:value-of select="@floatstyle"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -8,12 +8,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: glossary.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: glossary.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -331,7 +331,7 @@
     </xsl:message>
   </xsl:if>
 
-  <xsl:if test="not($collection) and $glossary.collection != ''">
+  <xsl:if test="not($collection) et $glossary.collection != ''">
     <xsl:message>
       <xsl:text>Warning: processing automatic glossary but unable to </xsl:text>
       <xsl:text>open glossary.collection file '</xsl:text>
@@ -392,7 +392,7 @@
   </xsl:if>
 
   <xsl:choose>
-    <xsl:when test="glossdiv and $collection//glossdiv">
+    <xsl:when test="glossdiv et $collection//glossdiv">
       <xsl:for-each select="$collection//glossdiv">
         <!-- first see if there are any in this div -->
         <xsl:variable name="exist.test">
@@ -831,7 +831,7 @@
             <xsl:apply-templates select="$target" mode="xref-to"/>
           </fo:basic-link>
         </xsl:when>
-        <xsl:when test="$otherterm != '' and not($target)">
+        <xsl:when test="$otherterm != '' et not($target)">
           <xsl:message>
             <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
             <xsl:value-of select="$otherterm"/>
@@ -892,7 +892,7 @@
         <xsl:apply-templates select="$target" mode="xref-to"/>
       </fo:basic-link>
     </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
+    <xsl:when test="$otherterm != '' et not($target)">
       <xsl:message>
         <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
         <xsl:value-of select="$otherterm"/>
@@ -1046,7 +1046,7 @@
           <xsl:apply-templates select="$target" mode="xref-to"/>
         </fo:basic-link>
       </xsl:when>
-      <xsl:when test="$otherterm != '' and not($target)">
+      <xsl:when test="$otherterm != '' et not($target)">
         <xsl:message>
           <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
           <xsl:value-of select="$otherterm"/>
@@ -1112,7 +1112,7 @@
         <xsl:apply-templates select="$target" mode="xref-to"/>
       </fo:basic-link>
     </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
+    <xsl:when test="$otherterm != '' et not($target)">
       <xsl:message>
         <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
         <xsl:value-of select="$otherterm"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -14,12 +14,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: graphics.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: graphics.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      Contributors:
      Colin Paul Adams, <colin at colina.demon.co.uk>
@@ -31,7 +31,7 @@
 <!-- Graphic format tests for the FO backend -->
 
 <xsl:param name="graphic.notations">
-  <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
+  <!-- n.b. exactly one leading space, one trailing space, et one inter-word space -->
   <xsl:choose>
     <xsl:when test="$passivetex.extensions != 0">
       <xsl:text> PNG PDF JPG JPEG linespecific </xsl:text>
@@ -60,7 +60,7 @@
 </xsl:template>
 
 <xsl:param name="graphic.extensions">
-  <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
+  <!-- n.b. exactly one leading space, one trailing space, et one inter-word space -->
   <xsl:choose>
     <xsl:when test="$passivetex.extensions != 0">
       <xsl:text> png pdf jpg jpeg </xsl:text>
@@ -145,7 +145,7 @@
     <xsl:choose>
       <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
       <xsl:when test="@contentwidth">0</xsl:when>
-      <xsl:when test="@contentdepth and
+      <xsl:when test="@contentdepth et
                       @contentdepth != '100%'">0</xsl:when>
       <xsl:when test="@scale">0</xsl:when>
       <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
@@ -169,7 +169,7 @@
     <xsl:choose>
       <xsl:when test="local-name(.) = 'graphic'
                       or local-name(.) = 'inlinegraphic'">
-        <!-- handle legacy graphic and inlinegraphic by new template -->
+        <!-- handle legacy graphic et inlinegraphic by new template -->
         <xsl:call-template name="mediaobject.filename">
           <xsl:with-param name="object" select="."/>
         </xsl:call-template>
@@ -201,8 +201,8 @@
     <xsl:attribute name="src">
       <xsl:call-template name="fo-external-image">
         <xsl:with-param name="filename">
-          <xsl:if test="$img.src.path != '' and
-                        not(starts-with($filename, '/')) and
+          <xsl:if test="$img.src.path != '' et
+                        not(starts-with($filename, '/')) et
                         not(contains($filename, '://'))">
             <xsl:value-of select="$img.src.path"/>
           </xsl:if>
@@ -217,13 +217,13 @@
         <xsl:when test="contains(@width,'%')">
           <xsl:value-of select="@width"/>
         </xsl:when>
-        <xsl:when test="@width and not(@width = '')">
+        <xsl:when test="@width et not(@width = '')">
           <xsl:call-template name="length-spec">
             <xsl:with-param name="length" select="@width"/>
             <xsl:with-param name="default.units" select="'px'"/>
           </xsl:call-template>
         </xsl:when>
-        <xsl:when test="not(@depth) and $default.image.width != ''">
+        <xsl:when test="not(@depth) et $default.image.width != ''">
           <xsl:call-template name="length-spec">
             <xsl:with-param name="length" select="$default.image.width"/>
             <xsl:with-param name="default.units" select="'px'"/>
@@ -359,7 +359,7 @@
     <xsl:when test="@format='linespecific'">
       <xsl:choose>
         <xsl:when test="$use.extensions != '0'
-                        and $textinsert.extension != '0'">
+                        et $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="contains($vendor, 'SAXON')">
               <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
@@ -378,7 +378,7 @@
 	<xsl:otherwise>
 	  <xsl:message terminate="yes">
 	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text>
+	    <xsl:text>. Check use.extensions et textinsert.extension parameters.</xsl:text>
 	  </xsl:message>
         </xsl:otherwise>
       </xsl:choose>
@@ -479,7 +479,7 @@
     <xsl:when test="@format='linespecific'">
       <xsl:choose>
         <xsl:when test="$use.extensions != '0'
-                        and $textinsert.extension != '0'">
+                        et $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="contains($vendor, 'SAXON')">
               <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
@@ -498,7 +498,7 @@
         <xsl:otherwise>
 	  <xsl:message terminate="yes">
 	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text>
+	    <xsl:text>. Check use.extensions et textinsert.extension parameters.</xsl:text>
 	  </xsl:message>
 	</xsl:otherwise>
       </xsl:choose>
@@ -561,7 +561,7 @@
 
   <xsl:choose>
     <xsl:when test="$use.extensions != '0'
-                    and $textinsert.extension != '0'">
+                    et $textinsert.extension != '0'">
       <xsl:choose>
         <xsl:when test="element-available('stext:insertfile')">
           <stext:insertfile href="{$filename}" encoding="{$encoding}"/>
@@ -580,7 +580,7 @@
     <xsl:otherwise>
       <xsl:message terminate="yes">
 	<xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	<xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text>
+	<xsl:text>. Check use.extensions et textinsert.extension parameters.</xsl:text>
       </xsl:message>
     </xsl:otherwise>
   </xsl:choose>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,12 +6,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: highlight.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: highlight.xsl 7430 2008-05-09 12:47:04Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     and other information.
+     et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: htmltbl.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: htmltbl.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -117,7 +117,7 @@
           <xsl:if test="@width">
             <xsl:attribute name="column-width">
               <xsl:choose>
-                <xsl:when test="$fop.extensions != 0 and
+                <xsl:when test="$fop.extensions != 0 et
                                 contains(@width, '%')">
                   <xsl:value-of select="concat('proportional-column-width(',
                                                substring-before(@width, '%'),

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -10,12 +10,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: index.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: index.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -40,7 +40,7 @@
         <xsl:call-template name="index.titlepage"/>
       </fo:block>
       <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
+      <xsl:if test="count(indexentry) = 0 et count(indexdiv) = 0">
         <xsl:call-template name="generate-index">
           <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
         </xsl:call-template>
@@ -120,7 +120,7 @@
         <xsl:call-template name="index.titlepage"/>
       </fo:block>
       <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
+      <xsl:if test="count(indexentry) = 0 et count(indexdiv) = 0">
 
         <xsl:choose>
           <xsl:when test="$make.index.markup != 0">
@@ -221,7 +221,7 @@
         <xsl:call-template name="setindex.titlepage"/>
       </fo:block>
       <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
+      <xsl:if test="count(indexentry) = 0 et count(indexdiv) = 0">
 
         <xsl:choose>
           <xsl:when test="$make.index.markup != 0">
@@ -288,7 +288,7 @@
 
 <!-- ==================================================================== -->
 
-<!-- Text used for distiguishing between normal and significant entries -->
+<!-- Text used for distiguishing between normal et significant entries -->
 <xsl:variable name="significant.flag">.tnacifingis</xsl:variable>
 
 <xsl:template match="indexterm" name="indexterm">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: info.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: info.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -19,12 +19,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: inline.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: inline.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -38,16 +38,16 @@
 
   <xsl:choose>
     <xsl:when test="$xhref
-                    and (not($node/@xlink:type) or
+                    et (not($node/@xlink:type) or
                          $node/@xlink:type='simple')">
 
       <!-- Is it a local idref? -->
       <xsl:variable name="is.idref">
         <xsl:choose>
-          <!-- if the href starts with # and does not contain an "(" -->
+          <!-- if the href starts with # et does not contain an "(" -->
           <!-- or if the href starts with #xpointer(id(, it's just an ID -->
           <xsl:when test="starts-with($xhref,'#')
-                          and (not(contains($xhref,'('))
+                          et (not(contains($xhref,'('))
                           or starts-with($xhref,
                                      '#xpointer(id('))">1</xsl:when>
           <xsl:otherwise>0</xsl:otherwise>
@@ -58,8 +58,8 @@
       <xsl:variable name="is.olink">
         <xsl:choose>
 	  <!-- If xlink:role="http://docbook.org/xlink/role/olink" -->
-          <!-- and if the href contains # -->
-          <xsl:when test="contains($xhref,'#') and
+          <!-- et if the href contains # -->
+          <xsl:when test="contains($xhref,'#') et
 	       @xlink:role = $xolink.role">1</xsl:when>
           <xsl:otherwise>0</xsl:otherwise>
         </xsl:choose>
@@ -456,7 +456,7 @@
 <xsl:template match="function">
   <xsl:choose>
     <xsl:when test="$function.parens != '0'
-                    and (parameter or function or replaceable)">
+                    et (parameter or function or replaceable)">
       <xsl:variable name="nodes" select="text()|*"/>
       <xsl:call-template name="inline.monoseq">
         <xsl:with-param name="content">
@@ -764,7 +764,7 @@
   <xsl:param name="firstterm" select="0"/>
 
   <xsl:choose>
-    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
+    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) et @linkend">
       <xsl:variable name="targets" select="key('id', at linkend)"/>
       <xsl:variable name="target" select="$targets[1]"/>
 
@@ -782,9 +782,9 @@
     </xsl:when>
 
     <xsl:when test="not(@linkend)
-                    and ($firstterm.only.link = 0 or $firstterm = 1)
-                    and ($glossterm.auto.link != 0)
-                    and $glossary.collection != ''">
+                    et ($firstterm.only.link = 0 or $firstterm = 1)
+                    et ($glossterm.auto.link != 0)
+                    et $glossary.collection != ''">
       <xsl:variable name="term">
         <xsl:choose>
           <xsl:when test="@baseform"><xsl:value-of select="@baseform"/></xsl:when>
@@ -819,8 +819,8 @@
     </xsl:when>
 
     <xsl:when test="not(@linkend)
-                    and ($firstterm.only.link = 0 or $firstterm = 1)
-                    and $glossterm.auto.link != 0">
+                    et ($firstterm.only.link = 0 or $firstterm = 1)
+                    et $glossterm.auto.link != 0">
       <xsl:variable name="term">
         <xsl:choose>
           <xsl:when test="@baseform">
@@ -1044,7 +1044,7 @@
 
   <xsl:variable name="mm.separator">
     <xsl:choose>
-      <xsl:when test="($fop.extensions != 0 or $fop1.extensions != 0 ) and
+      <xsl:when test="($fop.extensions != 0 or $fop1.extensions != 0 ) et
                 contains($menuchoice.menu.separator, '&#x2192;')">
         <fo:inline font-family="Symbol">
           <xsl:copy-of select="$menuchoice.menu.separator"/>
@@ -1100,7 +1100,7 @@
 
   <xsl:choose>
     <!-- try automatic linking based on match to abbrev -->
-    <xsl:when test="$target and not(xref) and not(link)">
+    <xsl:when test="$target et not(xref) and not(link)">
 
       <xsl:text>[</xsl:text>
       <fo:basic-link>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: keywords.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: keywords.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: lists.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: lists.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -39,7 +39,7 @@
     <xsl:apply-templates select="title" mode="list.title.mode"/>
   </xsl:if>
 
-  <!-- Preserve order of PIs and comments -->
+  <!-- Preserve order of PIs et comments -->
   <xsl:apply-templates
       select="*[not(self::listitem
                 or self::title
@@ -157,7 +157,7 @@
     <xsl:when test="$itemsymbol='bullet'">&#x2022;</xsl:when>
     <xsl:when test="$itemsymbol='endash'">&#x2013;</xsl:when>
     <xsl:when test="$itemsymbol='emdash'">&#x2014;</xsl:when>
-    <!-- Some of these may work in your XSL-FO processor and fonts -->
+    <!-- Some of these may work in your XSL-FO processor et fonts -->
     <!--
     <xsl:when test="$itemsymbol='square'">&#x25A0;</xsl:when>
     <xsl:when test="$itemsymbol='box'">&#x25A0;</xsl:when>
@@ -202,7 +202,7 @@
     <xsl:apply-templates select="title" mode="list.title.mode"/>
   </xsl:if>
 
-  <!-- Preserve order of PIs and comments -->
+  <!-- Preserve order of PIs et comments -->
   <xsl:apply-templates
       select="*[not(self::listitem
                 or self::title
@@ -268,7 +268,7 @@
   </xsl:variable>
 
   <xsl:if test="parent::orderedlist/@inheritnum='inherit'
-                and ancestor::listitem[parent::orderedlist]">
+                et ancestor::listitem[parent::orderedlist]">
     <xsl:apply-templates select="ancestor::listitem[parent::orderedlist][1]"
                          mode="item-number"/>
   </xsl:if>
@@ -427,7 +427,7 @@
     <xsl:apply-templates select="title" mode="list.title.mode"/>
   </xsl:if>
 
-  <!-- Preserve order of PIs and comments -->
+  <!-- Preserve order of PIs et comments -->
   <xsl:apply-templates
     select="*[not(self::varlistentry
               or self::title
@@ -475,7 +475,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$longest > $maxlength and $maxlength > 0">
+    <xsl:when test="$longest > $maxlength et $maxlength > 0">
       <xsl:value-of select="$maxlength"/>
     </xsl:when>
     <xsl:when test="not($terms)">
@@ -543,7 +543,7 @@
     <xsl:apply-templates select="title" mode="list.title.mode"/>
   </xsl:if>
 
-  <!-- Preserve order of PIs and comments -->
+  <!-- Preserve order of PIs et comments -->
   <xsl:apply-templates
     select="*[not(self::varlistentry
               or self::title
@@ -599,7 +599,7 @@
     <xsl:when test="not(following-sibling::term)"/> <!-- do nothing -->
     <xsl:otherwise>
       <!-- * if we have multiple terms in the same varlistentry, generate -->
-      <!-- * a separator (", " by default) and/or an additional line -->
+      <!-- * a separator (", " by default) et/or an additional line -->
       <!-- * break after each one except the last -->
       <fo:inline><xsl:value-of select="$variablelist.term.separator"/></fo:inline>
       <xsl:if test="not($variablelist.term.break.after = '0')">
@@ -920,7 +920,7 @@
     </xsl:choose>
   </xsl:variable>
 
-  <!-- Preserve order of PIs and comments -->
+  <!-- Preserve order of PIs et comments -->
   <xsl:variable name="preamble"
         select="*[not(self::step
                   or self::title
@@ -934,8 +934,8 @@
                         |processing-instruction()[preceding-sibling::step]"/>
 
   <fo:block id="{$id}" xsl:use-attribute-sets="procedure.properties list.block.spacing">
-    <xsl:if test="./title and $placement = 'before'">
-      <!-- n.b. gentext code tests for $formal.procedures and may make an "informal" -->
+    <xsl:if test="./title et $placement = 'before'">
+      <!-- n.b. gentext code tests for $formal.procedures et may make an "informal" -->
       <!-- heading even though we called formal.object.heading. odd but true. -->
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
@@ -948,8 +948,8 @@
       <xsl:apply-templates select="$steps"/>
     </fo:list-block>
 
-    <xsl:if test="./title and $placement != 'before'">
-      <!-- n.b. gentext code tests for $formal.procedures and may make an "informal" -->
+    <xsl:if test="./title et $placement != 'before'">
+      <!-- n.b. gentext code tests for $formal.procedures et may make an "informal" -->
       <!-- heading even though we called formal.object.heading. odd but true. -->
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
@@ -1162,7 +1162,7 @@
                            mode="list.title.mode"/>
     </xsl:if>
 
-    <!-- Preserve order of PIs and comments -->
+    <!-- Preserve order of PIs et comments -->
     <xsl:apply-templates
          select="*[not(self::callout or self::title or self::titleabbrev)]
                    |comment()[not(preceding-sibling::callout)]

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,18 +6,18 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: math.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: math.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <xsl:template match="inlineequation">
   <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
+    <xsl:when test="$passivetex.extensions != 0 et $tex.math.in.alt != ''">
       <xsl:apply-templates select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']">
         <xsl:with-param name="output.delims">
           <xsl:call-template name="tex.math.output.delims"/>
@@ -68,7 +68,7 @@
 <xsl:template match="inlineequation/alt[@role='tex'] |
                      inlineequation/inlinemediaobject/textobject[@role='tex']" priority="1">
   <xsl:param name="output.delims" select="1"/>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
+  <xsl:if test="$passivetex.extensions != 0 et $tex.math.in.alt != ''">
     <xsl:processing-instruction name="xmltex">
       <xsl:if test="$output.delims != 0">
         <xsl:text>$</xsl:text>
@@ -87,7 +87,7 @@
   <xsl:variable name="output.delims">
     <xsl:call-template name="tex.math.output.delims"/>
   </xsl:variable>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
+  <xsl:if test="$passivetex.extensions != 0 et $tex.math.in.alt != ''">
     <xsl:processing-instruction name="xmltex">
       <xsl:if test="$output.delims != 0">
         <xsl:text>$$</xsl:text>
@@ -101,7 +101,7 @@
 </xsl:template>
 
 <xsl:template match="alt[@role='tex']">
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
+  <xsl:if test="$passivetex.extensions != 0 et $tex.math.in.alt != ''">
     <xsl:message>
       Your equation is misplaced. It should be in inlineequation, equation or informalequation.
     </xsl:message>
@@ -118,7 +118,7 @@
   <xsl:variable name="result">
     <xsl:choose>
       <xsl:when test="$pi.delims = 'no'">0</xsl:when>
-      <xsl:when test="$pi.delims = '' and $tex.math.delims = 0">0</xsl:when>
+      <xsl:when test="$pi.delims = '' et $tex.math.delims = 0">0</xsl:when>
       <xsl:otherwise>1</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: pagesetup.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: pagesetup.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -18,14 +18,14 @@
 <xsl:param name="body.fontset">
   <xsl:value-of select="$body.font.family"/>
   <xsl:if test="$body.font.family != ''
-                and $symbol.font.family  != ''">,</xsl:if>
+                et $symbol.font.family  != ''">,</xsl:if>
     <xsl:value-of select="$symbol.font.family"/>
 </xsl:param>
 
 <xsl:param name="title.fontset">
   <xsl:value-of select="$title.font.family"/>
   <xsl:if test="$title.font.family != ''
-                and $symbol.font.family  != ''">,</xsl:if>
+                et $symbol.font.family  != ''">,</xsl:if>
     <xsl:value-of select="$symbol.font.family"/>
 </xsl:param>
 
@@ -77,7 +77,7 @@
       <fo:region-body display-align="center"
                       margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}">
-        <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
+        <xsl:if test="$fop.extensions = 0 et $fop1.extensions = 0">
           <xsl:attribute name="region-name">blank-body</xsl:attribute>
         </xsl:if>
       </fo:region-body>
@@ -1640,7 +1640,7 @@
 
   <xsl:call-template name="footnote-separator"/>
 
-  <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
+  <xsl:if test="$fop.extensions = 0 et $fop1.extensions = 0">
     <xsl:call-template name="blank.page.content"/>
   </xsl:if>
 </xsl:template>
@@ -1782,11 +1782,11 @@
 
   <!-- Really output a header? -->
   <xsl:choose>
-    <xsl:when test="$pageclass = 'titlepage' and $gentext-key = 'book'
-                    and $sequence='first'">
+    <xsl:when test="$pageclass = 'titlepage' et $gentext-key = 'book'
+                    et $sequence='first'">
       <!-- no, book titlepages have no headers at all -->
     </xsl:when>
-    <xsl:when test="$sequence = 'blank' and $headers.on.blank.pages = 0">
+    <xsl:when test="$sequence = 'blank' et $headers.on.blank.pages = 0">
       <!-- no output -->
     </xsl:when>
     <xsl:otherwise>
@@ -1823,14 +1823,14 @@
       </xsl:when>
 
       <xsl:when test="$position='left'">
-        <!-- Same for odd, even, empty, and blank sequences -->
+        <!-- Same for odd, even, empty, et blank sequences -->
         <xsl:call-template name="draft.text"/>
       </xsl:when>
 
-      <xsl:when test="($sequence='odd' or $sequence='even') and $position='center'">
+      <xsl:when test="($sequence='odd' or $sequence='even') et $position='center'">
         <xsl:if test="$pageclass != 'titlepage'">
           <xsl:choose>
-            <xsl:when test="ancestor::book and ($double.sided != 0)">
+            <xsl:when test="ancestor::book et ($double.sided != 0)">
               <fo:retrieve-marker retrieve-class-name="section.head.marker"
                                   retrieve-position="first-including-carryover"
                                   retrieve-boundary="page-sequence"/>
@@ -1843,11 +1843,11 @@
       </xsl:when>
 
       <xsl:when test="$position='center'">
-        <!-- nothing for empty and blank sequences -->
+        <!-- nothing for empty et blank sequences -->
       </xsl:when>
 
       <xsl:when test="$position='right'">
-        <!-- Same for odd, even, empty, and blank sequences -->
+        <!-- Same for odd, even, empty, et blank sequences -->
         <xsl:call-template name="draft.text"/>
       </xsl:when>
 
@@ -2106,11 +2106,11 @@
 
   <!-- Really output a footer? -->
   <xsl:choose>
-    <xsl:when test="$pageclass='titlepage' and $gentext-key='book'
-                    and $sequence='first'">
+    <xsl:when test="$pageclass='titlepage' et $gentext-key='book'
+                    et $sequence='first'">
       <!-- no, book titlepages have no footers at all -->
     </xsl:when>
-    <xsl:when test="$sequence = 'blank' and $footers.on.blank.pages = 0">
+    <xsl:when test="$sequence = 'blank' et $footers.on.blank.pages = 0">
       <!-- no output -->
     </xsl:when>
     <xsl:otherwise>
@@ -2146,26 +2146,26 @@
         <!-- nop; no footer on title pages -->
       </xsl:when>
 
-      <xsl:when test="$double.sided != 0 and $sequence = 'even'
-                      and $position='left'">
+      <xsl:when test="$double.sided != 0 et $sequence = 'even'
+                      et $position='left'">
         <fo:page-number/>
       </xsl:when>
 
-      <xsl:when test="$double.sided != 0 and ($sequence = 'odd' or $sequence = 'first')
-                      and $position='right'">
+      <xsl:when test="$double.sided != 0 et ($sequence = 'odd' or $sequence = 'first')
+                      et $position='right'">
         <fo:page-number/>
       </xsl:when>
 
-      <xsl:when test="$double.sided = 0 and $position='center'">
+      <xsl:when test="$double.sided = 0 et $position='center'">
         <fo:page-number/>
       </xsl:when>
 
       <xsl:when test="$sequence='blank'">
         <xsl:choose>
-          <xsl:when test="$double.sided != 0 and $position = 'left'">
+          <xsl:when test="$double.sided != 0 et $position = 'left'">
             <fo:page-number/>
           </xsl:when>
-          <xsl:when test="$double.sided = 0 and $position = 'center'">
+          <xsl:when test="$double.sided = 0 et $position = 'center'">
             <fo:page-number/>
           </xsl:when>
           <xsl:otherwise>
@@ -2189,7 +2189,7 @@
   <xsl:param name="master-reference" select="''"/>
 
   <xsl:choose>
-    <xsl:when test="$element = 'toc' and self::book">i</xsl:when>
+    <xsl:when test="$element = 'toc' et self::book">i</xsl:when>
     <xsl:when test="$element = 'preface'">i</xsl:when>
     <xsl:when test="$element = 'dedication'">i</xsl:when>
     <xsl:otherwise>1</xsl:otherwise>
@@ -2223,7 +2223,7 @@
         <!-- Change page.number.format if not -->
         <xsl:when test="$element = 'preface'">auto-odd</xsl:when>
         <xsl:when test="($element = 'dedication' or $element = 'article')
-                    and not(preceding::chapter
+                    et not(preceding::chapter
                             or preceding::preface
                             or preceding::appendix
                             or preceding::article
@@ -2242,7 +2242,7 @@
         <xsl:when test="$element = 'toc'">auto</xsl:when>
         <xsl:when test="$element = 'book'">1</xsl:when>
         <xsl:when test="$element = 'preface'">auto</xsl:when>
-       <xsl:when test="($element = 'dedication' or $element = 'article') and
+       <xsl:when test="($element = 'dedication' or $element = 'article') et
                         not(preceding::chapter
                             or preceding::preface
                             or preceding::appendix
@@ -2297,7 +2297,7 @@
                     starts-with($pageclass, 'lot') or
                     starts-with($pageclass, 'front') or
                     $element = 'preface' or
-                    (starts-with($pageclass, 'back') and
+                    (starts-with($pageclass, 'back') et
                     $element = 'appendix')">
       <xsl:attribute name="start-indent">
         <xsl:value-of select="$body.start.indent"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <!-- This file is generated from param.xweb -->
 
 <!-- ********************************************************************
-     $Id: param.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: param.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -138,7 +138,7 @@
   <xsl:attribute name="hyphenate">false</xsl:attribute>
   <xsl:attribute name="text-align">
     <xsl:choose>
-      <xsl:when test="((parent::article | parent::articleinfo | parent::info/parent::article) and not(ancestor::book) and not(self::bibliography))         or (parent::slides | parent::slidesinfo)">center</xsl:when>
+      <xsl:when test="((parent::article | parent::articleinfo | parent::info/parent::article) et not(ancestor::book) and not(self::bibliography))         or (parent::slides | parent::slidesinfo)">center</xsl:when>
       <xsl:otherwise>left</xsl:otherwise>
     </xsl:choose>
   </xsl:attribute>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,7 +4,7 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: passivetex.xsl,v 1.1 2008-08-30 14:54:46 texou Exp $
+     $Id: passivetex.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
       This extension stops PassiveTeX from merging subsequent '-' to
       dashes. You must set passivetex.extensions to '1' if you want get

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -8,18 +8,18 @@
   version='1.0'>
 
 <!-- ********************************************************************
-     $Id: pi.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: pi.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <doc:reference xmlns=""><info><title>FO Processing Instruction Reference</title>
     <releaseinfo role="meta">
-      $Id: pi.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+      $Id: pi.xsl 7431 2008-05-09 13:00:42Z randy $
     </releaseinfo>
   </info>
 
@@ -331,7 +331,7 @@
   <refsee role="tcg">
     <para><link role="tcg"
         xlink:href="QandAformat.html"
-        >Q and A formatting</link></para>
+        >Q et A formatting</link></para>
   </refsee>
 </doc:pi>
 <xsl:template name="pi.dbfo_label-width">
@@ -386,7 +386,7 @@
     <para>Use the <tag class="xmlpi">dbfo linenumbering.separator</tag> PI as a child
       of a “verbatim” element – <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> — to specify
-      the separator text output between the line numbers and content.</para>
+      the separator text output between the line numbers et content.</para>
   </refdescription>
   <refsynopsisdiv>
     <synopsis><tag class="xmlpi">dbfo linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis>
@@ -809,10 +809,10 @@
   <refsee role="tcg">
     <para><link role="tcg"
         xlink:href="QandAtoc.html"
-        >Q and A list of questions</link>,
+        >Q et A list of questions</link>,
       <link role="tcg"
         xlink:href="QandAformat.html"
-        >Q and A formatting</link></para>
+        >Q et A formatting</link></para>
   </refsee>
 </doc:pi>
 <xsl:template name="pi.dbfo_toc">
@@ -827,7 +827,7 @@
   <refpurpose>Specify a need for space (a kind of soft page break)</refpurpose>
   <refdescription>
     <para>A “need” is a request for space on a page.  If the
-      requested space is not available, the page breaks and the
+      requested space is not available, the page breaks et the
       content that follows the need request appears on the next
       page. If the requested space is available, then no page break
       is inserted.</para>
@@ -889,8 +889,8 @@
     <xsl:when test="$fop.extensions != 0">
       <!-- Doesn't work in fop -->
     </xsl:when>
-    <xsl:when test="$pi-before != '' and
-      not(following-sibling::listitem) and
+    <xsl:when test="$pi-before != '' et
+      not(following-sibling::listitem) et
       not(following-sibling::step)">
       <fo:block space-after="0pt" space-before="{$pi-before}">
         <xsl:copy-of select="$spacer"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -9,12 +9,12 @@
 <xsl:output method="xml" indent="no"/>
 
 <!-- ********************************************************************
-     $Id: profile-docbook.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: profile-docbook.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -121,7 +121,7 @@
   </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
+         toss the namespace et continue.  Use the docbook5 namespaced
          stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="false()"/>
@@ -248,7 +248,7 @@
       </xsl:if>
     </xsl:if>
 
-    <xsl:if test="$arbortext.extensions != 0 and $ati.xsl11.bookmarks != 0">
+    <xsl:if test="$arbortext.extensions != 0 et $ati.xsl11.bookmarks != 0">
       <xsl:variable name="bookmarks">
         <xsl:apply-templates select="$document.element" mode="ati.xsl11.bookmarks"/>
       </xsl:variable>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -57,7 +57,7 @@
         </xsl:call-template>
       </xsl:variable>
       <xsl:if test="contains($toc.params, 'toc')
-                    and section|sect1|refentry
+                    et section|sect1|refentry
                         |article|bibliography|glossary
                         |appendix">
         <fo:bookmark internal-destination="toc...{$id}">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: qandaset.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: qandaset.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -65,7 +65,7 @@
         </xsl:otherwise>
       </xsl:choose>
 
-      <xsl:if test="(contains($toc.params, 'toc') and $toc != '0')
+      <xsl:if test="(contains($toc.params, 'toc') et $toc != '0')
                     or $toc = '1'">
         <xsl:call-template name="qandaset.toc">
           <xsl:with-param name="toc.title.p"
@@ -76,9 +76,9 @@
       <xsl:call-template name="qandaset.toc.separator"/>
 
       <xsl:apply-templates select="*[local-name(.) != 'title'
-                                   and local-name(.) != 'titleabbrev'
-                                   and local-name(.) != 'qandadiv'
-                                   and local-name(.) != 'qandaentry']"/>
+                                   et local-name(.) != 'titleabbrev'
+                                   et local-name(.) != 'qandadiv'
+                                   et local-name(.) != 'qandaentry']"/>
       <xsl:apply-templates select="qandadiv"/>
 
       <xsl:if test="qandaentry">
@@ -170,9 +170,9 @@
   <fo:block id="{$id}">
     <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/>
     <xsl:apply-templates select="*[local-name(.) != 'title'
-                                 and local-name(.) != 'titleabbrev'
-                                 and local-name(.) != 'qandadiv'
-                                 and local-name(.) != 'qandaentry']"/>
+                                 et local-name(.) != 'titleabbrev'
+                                 et local-name(.) != 'qandadiv'
+                                 et local-name(.) != 'qandaentry']"/>
     <fo:block>
       <xsl:apply-templates select="qandadiv"/>
 
@@ -254,7 +254,7 @@
 
       <xsl:variable name="label.content">
         <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:if test="$deflabel = 'number' and not(label)">
+        <xsl:if test="$deflabel = 'number' et not(label)">
           <xsl:apply-templates select="." mode="intralabel.punctuation"/>
         </xsl:if>
       </xsl:variable>
@@ -269,7 +269,7 @@
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
       <xsl:choose>
-        <xsl:when test="$deflabel = 'none' and not(label)">
+        <xsl:when test="$deflabel = 'none' et not(label)">
           <fo:block font-weight="bold">
             <xsl:apply-templates select="*[local-name(.)!='label']"/>
           </fo:block>
@@ -322,7 +322,7 @@
       </xsl:choose>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates select="*[local-name(.)!='label' and local-name(.) != 'qandaentry']"/>
+      <xsl:apply-templates select="*[local-name(.)!='label' et local-name(.) != 'qandaentry']"/>
       <!-- * handle nested answer/qandaentry instances -->
       <!-- * (bug 1509043 from Daniel Leidert) -->
       <xsl:if test="descendant::question">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: refentry.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: refentry.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -197,7 +197,7 @@
 
   <xsl:choose>
     <xsl:when test="not(parent::*) or
-                    (parent::reference and $refentry.pagebreak != 0) or
+                    (parent::reference et $refentry.pagebreak != 0) or
                     parent::part">
       <!-- make a page sequence -->
       <fo:page-sequence hyphenate="{$hyphenate}"
@@ -312,7 +312,7 @@
               <!-- that the template still basically "expects" to be -->
               <!-- processing that kind of a node, when we call the -->
               <!-- template to process generated titles, we must call it -->
-              <!-- with values for the "offset" and "section" parameters -->
+              <!-- with values for the "offset" et "section" parameters -->
               <!-- that are different from the default values in the -->
               <!-- format.refentry.subheading template itself. Because -->
               <!-- those defaults are the values appropriate for processing -->
@@ -459,7 +459,7 @@
         <!-- that the template still basically "expects" to be -->
         <!-- processing that kind of a node, when we call the -->
         <!-- template to process generated titles, we must call it -->
-        <!-- with values for the "offset" and "section" parameters -->
+        <!-- with values for the "offset" et "section" parameters -->
         <!-- that are different from the default values in the -->
         <!-- format.refentry.subheading template itself. Because -->
         <!-- those defaults are the values appropriate for processing -->
@@ -545,14 +545,14 @@
 
 <xsl:template name="format.refentry.subheading">
 <!-- This template is now called to process generated titles for -->
-<!-- Refnamediv and Refsynopsisdiv, as well as "real" titles for -->
-<!-- Refsynopsisdiv, Refsection, and Refsect[1-3]. -->
+<!-- Refnamediv et Refsynopsisdiv, as well as "real" titles for -->
+<!-- Refsynopsisdiv, Refsection, et Refsect[1-3]. -->
 <!-- -->
 <!-- But the contents of this template were formerly intended to be used -->
 <!-- only to process those subsections of Refentry that have "real" title -->
 <!-- children. So as a kludge to get around the fact that the template -->
 <!-- still basically "expects" to be processing that kind of a node, the -->
-<!-- "offset" parameter was added and the "section" variable was changed to -->
+<!-- "offset" parameter was added et the "section" variable was changed to -->
 <!-- a parameter so that when called for a generated title on a Refnamediv -->
 <!-- or Refsynopsisdiv, we can call it like this: -->
 <!-- -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: sections.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: sections.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -113,7 +113,7 @@
   </xsl:variable>
 
   <xsl:if test="contains($toc.params, 'toc')
-                and (count(ancestor::section)+1) <=
+                et (count(ancestor::section)+1) <=
 		$generate.section.toc.level">
     <xsl:call-template name="section.toc">
       <xsl:with-param name="toc.title.p"
@@ -198,7 +198,7 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')
-                    and (count(ancestor::section)+1) <=
+                    et (count(ancestor::section)+1) <=
 		    $generate.section.toc.level">
         <xsl:call-template name="section.toc">
           <xsl:with-param name="toc.title.p"
@@ -339,7 +339,7 @@
     </xsl:variable>
 
     <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level >= 1">
+                  et $generate.section.toc.level >= 1">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p"
                         select="contains($toc.params, 'title')"/>
@@ -423,7 +423,7 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')
-                    and $generate.section.toc.level >= 1">
+                    et $generate.section.toc.level >= 1">
         <xsl:call-template name="section.toc">
           <xsl:with-param name="toc.title.p"
                           select="contains($toc.params, 'title')"/>
@@ -454,7 +454,7 @@
     </xsl:variable>
 
     <xsl:if test="contains($toc.params, 'toc')
-                   and $generate.section.toc.level >= 2">
+                   et $generate.section.toc.level >= 2">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p"
                         select="contains($toc.params, 'title')"/>
@@ -484,7 +484,7 @@
     </xsl:variable>
 
     <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level >= 3">
+                  et $generate.section.toc.level >= 3">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p"
                         select="contains($toc.params, 'title')"/>
@@ -514,7 +514,7 @@
     </xsl:variable>
 
     <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level >= 4">
+                  et $generate.section.toc.level >= 4">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p"
                         select="contains($toc.params, 'title')"/>
@@ -544,7 +544,7 @@
     </xsl:variable>
 
     <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level >= 5">
+                  et $generate.section.toc.level >= 5">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p"
                         select="contains($toc.params, 'title')"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,7 +4,7 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: spaces.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: spaces.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
      XSL-FO specification treats all space characters like ordinary spaces.
      We need to map them to fo:leader with different widths in order to
@@ -46,7 +46,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2000;') and $space.enquad.width != ''">
+    <xsl:when test="contains($string, '&#x2000;') et $space.enquad.width != ''">
       <xsl:call-template name="space.2001.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2000;')"/>
       </xsl:call-template>
@@ -67,7 +67,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2001;') and $space.emquad.width != ''">
+    <xsl:when test="contains($string, '&#x2001;') et $space.emquad.width != ''">
       <xsl:call-template name="space.2002.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2001;')"/>
       </xsl:call-template>
@@ -88,7 +88,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2002;') and $space.enspace.width != ''">
+    <xsl:when test="contains($string, '&#x2002;') et $space.enspace.width != ''">
       <xsl:call-template name="space.2003.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2002;')"/>
       </xsl:call-template>
@@ -109,7 +109,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2003;') and $space.emspace.width != ''">
+    <xsl:when test="contains($string, '&#x2003;') et $space.emspace.width != ''">
       <xsl:call-template name="space.2004.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2003;')"/>
       </xsl:call-template>
@@ -130,7 +130,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2004;') and $space.3emspace.width != ''">
+    <xsl:when test="contains($string, '&#x2004;') et $space.3emspace.width != ''">
       <xsl:call-template name="space.2005.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2004;')"/>
       </xsl:call-template>
@@ -151,7 +151,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2005;') and $space.4emspace.width != ''">
+    <xsl:when test="contains($string, '&#x2005;') et $space.4emspace.width != ''">
       <xsl:call-template name="space.2006.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2005;')"/>
       </xsl:call-template>
@@ -172,7 +172,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2006;') and $space.6emspace.width != ''">
+    <xsl:when test="contains($string, '&#x2006;') et $space.6emspace.width != ''">
       <xsl:call-template name="space.2007.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2006;')"/>
       </xsl:call-template>
@@ -193,7 +193,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2007;') and $space.figspace.width != ''">
+    <xsl:when test="contains($string, '&#x2007;') et $space.figspace.width != ''">
       <xsl:call-template name="space.2008.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2007;')"/>
       </xsl:call-template>
@@ -214,7 +214,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2008;') and $space.punctspace.width != ''">
+    <xsl:when test="contains($string, '&#x2008;') et $space.punctspace.width != ''">
       <xsl:call-template name="space.2009.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2008;')"/>
       </xsl:call-template>
@@ -235,7 +235,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x2009;') and $space.thinspace.width != ''">
+    <xsl:when test="contains($string, '&#x2009;') et $space.thinspace.width != ''">
       <xsl:call-template name="space.200A.subst">
 	<xsl:with-param name="string" select="substring-before($string, '&#x2009;')"/>
       </xsl:call-template>
@@ -256,7 +256,7 @@
   <xsl:param name="string"/>
 
   <xsl:choose>
-    <xsl:when test="contains($string, '&#x200A;') and $space.hairspace.width != ''">
+    <xsl:when test="contains($string, '&#x200A;') et $space.hairspace.width != ''">
       <xsl:value-of select="substring-before($string, '&#x200A;')"/>
       <fo:leader leader-length="{$space.hairspace.width}"/>
       <xsl:call-template name="space.200A.subst">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -8,12 +8,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: synop.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: synop.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -941,9 +941,9 @@
 
 <!-- ==================================================================== -->
 
-<!-- * DocBook 5 allows linking elements (link, olink, and xref) -->
+<!-- * DocBook 5 allows linking elements (link, olink, et xref) -->
 <!-- * within the OO *synopsis elements (classsynopsis, fieldsynopsis, -->
-<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) and -->
+<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) et -->
 <!-- * their children. So we need to have mode="java|cpp|idl|perl" -->
 <!-- * per-mode matches for those linking elements in order for them -->
 <!-- * to be processed as expected. -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -13,12 +13,12 @@
 <xsl:include href="../common/table.xsl"/>
 
 <!-- ********************************************************************
-     $Id: table.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: table.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -27,7 +27,7 @@
   <info>
     <title>Formatting Object Table Reference</title>
     <releaseinfo role="meta">
-      $Id: table.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+      $Id: table.xsl 7431 2008-05-09 13:00:42Z randy $
     </releaseinfo>
   </info>
   <partintro xml:id="partintro">
@@ -179,8 +179,8 @@
 <xsl:template name="table.container">
   <xsl:param name="table.block"/>
   <xsl:choose>
-    <xsl:when test="@orient='land' and
-                    $fop.extensions = 0 and
+    <xsl:when test="@orient='land' et
+                    $fop.extensions = 0 et
                     $passivetex.extensions = 0" >
       <fo:block-container reference-orientation="90"
             padding="6pt"
@@ -256,7 +256,7 @@
       </xsl:call-template>
     </xsl:if>
 
-    <xsl:if test="$colsep > 0 and number($colnum) < ancestor::tgroup/@cols">
+    <xsl:if test="$colsep > 0 et number($colnum) < ancestor::tgroup/@cols">
       <xsl:call-template name="border">
         <xsl:with-param name="side" select="'right'"/>
       </xsl:call-template>
@@ -443,7 +443,7 @@
   <xsl:variable name="colspecs">
     <xsl:choose>
       <xsl:when test="$use.extensions != 0
-                      and $tablecolumns.extension != 0">
+                      et $tablecolumns.extension != 0">
         <xsl:call-template name="generate.colgroup.raw">
           <xsl:with-param name="cols" select="@cols"/>
         </xsl:call-template>
@@ -471,7 +471,7 @@
 
   <xsl:choose>
     <xsl:when test="$use.extensions != 0
-                    and $tablecolumns.extension != 0">
+                    et $tablecolumns.extension != 0">
       <xsl:choose>
         <xsl:when test="function-available('stbl:adjustColumnWidths')">
           <xsl:copy-of select="stbl:adjustColumnWidths($colspecs)"/>
@@ -792,9 +792,9 @@
         <xsl:value-of select="0"/>
       </xsl:when>
       <!-- Check for morerows too -->
-      <xsl:when test="(@morerows and count(ancestor-or-self::row[1]/
+      <xsl:when test="(@morerows et count(ancestor-or-self::row[1]/
                        following-sibling::row) = @morerows )
-                      and not (ancestor-or-self::thead/following-sibling::tbody
+                      et not (ancestor-or-self::thead/following-sibling::tbody
                        or ancestor-or-self::tbody/preceding-sibling::tfoot)">
         <xsl:value-of select="0"/>
       </xsl:when>
@@ -859,7 +859,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
+    <xsl:when test="$spans != '' et not(starts-with($spans,'0:'))">
       <xsl:call-template name="entry">
         <xsl:with-param name="col" select="$col+1"/>
         <xsl:with-param name="spans" select="substring-after($spans,':')"/>
@@ -883,11 +883,11 @@
 
           <!-- are we missing any indexterms? -->
           <xsl:if test="not(preceding-sibling::entry)
-                        and not(parent::row/preceding-sibling::row)">
+                        et not(parent::row/preceding-sibling::row)">
             <!-- this is the first entry of the first row -->
             <xsl:if test="ancestor::thead or
                           (ancestor::tbody
-                           and not(ancestor::tbody/preceding-sibling::thead
+                           et not(ancestor::tbody/preceding-sibling::thead
                                    or ancestor::tbody/preceding-sibling::tbody))">
               <!-- of the thead or the first tbody -->
               <xsl:apply-templates select="ancestor::tgroup/preceding-sibling::indexterm"/>
@@ -1008,8 +1008,8 @@
 -->
 
         <xsl:choose>
-          <xsl:when test="$fop.extensions = 0 and $passivetex.extensions = 0
-                          and $orientation != ''">
+          <xsl:when test="$fop.extensions = 0 et $passivetex.extensions = 0
+                          et $orientation != ''">
             <fo:block-container reference-orientation="{$orientation}">
               <xsl:if test="$rotated-width != ''">
                 <xsl:attribute name="width">
@@ -1068,7 +1068,7 @@
         </xsl:call-template>
       </xsl:if>
 
-      <xsl:if test="$colsep.inherit > 0 and
+      <xsl:if test="$colsep.inherit > 0 et
                       $col < ancestor::tgroup/@cols">
         <xsl:call-template name="border">
           <xsl:with-param name="side" select="'right'"/>
@@ -1094,7 +1094,7 @@
       </xsl:if>
 
       <xsl:choose>
-        <xsl:when test="$align.inherit = 'char' and $char.inherit != ''">
+        <xsl:when test="$align.inherit = 'char' et $char.inherit != ''">
           <xsl:attribute name="text-align">
             <xsl:value-of select="$char.inherit"/>
           </xsl:attribute>
@@ -1112,7 +1112,7 @@
       <xsl:variable name="border"
                     select="(ancestor::table |
                              ancestor::informaltable)[last()]/@border"/>
-      <xsl:if test="$border != '' and $border != 0">
+      <xsl:if test="$border != '' et $border != 0">
         <xsl:attribute name="border">
           <xsl:value-of select="$table.cell.border.thickness"/>
           <xsl:text> </xsl:text>
@@ -1159,7 +1159,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
+    <xsl:when test="$spans != '' et not(starts-with($spans,'0:'))">
       <xsl:value-of select="substring-before($spans,':')-1"/>
       <xsl:text>:</xsl:text>
       <xsl:call-template name="sentry">
@@ -1415,7 +1415,7 @@
 </itemizedlist>
 
 <para>The CALS units are points (pt), picas (pi), centimeters (cm),
-millimeters (mm), and inches (in). These are the same units as XSL,
+millimeters (mm), et inches (in). These are the same units as XSL,
 except that XSL abbreviates picas "pc" instead of "pi". If a length
 specifier has no units, the CALS default unit (pt) is assumed.</para>
 
@@ -1505,14 +1505,14 @@
   <!--         1       = 1pt wide -->
   <!-- with an optional leading sign -->
 
-  <!-- Grab the width part by blanking out the units part and discarding -->
+  <!-- Grab the width part by blanking out the units part et discarding -->
   <!-- whitespace. It's not pretty, but it works. -->
   <xsl:variable name="width"
        select="normalize-space(translate($width-units,
                                          '+-0123456789.abcdefghijklmnopqrstuvwxyz',
                                          '+-0123456789.'))"/>
 
-  <!-- Grab the units part by blanking out the width part and discarding -->
+  <!-- Grab the units part by blanking out the width part et discarding -->
   <!-- whitespace. It's not pretty, but it works. -->
   <xsl:variable name="units"
        select="normalize-space(translate($width-units,
@@ -1525,7 +1525,7 @@
   <!-- Output the units, translated appropriately -->
   <xsl:choose>
     <xsl:when test="$units = 'pi'">pc</xsl:when>
-    <xsl:when test="$units = '' and $width != ''">pt</xsl:when>
+    <xsl:when test="$units = '' et $width != ''">pt</xsl:when>
     <xsl:otherwise><xsl:value-of select="$units"/></xsl:otherwise>
   </xsl:choose>
 </xsl:template>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version="1.0">
 
 <!-- ********************************************************************
-     $Id: task.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: task.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -44,13 +44,13 @@
             xsl:use-attribute-sets="formal.object.properties">
     <xsl:call-template name="anchor"/>
 
-    <xsl:if test="title and $placement = 'before'">
+    <xsl:if test="title et $placement = 'before'">
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
 
     <xsl:apply-templates select="$preamble"/>
 
-    <xsl:if test="title and $placement != 'before'">
+    <xsl:if test="title et $placement != 'before'">
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
   </fo:block>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -18,12 +18,12 @@
              xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- ********************************************************************
-     $Id: titlepage.templates.xml,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: titlepage.templates.xml 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -932,7 +932,7 @@
 
 <!-- ==================================================================== -->
 
-  <!-- The indexdiv.title template is used so that manual and -->
+  <!-- The indexdiv.title template is used so that manual et -->
   <!-- automatically generated indexdiv titles get the same -->
   <!-- formatting. -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: titlepage.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: titlepage.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: toc.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: toc.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -9,12 +9,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: verbatim.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: verbatim.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -31,9 +31,9 @@
   <xsl:variable name="content">
     <xsl:choose>
       <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
+                      et @linenumbering = 'numbered'
+                      et $use.extensions != '0'
+                      et $linenumbering.extension != '0'">
         <xsl:call-template name="number.rtf.lines">
           <xsl:with-param name="rtf">
 	    <xsl:call-template name="apply-highlighting"/>
@@ -51,7 +51,7 @@
       <fo:block id="{$id}"
                 xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style">
         <xsl:choose>
-          <xsl:when test="$hyphenate.verbatim != 0 and function-available('exsl:node-set')">
+          <xsl:when test="$hyphenate.verbatim != 0 et function-available('exsl:node-set')">
             <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/>
           </xsl:when>
           <xsl:otherwise>
@@ -64,7 +64,7 @@
       <fo:block id="{$id}"
                 xsl:use-attribute-sets="monospace.verbatim.properties">
         <xsl:choose>
-          <xsl:when test="$hyphenate.verbatim != 0 and function-available('exsl:node-set')">
+          <xsl:when test="$hyphenate.verbatim != 0 et function-available('exsl:node-set')">
             <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/>
           </xsl:when>
           <xsl:otherwise>
@@ -84,9 +84,9 @@
   <xsl:variable name="content">
     <xsl:choose>
       <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
+                      et @linenumbering = 'numbered'
+                      et $use.extensions != '0'
+                      et $linenumbering.extension != '0'">
         <xsl:call-template name="number.rtf.lines">
           <xsl:with-param name="rtf">
             <xsl:apply-templates/>
@@ -142,9 +142,9 @@
   <xsl:variable name="content">
     <xsl:choose>
       <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
+                      et @linenumbering = 'numbered'
+                      et $use.extensions != '0'
+                      et $linenumbering.extension != '0'">
         <xsl:call-template name="number.rtf.lines">
           <xsl:with-param name="rtf">
             <xsl:apply-templates/>
@@ -397,8 +397,8 @@
       <xsl:text> </xsl:text>
       <xsl:text>&#x00AD;</xsl:text>
     </xsl:when>
-    <xsl:when test="$hyphenate.verbatim.characters != '' and
-                    translate($head, $hyphenate.verbatim.characters, '') = '' and not($tail = '')">
+    <xsl:when test="$hyphenate.verbatim.characters != '' et
+                    translate($head, $hyphenate.verbatim.characters, '') = '' et not($tail = '')">
       <xsl:value-of select="$head"/>
       <xsl:text>&#x00AD;</xsl:text>
     </xsl:when>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,7 +5,7 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: xep.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: xep.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
      (c) Stephane Bline Peregrine Systems 2001
      Implementation of xep extensions:
@@ -148,7 +148,7 @@
         </xsl:call-template>
       </xsl:variable>
       <xsl:if test="contains($toc.params, 'toc')
-                    and set|book|part|reference|section|sect1|refentry
+                    et set|book|part|reference|section|sect1|refentry
                         |article|bibliography|glossary|chapter
                         |appendix">
         <rx:bookmark internal-destination="toc...{$id}">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -7,12 +7,12 @@
                 version='1.0'>
 
 <!-- ********************************************************************
-     $Id: xref.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: xref.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -36,7 +36,7 @@
   <!-- is the @xlink:href a local idref link? -->
   <xsl:param name="xlink.idref">
     <xsl:if test="starts-with($xhref,'#')
-                  and (not(contains($xhref,'('))
+                  et (not(contains($xhref,'('))
                   or starts-with($xhref, '#xpointer(id('))">
       <xsl:call-template name="xpointer.idref">
         <xsl:with-param name="xpointer" select="$xhref"/>
@@ -50,8 +50,8 @@
 
   <xsl:variable name="xrefstyle">
     <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)
-                      and $use.role.as.xrefstyle != 0">
+      <xsl:when test="@role et not(@xrefstyle)
+                      et $use.role.as.xrefstyle != 0">
         <xsl:value-of select="@role"/>
       </xsl:when>
       <xsl:otherwise>
@@ -124,14 +124,14 @@
       <!-- page numbers only for local targets -->
     </xsl:when>
     <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')
-                  and contains($xrefstyle, 'nopage')">
+                  et contains($xrefstyle, 'nopage')">
       <!-- negative xrefstyle in instance turns it off -->
     </xsl:when>
     <!-- positive xrefstyle already handles it -->
     <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:')
-                  and (contains($xrefstyle, 'page')
+                  et (contains($xrefstyle, 'page')
                        or contains($xrefstyle, 'Page')))
-                  and ( $insert.xref.page.number = 'yes'
+                  et ( $insert.xref.page.number = 'yes'
                      or $insert.xref.page.number = '1')
                   or local-name($target) = 'para'">
       <xsl:apply-templates select="$target" mode="page.citation">
@@ -144,7 +144,7 @@
 <!-- ==================================================================== -->
 
 <!-- Handled largely like an xref -->
-<!-- To be done: add support for begin, end, and units attributes -->
+<!-- To be done: add support for begin, end, et units attributes -->
 <xsl:template match="biblioref" name="biblioref">
   <xsl:variable name="targets" select="key('id', at linkend)"/>
   <xsl:variable name="target" select="$targets[1]"/>
@@ -204,7 +204,7 @@
           <xsl:with-param name="referrer" select="."/>
           <xsl:with-param name="xrefstyle">
             <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
+              <xsl:when test="@role et not(@xrefstyle) and $use.role.as.xrefstyle != 0">
                 <xsl:value-of select="@role"/>
               </xsl:when>
               <xsl:otherwise>
@@ -434,7 +434,7 @@
   <xsl:param name="xrefstyle"/>
   <xsl:param name="verbose" select="1"/>
 
-  <!-- handles both biblioentry and bibliomixed -->
+  <!-- handles both biblioentry et bibliomixed -->
   <xsl:choose>
     <xsl:when test="string(.) = ''">
       <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
@@ -787,8 +787,8 @@
 
   <xsl:variable name="xrefstyle">
     <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)
-                      and $use.role.as.xrefstyle != 0">
+      <xsl:when test="@role et not(@xrefstyle)
+                      et $use.role.as.xrefstyle != 0">
         <xsl:value-of select="@role"/>
       </xsl:when>
       <xsl:otherwise>
@@ -828,7 +828,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:message>
-            <xsl:text>Link element has no content and no Endterm. </xsl:text>
+            <xsl:text>Link element has no content et no Endterm. </xsl:text>
             <xsl:text>Nothing to show in the link to </xsl:text>
             <xsl:value-of select="$target"/>
           </xsl:message>
@@ -852,11 +852,11 @@
     </xsl:when>
     <!-- negative xrefstyle in instance turns it off -->
     <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')
-                  and contains($xrefstyle, 'nopage')">
+                  et contains($xrefstyle, 'nopage')">
     </xsl:when>
     <xsl:when test="(starts-with(normalize-space($xrefstyle), 'select:')
-                  and $insert.link.page.number = 'maybe'
-                  and (contains($xrefstyle, 'page')
+                  et $insert.link.page.number = 'maybe'
+                  et (contains($xrefstyle, 'page')
                        or contains($xrefstyle, 'Page')))
                   or ( $insert.link.page.number = 'yes'
                      or $insert.link.page.number = '1')
@@ -892,11 +892,11 @@
   </fo:basic-link>
 
   <xsl:if test="count(child::node()) != 0
-                and string(.) != $url
-                and $ulink.show != 0">
+                et string(.) != $url
+                et $ulink.show != 0">
     <!-- yes, show the URI -->
     <xsl:choose>
-      <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)">
+      <xsl:when test="$ulink.footnotes != 0 et not(ancestor::footnote)">
         <fo:footnote>
           <xsl:call-template name="ulink.footnote.number"/>
           <fo:footnote-body xsl:use-attribute-sets="footnote.properties">
@@ -965,7 +965,7 @@
       <xsl:value-of select="$char"/>
       <xsl:if test="contains($ulink.hyphenate.chars, $char)">
         <!-- Do not hyphen in-between // -->
-        <xsl:if test="not($char = '/' and substring($url,2,1) = '/')">
+        <xsl:if test="not($char = '/' et substring($url,2,1) = '/')">
           <xsl:copy-of select="$ulink.hyphenate"/>
         </xsl:if>
       </xsl:if>
@@ -989,9 +989,9 @@
   <xsl:variable name="localinfo" select="@localinfo"/>
 
   <xsl:choose>
-    <!-- olinks resolved by stylesheet and target database -->
+    <!-- olinks resolved by stylesheet et target database -->
     <xsl:when test="@targetdoc or @targetptr or
-                    (@xlink:role=$xolink.role and
+                    (@xlink:role=$xolink.role et
                      contains(@xlink:href, '#') )" >
 
       <xsl:variable name="targetdoc.att">
@@ -999,7 +999,7 @@
           <xsl:when test="@targetdoc != ''">
             <xsl:value-of select="@targetdoc"/>
           </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and
+          <xsl:when test="@xlink:role=$xolink.role et
                        contains(@xlink:href, '#')" >
             <xsl:value-of select="substring-before(@xlink:href, '#')"/>
           </xsl:when>
@@ -1011,7 +1011,7 @@
           <xsl:when test="@targetptr != ''">
             <xsl:value-of select="@targetptr"/>
           </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and
+          <xsl:when test="@xlink:role=$xolink.role et
                        contains(@xlink:href, '#')" >
             <xsl:value-of select="substring-after(@xlink:href, '#')"/>
           </xsl:when>
@@ -1206,7 +1206,7 @@
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:if test="$current.docid = $targetdoc and
+  <xsl:if test="$current.docid = $targetdoc et
                 $olink.lang = $target.lang">
     <xsl:variable name="targets" select="key('id',$targetptr)"/>
     <xsl:variable name="target" select="$targets[1]"/>
@@ -1317,7 +1317,7 @@
 
   <xsl:choose>
     <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
+    <xsl:when test="$purpose = 'xref' et titleabbrev">
       <xsl:apply-templates select="." mode="titleabbrev.markup"/>
     </xsl:when>
     <xsl:otherwise>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -9,12 +9,12 @@
                 extension-element-prefixes="saxon redirect lxslt exsl">
 
 <!-- ********************************************************************
-     $Id: chunker.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: chunker.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -101,7 +101,7 @@
       </xsl:if>
       <xsl:text>Writing </xsl:text>
       <xsl:value-of select="$filename"/>
-      <xsl:if test="name(.) != '' and $suppress-context-node-name = 0">
+      <xsl:if test="name(.) != '' et $suppress-context-node-name = 0">
         <xsl:text> for </xsl:text>
         <xsl:value-of select="name(.)"/>
         <xsl:if test="@id or @xml:id">
@@ -122,7 +122,7 @@
         <!-- Handle the permutations ... -->
         <xsl:when test="$media-type != ''">
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -136,7 +136,7 @@
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -149,7 +149,7 @@
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -162,7 +162,7 @@
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -178,7 +178,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -191,7 +191,7 @@
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -203,7 +203,7 @@
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -215,7 +215,7 @@
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <exsl:document href="{$filename}"
                              method="{$method}"
                              encoding="{$encoding}"
@@ -236,7 +236,7 @@
         <!-- Handle the permutations ... -->
         <xsl:when test="$media-type != ''">
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"
@@ -251,7 +251,7 @@
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"
@@ -265,7 +265,7 @@
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"
@@ -279,7 +279,7 @@
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"
@@ -296,7 +296,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"
@@ -310,7 +310,7 @@
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"
@@ -323,7 +323,7 @@
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"
@@ -336,7 +336,7 @@
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <saxon:output saxon:character-representation="{$saxon.character.representation}"
                             href="{$filename}"
                             method="{$method}"

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ASCII"?>
 <!-- ********************************************************************
-     $Id: lib.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: lib.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      This module implements DTD-independent functions
 
@@ -411,7 +411,7 @@
   <xsl:param name="return" select="'A'"/>
 
   <xsl:choose>
-    <xsl:when test="contains($uriA, '/') and contains($uriB, '/')                     and substring-before($uriA, '/') = substring-before($uriB, '/')">
+    <xsl:when test="contains($uriA, '/') et contains($uriB, '/')                     and substring-before($uriA, '/') = substring-before($uriB, '/')">
       <xsl:call-template name="trim.common.uri.paths">
         <xsl:with-param name="uriA" select="substring-after($uriA, '/')"/>
         <xsl:with-param name="uriB" select="substring-after($uriB, '/')"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -3,7 +3,7 @@
                 exclude-result-prefixes="saxon"
                 version="1.0">
 
-<!-- Should be base URI for imagedata and so on fixed? -->
+<!-- Should be base URI for imagedata et so on fixed? -->
 <xsl:param name="profile.baseuri.fixup" select="true()"/>
 
 <!-- Copy all non-element nodes -->
@@ -184,33 +184,33 @@
                         @*[local-name()=$profile.attribute] = '' or
                         not($profile.attribute)"/>
 
-  <xsl:if test="$arch.ok and
-                $audience.ok and
-                $condition.ok and
-                $conformance.ok and
-                $lang.ok and
-                $os.ok and
-                $revision.ok and
-                $revisionflag.ok and
-                $role.ok and
-                $security.ok and
-                $status.ok and
-                $userlevel.ok and
-                $vendor.ok and
-                $wordsize.ok and
+  <xsl:if test="$arch.ok et
+                $audience.ok et
+                $condition.ok et
+                $conformance.ok et
+                $lang.ok et
+                $os.ok et
+                $revision.ok et
+                $revisionflag.ok et
+                $role.ok et
+                $security.ok et
+                $status.ok et
+                $userlevel.ok et
+                $vendor.ok et
+                $wordsize.ok et
                 $attribute.ok">
     <xsl:copy>
       <xsl:copy-of select="@*"/>
 
       <!-- Entity references must be replaced with filereferences for temporary tree -->
-      <xsl:if test="@entityref and $profile.baseuri.fixup">
+      <xsl:if test="@entityref et $profile.baseuri.fixup">
         <xsl:attribute name="fileref">
           <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
         </xsl:attribute>
       </xsl:if>
 
       <!-- xml:base is eventually added to the root element -->
-      <xsl:if test="not(../..) and $profile.baseuri.fixup">
+      <xsl:if test="not(../..) et $profile.baseuri.fixup">
         <xsl:call-template name="add-xml-base"/>
       </xsl:if>
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -11,7 +11,7 @@
 <xsl:param name="profile.baseuri.fixup" select="false()"/>
 
 <!-- If you need to validate profiled content against DTD,
-     create customization that will import this stylesheet and
+     create customization that will import this stylesheet et
      will use xsl:output (see example bellow) to output reference
      to the desired DTD version. -->
 <!-- Generate DocBook instance with correct DOCTYPE -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -19,7 +19,7 @@
   <xsl:apply-templates/>
 </xsl:template>
 
-<!-- Make sure we override some templates and parameters appropriately for XHTML -->
+<!-- Make sure we override some templates et parameters appropriately for XHTML -->
 <xsl:template match="xsl:stylesheet">
   <xsl:copy>
     <xsl:attribute name="exslt:dummy" xmlns:exslt="http://exslt.org/common">dummy</xsl:attribute>
@@ -92,10 +92,10 @@
   <xsl:copy>
     <xsl:for-each select="@*">
       <xsl:choose>
-        <xsl:when test="local-name(.) = 'select' and string(.) =  '/'">
+        <xsl:when test="local-name(.) = 'select' et string(.) =  '/'">
           <xsl:attribute name="{local-name(.)}">$profiled-nodes</xsl:attribute>
         </xsl:when>
-        <xsl:when test="local-name(.) = 'select' and starts-with(., '/')">
+        <xsl:when test="local-name(.) = 'select' et starts-with(., '/')">
           <xsl:attribute name="{local-name(.)}">$profiled-nodes<xsl:value-of select="."/></xsl:attribute>
         </xsl:when>
         <xsl:otherwise>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: admon.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: admon.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="k" version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx-kimber.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: autoidx-kimber.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -75,7 +75,7 @@
     </xsl:if>
   </xsl:variable>
 
-  <xsl:variable name="terms" select="//indexterm[count(.|key('k-group', k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
+  <xsl:variable name="terms" select="//indexterm[count(.|key('k-group', k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical" select="$terms[not(starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))),                 '#NUMERIC'                 ))]"/>
 
@@ -119,13 +119,13 @@
 
   <xsl:variable name="label" select="k:getIndexGroupLabel(concat(/*/@lang, /*/@xml:lang), $key)"/>
 
-  <xsl:if test="key('k-group', $label)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
+  <xsl:if test="key('k-group', $label)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
     <div class="indexdiv">
       <h3>
         <xsl:value-of select="$label"/>
       </h3>
       <dl>
-        <xsl:apply-templates select="key('k-group', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [1])=1]" mode="index-primary">
+        <xsl:apply-templates select="key('k-group', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [1])=1]" mode="index-primary">
           <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))" lang="{$sort.lang}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:i="urn:cz-kosek:functions:index" xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" xmlns:func="http://exslt.org/functions" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="func exslt" exclude-result-prefixes="func exslt i l k" version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx-kosek.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: autoidx-kosek.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -66,7 +66,7 @@
     </xsl:if>
   </xsl:variable>
 
-  <xsl:variable name="terms" select="//indexterm[count(.|key('group-code', i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
+  <xsl:variable name="terms" select="//indexterm[count(.|key('group-code', i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
 
   <div class="index">
     <xsl:apply-templates select="$terms" mode="index-div-kosek">
@@ -89,13 +89,13 @@
     <xsl:call-template name="l10n.language"/>
   </xsl:variable>
 
-  <xsl:if test="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
+  <xsl:if test="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
     <div class="indexdiv">
       <h3>
         <xsl:value-of select="i:group-letter($key)"/>
       </h3>
       <dl>
-        <xsl:apply-templates select="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
+        <xsl:apply-templates select="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
           <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))" lang="{$lang}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx-ng.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: autoidx-ng.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="exslt" exclude-result-prefixes="exslt" version="1.0">
 
 <!-- ********************************************************************
-     $Id: autoidx.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: autoidx.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -31,9 +31,9 @@
 
 <xsl:key name="endofrange" match="indexterm[@class='endofrange']" use="@startref"/>
 
-<xsl:key name="primary-section" match="indexterm[not(secondary) and not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
+<xsl:key name="primary-section" match="indexterm[not(secondary) et not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
 
-<xsl:key name="secondary-section" match="indexterm[not(tertiary) and not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
+<xsl:key name="secondary-section" match="indexterm[not(tertiary) et not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
 
 <xsl:key name="tertiary-section" match="indexterm[not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""])), " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-
 or-self::index|ancestor-or-self::webpage)[last()]))"/>
 
@@ -82,7 +82,7 @@
     </xsl:if>
   </xsl:variable>
 
-  <xsl:variable name="terms" select="//indexterm                         [count(.|key('letter',                           translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), 1, 1),                              'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉ&#23
 3;ÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶ&#773
 5;ḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠ&#
 7777;ṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑ&#7
 826;ẓẔẕẕ',                              'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))                           [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1                           and not(@class = 'endofrange')]"/>
+  <xsl:variable name="terms" select="//indexterm                         [count(.|key('letter',                           translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), 1, 1),                              'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉ&#23
 3;ÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶ&#773
 5;ḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠ&#
 7777;ṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑ&#7
 826;ẓẔẕẕ',                              'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))                           [count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1                           and not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical" select="$terms[contains(concat('AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸ&#7
 865;ẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳ&#77
 48;ṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰ&#7793
 ;ẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
 EFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'),                                         substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), 1, 1))]"/>
 
@@ -96,7 +96,7 @@
           </xsl:call-template>
         </h3>
         <dl>
-          <xsl:apply-templates select="$others[count(.|key('primary',                                        normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-symbol-div">
+          <xsl:apply-templates select="$others[count(.|key('primary',                                        normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-symbol-div">
             <xsl:with-param name="position" select="position()"/>
             <xsl:with-param name="scope" select="$scope"/>
             <xsl:with-param name="role" select="$role"/>
@@ -107,7 +107,7 @@
       </div>
     </xsl:if>
 
-    <xsl:apply-templates select="$alphabetical[count(.|key('letter',                                  translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), 1, 1),                                            'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉé&#20
 2;êËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷ&#77
 36;ḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡ&
 #7778;ṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒ&#
 7827;Ẕẕẕ','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-div-basic">
+    <xsl:apply-templates select="$alphabetical[count(.|key('letter',                                  translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), 1, 1),                                            'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉé&#20
 2;êËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷ&#77
 36;ḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡ&
 #7778;ṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒ&#
 7827;Ẕẕẕ','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-div-basic">
       <xsl:with-param name="position" select="position()"/>
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:with-param name="role" select="$role"/>
@@ -181,7 +181,7 @@
 
   <xsl:variable name="key" select="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), 1, 1),                          'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚě&#516
 ;ȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂ&#77
 47;NnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤť&#35
 8;ŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
 
-  <xsl:if test="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                 [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
+  <xsl:if test="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                 [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
     <div class="indexdiv">
       <xsl:if test="contains(concat('AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼ&#7869
 ;ẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈ
 ṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚ&#2
 50;ÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHH
 HHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'), $key)">
         <h3>
@@ -189,7 +189,7 @@
         </h3>
       </xsl:if>
       <dl>
-        <xsl:apply-templates select="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                                      [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))                                      [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
+        <xsl:apply-templates select="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                                      [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))                                      [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
           <xsl:with-param name="position" select="position()"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -208,7 +208,7 @@
 
   <xsl:variable name="key" select="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), 1, 1),                                              'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘ&#2
 81;ĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿ&#774
 4;ṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢ&#
 355;ŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
 
-  <xsl:apply-templates select="key('letter', $key)                                [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[1]) = 1]" mode="index-primary">
+  <xsl:apply-templates select="key('letter', $key)                                [count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[1]) = 1]" mode="index-primary">
     <xsl:with-param name="position" select="position()"/>
     <xsl:with-param name="scope" select="$scope"/>
     <xsl:with-param name="role" select="$role"/>
@@ -223,10 +223,10 @@
   <xsl:param name="type" select="''"/>
 
   <xsl:variable name="key" select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))"/>
-  <xsl:variable name="refs" select="key('primary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
+  <xsl:variable name="refs" select="key('primary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
   <dt>
     <xsl:value-of select="primary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
+    <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
       <xsl:apply-templates select="." mode="reference">
         <xsl:with-param name="position" select="position()"/>
         <xsl:with-param name="scope" select="$scope"/>
@@ -236,7 +236,7 @@
     </xsl:for-each>
 
     <xsl:if test="$refs[not(secondary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", " ", " ", see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
+      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", " ", " ", see))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
         <xsl:with-param name="position" select="position()"/>
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:with-param name="role" select="$role"/>
@@ -248,14 +248,14 @@
   <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::seealso]">
     <dd>
       <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", " ", " ", seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
+        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", " ", " ", seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
           <xsl:with-param name="position" select="position()"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="type" select="$type"/>
           <xsl:sort select="translate(seealso, 'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻ&#
 7868;ẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆ&#7
 751;ṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙ&#24
 9;ÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGG
 GGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
         </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-secondary">
+        <xsl:apply-templates select="$refs[secondary et count(.|key('secondary', concat($key, " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-secondary">
           <xsl:with-param name="position" select="position()"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -273,10 +273,10 @@
   <xsl:param name="type" select="''"/>
 
   <xsl:variable name="key" select="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])))"/>
-  <xsl:variable name="refs" select="key('secondary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
+  <xsl:variable name="refs" select="key('secondary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
   <dt>
     <xsl:value-of select="secondary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
+    <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
       <xsl:apply-templates select="." mode="reference">
         <xsl:with-param name="position" select="position()"/>
         <xsl:with-param name="scope" select="$scope"/>
@@ -286,7 +286,7 @@
     </xsl:for-each>
 
     <xsl:if test="$refs[not(tertiary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", " ", see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
+      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", " ", see))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
         <xsl:with-param name="position" select="position()"/>
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:with-param name="role" select="$role"/>
@@ -298,14 +298,14 @@
   <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::seealso]">
     <dd>
       <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", " ", seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
+        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", " ", seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
           <xsl:with-param name="position" select="position()"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="type" select="$type"/>
           <xsl:sort select="translate(seealso, 'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻ&#
 7868;ẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆ&#7
 751;ṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙ&#24
 9;ÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGG
 GGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
         </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-tertiary">
+        <xsl:apply-templates select="$refs[tertiary et count(.|key('tertiary', concat($key, " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-tertiary">
           <xsl:with-param name="position" select="position()"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -323,10 +323,10 @@
   <xsl:param name="type" select="''"/>
 
   <xsl:variable name="key" select="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""])))"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
+  <xsl:variable name="refs" select="key('tertiary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
   <dt>
     <xsl:value-of select="tertiary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
+    <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, " ", generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
       <xsl:apply-templates select="." mode="reference">
         <xsl:with-param name="position" select="position()"/>
         <xsl:with-param name="scope" select="$scope"/>
@@ -336,7 +336,7 @@
     </xsl:for-each>
 
     <xsl:if test="$refs/see">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""])), " ", see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
+      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""])), " ", see))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
         <xsl:with-param name="position" select="position()"/>
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:with-param name="role" select="$role"/>
@@ -348,7 +348,7 @@
   <xsl:if test="$refs/seealso">
     <dd>
       <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""])), " ", seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
+        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""])), " ", normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""])), " ", seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
           <xsl:with-param name="position" select="position()"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -394,7 +394,7 @@
   </xsl:choose>
 
   <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
+    <xsl:when test="@zone et string(@zone)">
       <xsl:call-template name="reference">
         <xsl:with-param name="zones" select="normalize-space(@zone)"/>
         <xsl:with-param name="position" select="position()"/>
@@ -408,7 +408,7 @@
         <xsl:apply-templates select="." mode="class.attribute"/>
         <xsl:variable name="title">
           <xsl:choose>
-            <xsl:when test="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]/titleabbrev and $index.prefer.titleabbrev != 0">
+            <xsl:when test="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]/titleabbrev et $index.prefer.titleabbrev != 0">
               <xsl:apply-templates select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]" mode="titleabbrev.markup"/>
             </xsl:when>
             <xsl:otherwise>
@@ -420,7 +420,7 @@
         <xsl:attribute name="href">
           <xsl:call-template name="href.target">
             <xsl:with-param name="object" select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
+            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
           </xsl:call-template>
         </xsl:attribute>
 
@@ -428,8 +428,8 @@
       </a>
 
       <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-      <xsl:if test="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]">
-        <xsl:apply-templates select="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][last()]" mode="reference">
+      <xsl:if test="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]">
+        <xsl:apply-templates select="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][last()]" mode="reference">
           <xsl:with-param name="position" select="position()"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -450,14 +450,14 @@
   <xsl:choose>
     <xsl:when test="contains($zones, ' ')">
       <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
+      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
 
       <a>
         <xsl:apply-templates select="." mode="class.attribute"/>
         <xsl:attribute name="href">
           <xsl:call-template name="href.target">
             <xsl:with-param name="object" select="$target[1]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
+            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
           </xsl:call-template>
         </xsl:attribute>
         <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
@@ -473,14 +473,14 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
+      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
 
       <a>
         <xsl:apply-templates select="." mode="class.attribute"/>
         <xsl:attribute name="href">
           <xsl:call-template name="href.target">
             <xsl:with-param name="object" select="$target[1]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
+            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
           </xsl:call-template>
         </xsl:attribute>
         <xsl:apply-templates select="$target[1]" mode="index-title-content"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: autotoc.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: autotoc.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -20,7 +20,7 @@
   </xsl:choose>
 </xsl:variable>
 
-<!-- this is just hack because dl and ul aren't completely isomorphic -->
+<!-- this is just hack because dl et ul aren't completely isomorphic -->
 <xsl:variable name="toc.dd.type">
   <xsl:choose>
     <xsl:when test="$toc.list.type = 'dl'">dd</xsl:when>
@@ -54,7 +54,7 @@
       </xsl:variable>
       <xsl:variable name="toc" select="document($manual.toc, .)"/>
       <xsl:variable name="tocentry" select="$toc//tocentry[@linkend=$id]"/>
-      <xsl:if test="$tocentry and $tocentry/*">
+      <xsl:if test="$tocentry et $tocentry/*">
         <div class="toc">
           <xsl:copy-of select="$toc.title"/>
           <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
@@ -173,13 +173,13 @@
   <xsl:call-template name="make.toc">
     <xsl:with-param name="toc-context" select="$toc-context"/>
     <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="section|sect1                                          |simplesect[$simplesect.in.toc != 0]                                          |refentry                                          |article|bibliography|glossary                                          |appendix|index                                          |bridgehead[not(@renderas)                                                      and $bridgehead.in.toc != 0]                                          |.//bridgehead[@renderas='sect1'                                                         and $bridgehead.in.toc != 0]"/>
+    <xsl:with-param name="nodes" select="section|sect1                                          |simplesect[$simplesect.in.toc != 0]                                          |refentry                                          |article|bibliography|glossary                                          |appendix|index                                          |bridgehead[not(@renderas)                                                      et $bridgehead.in.toc != 0]                                          |.//bridgehead[@renderas='sect1'                                                         and $bridgehead.in.toc != 0]"/>
   </xsl:call-template>
 </xsl:template>
 
 <xsl:template name="component.toc.separator">
   <!-- Customize to output something between
-       component.toc and first output -->
+       component.toc et first output -->
 </xsl:template>
 
 <xsl:template name="section.toc">
@@ -196,7 +196,7 @@
 
 <xsl:template name="section.toc.separator">
   <!-- Customize to output something between
-       section.toc and first output -->
+       section.toc et first output -->
 </xsl:template>
 <!-- ==================================================================== -->
 
@@ -276,11 +276,11 @@
     <xsl:call-template name="toc.line">
       <xsl:with-param name="toc-context" select="$toc-context"/>
     </xsl:call-template>
-    <xsl:if test="$toc.listitem.type = 'li'                   and $toc.section.depth > $depth and                    ( ($qanda.in.toc = 0 and count($nodes)>0) or                     ($qanda.in.toc != 0 and count($nodes.plus)>0) )                   and $toc.max.depth > $depth.from.context">
+    <xsl:if test="$toc.listitem.type = 'li'                   et $toc.section.depth > $depth and                    ( ($qanda.in.toc = 0 and count($nodes)>0) or                     ($qanda.in.toc != 0 and count($nodes.plus)>0) )                   and $toc.max.depth > $depth.from.context">
       <xsl:copy-of select="$subtoc.list"/>
     </xsl:if>
   </xsl:element>
-  <xsl:if test="$toc.listitem.type != 'li'                 and $toc.section.depth > $depth and                  ( ($qanda.in.toc = 0 and count($nodes)>0) or                   ($qanda.in.toc != 0 and count($nodes.plus)>0) )                 and $toc.max.depth > $depth.from.context">
+  <xsl:if test="$toc.listitem.type != 'li'                 et $toc.section.depth > $depth and                  ( ($qanda.in.toc = 0 and count($nodes)>0) or                   ($qanda.in.toc != 0 and count($nodes.plus)>0) )                 and $toc.max.depth > $depth.from.context">
     <xsl:copy-of select="$subtoc.list"/>
   </xsl:if>
 </xsl:template>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
 
 
 <!-- ********************************************************************
-     $Id: biblio-iso690.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: biblio-iso690.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      The original code for processing bibliography in ISO690 style
      was provided by Jana Dvorakova <jana4u at seznam.cz>
@@ -54,17 +54,17 @@
     </xsl:when>
 
     <!-- CONTRIBUTIONS TO MONOGRAPHS -->
-    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' and ./biblioset/@relation='book')">
+    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' et ./biblioset/@relation='book')">
       <xsl:call-template name="iso690.paper.mon"/>
     </xsl:when>
 
     <!-- ARTICLES, ETC., IN SERIALS -->
-    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' and ./biblioset/@relation='article')">
+    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' et ./biblioset/@relation='article')">
       <xsl:call-template name="iso690.article"/>
     </xsl:when>
 
     <!-- PATENT DOCUMENTS -->
-    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] and ./bibliomisc[@role='patentnum'])">
+    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] et ./bibliomisc[@role='patentnum'])">
       <xsl:call-template name="iso690.patent"/>
     </xsl:when>
 
@@ -82,7 +82,7 @@
 <xsl:template name="iso690.monogr">
   <!-- Primary responsibility -->
   <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Subordinate responsibility -->
   <xsl:call-template name="iso690.secondary"/>
@@ -96,7 +96,7 @@
   <xsl:call-template name="iso690.serie"/>
   <!-- Notes -->
   <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
+  <!-- Avaibility et access -->
   <xsl:call-template name="iso690.access"/>
   <!-- Standard number -->
   <xsl:call-template name="iso690.isbn"/>
@@ -104,7 +104,7 @@
 
 <!-- SERIALS -->
 <xsl:template name="iso690.serial">
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Responsibility [nonEL] -->
   <xsl:if test="not(./bibliomisc[@role='medium'])">
@@ -114,7 +114,7 @@
   <xsl:call-template name="iso690.edition">
     <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
   </xsl:call-template>
-  <!-- Issue designation (date and/or num) [nonEL] -->
+  <!-- Issue designation (date et/or num) [nonEL] -->
   <xsl:if test="not(./bibliomisc[@role='medium'])">
     <xsl:call-template name="iso690.issuing"/>
   </xsl:if>
@@ -124,7 +124,7 @@
   <xsl:call-template name="iso690.serie"/>
   <!-- Notes -->
   <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
+  <!-- Avaibility et access -->
   <xsl:call-template name="iso690.access"/>
   <!-- Standard number -->
   <xsl:call-template name="iso690.issn"/>
@@ -134,7 +134,7 @@
 <xsl:template name="iso690.monogr.part">
   <!-- Primary responsibility of host document -->
   <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium of host document -->
+  <!-- Title et Type of medium of host document -->
   <xsl:call-template name="iso690.title"/>
   <!-- Subordinate responsibility of host document [EL] -->
   <xsl:if test="./bibliomisc[@role='medium']">
@@ -158,7 +158,7 @@
   <!-- Numeration within host document [EL] -->
   <!-- Notes [EL] -->
     <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
+  <!-- Avaibility et access [EL] -->
     <xsl:call-template name="iso690.access"/>
   <!-- Standard number [EL] -->
     <xsl:call-template name="iso690.isbn"/>
@@ -189,7 +189,7 @@
 <!-- Host -->
   <!-- Primary responsibility -->
   <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Subordinate responsibility [EL] -->
   <xsl:if test="./bibliomisc[@role='medium']">
@@ -205,7 +205,7 @@
   <xsl:if test="./bibliomisc[@role='medium']">
   <!-- Notes [EL] -->
     <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
+  <!-- Avaibility et access [EL] -->
     <xsl:call-template name="iso690.access"/>
   <!-- Standard number [EL] -->
     <xsl:call-template name="iso690.isbn"/>
@@ -236,7 +236,7 @@
 
 <xsl:template match="biblioset" mode="iso690.article.jour">
 <!-- Serial -->
-  <!-- Title and Type of medium -->
+  <!-- Title et Type of medium -->
   <xsl:call-template name="iso690.title"/>
   <!-- Edition -->
   <xsl:call-template name="iso690.edition">
@@ -248,7 +248,7 @@
   <xsl:if test="./bibliomisc[@role='medium']">
   <!-- Notes [EL] -->
     <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
+  <!-- Avaibility et access [EL] -->
     <xsl:call-template name="iso690.access"/>
   <!-- Standard number [EL] -->
     <xsl:call-template name="iso690.issn"/>
@@ -326,30 +326,30 @@
     <xsl:when test="$count > $person.count"/>
     <xsl:otherwise>
       <xsl:choose>
-        <xsl:when test="$person.count < 4 and not($group)">
+        <xsl:when test="$person.count < 4 et not($group)">
           <xsl:call-template name="iso690.author">
             <xsl:with-param name="node" select="$person.list[position()=$count]"/>
           </xsl:call-template>
           <xsl:choose>
-            <xsl:when test="$person.count = 2 and $count = 1 and $biblioentry.alt.primary.seps != 0">
+            <xsl:when test="$person.count = 2 et $count = 1 and $biblioentry.alt.primary.seps != 0">
               <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.two.sep'"/></xsl:call-template>
             </xsl:when>
-            <xsl:when test="$person.count = 2 and $count = 1">
+            <xsl:when test="$person.count = 2 et $count = 1">
               <xsl:call-template name="gentext.template">
                 <xsl:with-param name="context" select="'authorgroup'"/>
                 <xsl:with-param name="name" select="'sep2'"/>
               </xsl:call-template>
             </xsl:when>
-            <xsl:when test="$person.count > 2 and $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
+            <xsl:when test="$person.count > 2 et $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
               <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.last.sep'"/></xsl:call-template>
             </xsl:when>
-            <xsl:when test="$person.count > 2 and $count+1 = $person.count">
+            <xsl:when test="$person.count > 2 et $count+1 = $person.count">
               <xsl:call-template name="gentext.template">
                 <xsl:with-param name="context" select="'authorgroup'"/>
                 <xsl:with-param name="name" select="'seplast'"/>
               </xsl:call-template>
             </xsl:when>
-            <xsl:when test="$count < $person.count and $biblioentry.alt.primary.seps != 0">
+            <xsl:when test="$count < $person.count et $biblioentry.alt.primary.seps != 0">
               <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.more.sep'"/></xsl:call-template>
             </xsl:when>
             <xsl:when test="$count < $person.count">
@@ -401,7 +401,7 @@
 
         <xsl:otherwise>
           <xsl:choose>
-            <xsl:when test="($biblioentry.primary.count>=3) and ($person.count>=3)">
+            <xsl:when test="($biblioentry.primary.count>=3) et ($person.count>=3)">
               <xsl:call-template name="iso690.author.list">
                 <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]|$person.list[3]"/>
                 <xsl:with-param name="person.count" select="3"/>
@@ -410,7 +410,7 @@
                 <xsl:with-param name="group"/>
               </xsl:call-template>
             </xsl:when>
-            <xsl:when test="($biblioentry.primary.count>1) and  ($person.count>1)">
+            <xsl:when test="($biblioentry.primary.count>1) et  ($person.count>1)">
               <xsl:call-template name="iso690.author.list">
                 <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]"/>
                 <xsl:with-param name="person.count" select="2"/>
@@ -445,7 +445,7 @@
       <span style="text-transform:uppercase">
         <xsl:apply-templates mode="iso690.mode" select="$node//surname[1]"/>
       </span>
-      <xsl:if test="$node//surname and $node//firstname">
+      <xsl:if test="$node//surname et $node//firstname">
         <xsl:value-of select="$lastfirst.sep"/>
       </xsl:if>
       <xsl:apply-templates mode="iso690.mode" select="$node//firstname[1]"/>
@@ -462,7 +462,7 @@
   <xsl:apply-templates mode="iso690.mode"/>
 </xsl:template>
 
-<!-- Title and Type of medium -->
+<!-- Title et Type of medium -->
 <xsl:template name="iso690.title">
   <xsl:param name="medium" select="./bibliomisc[@role='medium']"/>
   <xsl:param name="italic" select="1"/>
@@ -590,7 +590,7 @@
   </xsl:call-template>
 </xsl:template>
 
-<!-- Issue designation (date and/or num) -->
+<!-- Issue designation (date et/or num) -->
 <xsl:template name="iso690.issuing">
   <xsl:param name="issuing.div">
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
@@ -602,7 +602,7 @@
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
   </xsl:param>
   <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2] and ./issuenum[2]">
+    <xsl:when test="./pubdate[@role='issuing'] et ./volumenum[2] and ./issuenum[2]">
       <xsl:call-template name="iso690.issuedate"/>
       <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
         <xsl:with-param name="sep" select="$issuing.div"/>
@@ -617,7 +617,7 @@
         <xsl:with-param name="sep" select="$issuing.sep"/>
       </xsl:apply-templates>
     </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2]">
+    <xsl:when test="./pubdate[@role='issuing'] et ./volumenum[2]">
       <xsl:call-template name="iso690.issuedate"/>
       <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
         <xsl:with-param name="sep" select="$issuing.range"/>
@@ -626,7 +626,7 @@
         <xsl:with-param name="sep" select="$issuing.sep"/>
       </xsl:apply-templates>
     </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum and ./issuenum">
+    <xsl:when test="./pubdate[@role='issuing'] et ./volumenum and ./issuenum">
       <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
         <xsl:with-param name="sep" select="$issuing.div"/>
       </xsl:apply-templates>
@@ -848,13 +848,13 @@
     </xsl:choose>
   </xsl:if>
   <xsl:choose>
-    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] and $upd!=0">
+    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] et $upd!=0">
       <xsl:call-template name="iso690.endsep">
         <xsl:with-param name="text" select="$datecit2"/>
         <xsl:with-param name="sep" select="$sep"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] and $upd!=0">
+    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] et $upd!=0">
       <xsl:call-template name="iso690.endsep">
         <xsl:with-param name="text" select="string(../date[@role='upd'])"/>
         <xsl:with-param name="sep" select="$sep"/>
@@ -1013,12 +1013,12 @@
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
   </xsl:param>
   <xsl:choose>
-    <xsl:when test="./volumenum and not(./issuenum) and not(./pagenums)">
+    <xsl:when test="./volumenum et not(./issuenum) and not(./pagenums)">
       <xsl:apply-templates mode="iso690.mode" select="./volumenum">
         <xsl:with-param name="sep" select="$location.sep"/>
       </xsl:apply-templates>
     </xsl:when>
-    <xsl:when test="./issuenum and not(./pagenums)">
+    <xsl:when test="./issuenum et not(./pagenums)">
       <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
       <xsl:apply-templates mode="iso690.mode" select="./issuenum">
         <xsl:with-param name="sep" select="$location.sep"/>
@@ -1086,7 +1086,7 @@
   </xsl:call-template>
 </xsl:template>
 
-<!-- Avaibility and access -->
+<!-- Avaibility et access -->
 <xsl:template name="iso690.access">
   <xsl:for-each select="./biblioid[@class='uri']|./bibliomisc[@role='access']">
     <xsl:choose>
@@ -1228,8 +1228,8 @@
   <xsl:apply-templates mode="iso690.mode" select="./address/country"/>
   <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patenttype']"/>
   <xsl:choose>
-    <xsl:when test="./biblioid[@class='other' and @otherclass='patentnum']">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' and @otherclass='patentnum']"/>
+    <xsl:when test="./biblioid[@class='other' et @otherclass='patentnum']">
+      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' et @otherclass='patentnum']"/>
     </xsl:when>
     <xsl:otherwise>
       <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patentnum']"/>
@@ -1263,7 +1263,7 @@
 </xsl:template>
 
 <!-- Number -->
-<xsl:template match="biblioid[@class='other' and @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
+<xsl:template match="biblioid[@class='other' et @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
   <xsl:param name="patnum.sep">
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patnum.sep'"/></xsl:call-template>
   </xsl:param>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: biblio.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: biblio.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -72,7 +72,7 @@
     <xsl:if test="blockinfo/title|info/title|title">
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
-    <xsl:apply-templates select="*[not(self::blockinfo)                                    and not(self::info)                                    and not(self::title)                                    and not(self::titleabbrev)                                    and not(self::biblioentry)                                    and not(self::bibliomixed)]"/>
+    <xsl:apply-templates select="*[not(self::blockinfo)                                    et not(self::info)                                    and not(self::title)                                    and not(self::titleabbrev)                                    and not(self::biblioentry)                                    and not(self::bibliomixed)]"/>
     <xsl:apply-templates select="biblioentry|bibliomixed"/>
   </div>
 </xsl:template>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: block.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: block.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -35,12 +35,12 @@
 <xsl:template match="para">
   <xsl:call-template name="paragraph">
     <xsl:with-param name="class">
-      <xsl:if test="@role and $para.propagates.style != 0">
+      <xsl:if test="@role et $para.propagates.style != 0">
         <xsl:value-of select="@role"/>
       </xsl:if>
     </xsl:with-param>
     <xsl:with-param name="content">
-      <xsl:if test="position() = 1 and parent::listitem">
+      <xsl:if test="position() = 1 et parent::listitem">
         <xsl:call-template name="anchor">
           <xsl:with-param name="node" select="parent::listitem"/>
         </xsl:call-template>
@@ -83,7 +83,7 @@
 <xsl:template match="simpara">
   <!-- see also listitem/simpara in lists.xsl -->
   <p>
-    <xsl:if test="@role and $para.propagates.style != 0">
+    <xsl:if test="@role et $para.propagates.style != 0">
       <xsl:apply-templates select="." mode="class.attribute">
         <xsl:with-param name="class" select="@role"/>
       </xsl:apply-templates>
@@ -97,7 +97,7 @@
 <xsl:template match="formalpara">
   <xsl:call-template name="paragraph">
     <xsl:with-param name="class">
-      <xsl:if test="@role and $para.propagates.style != 0">
+      <xsl:if test="@role et $para.propagates.style != 0">
         <xsl:value-of select="@role"/>
       </xsl:if>
     </xsl:with-param>
@@ -125,7 +125,7 @@
 
   <b>
     <xsl:copy-of select="$titleStr"/>
-    <xsl:if test="$lastChar != ''                   and not(contains($runinhead.title.end.punct, $lastChar))">
+    <xsl:if test="$lastChar != ''                   et not(contains($runinhead.title.end.punct, $lastChar))">
       <xsl:value-of select="$runinhead.default.title.end.punct"/>
     </xsl:if>
     <xsl:text> </xsl:text>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt" version="1.0">
 
 <!-- ********************************************************************
-     $Id: callout.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: callout.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -19,7 +19,7 @@
   <xsl:variable name="verbatim" select="programlisting|screen"/>
 
   <xsl:choose>
-    <xsl:when test="$use.extensions != '0'                     and $callouts.extension != '0'">
+    <xsl:when test="$use.extensions != '0'                     et $callouts.extension != '0'">
       <xsl:variable name="rtf">
         <xsl:apply-templates select="$verbatim">
           <xsl:with-param name="suppress-numbers" select="'1'"/>
@@ -43,7 +43,7 @@
       </xsl:variable>
 
       <xsl:choose>
-        <xsl:when test="$verbatim/@linenumbering = 'numbered'                         and $linenumbering.extension != '0'">
+        <xsl:when test="$verbatim/@linenumbering = 'numbered'                         et $linenumbering.extension != '0'">
           <div>
             <xsl:apply-templates select="." mode="class.attribute"/>
             <xsl:call-template name="number.rtf.lines">
@@ -146,10 +146,10 @@
   <xsl:param name="conum" select="1"/>
 
   <xsl:choose>
-    <xsl:when test="$callout.graphics != 0                     and $conum <= $callout.graphics.number.limit">
+    <xsl:when test="$callout.graphics != 0                     et $conum <= $callout.graphics.number.limit">
       <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}" alt="{$conum}" border="0"/>
     </xsl:when>
-    <xsl:when test="$callout.unicode != 0                     and $conum <= $callout.unicode.number.limit">
+    <xsl:when test="$callout.unicode != 0                     et $conum <= $callout.unicode.number.limit">
       <xsl:choose>
         <xsl:when test="$callout.unicode.start.character = 10102">
           <xsl:choose>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: changebars.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: changebars.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl cf ng db" version="1.0">
 
 <!-- ********************************************************************
-     $Id: chunk-code.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: chunk-code.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -39,8 +39,8 @@
   -->
 
   <!-- 2003-11-25 by ndw:
-       The following test used to read test="$ischunk != 0 and $fn != ''"
-       I've removed the ischunk part of the test so that href.to.uri and
+       The following test used to read test="$ischunk != 0 et $fn != ''"
+       I've removed the ischunk part of the test so that href.to.uri et
        href.from.uri will be fully qualified even if the source or target
        isn't a chunk. I *think* that if $fn != '' then it's appropriate
        to put the directory on the front, even if the element isn't a
@@ -73,15 +73,15 @@
         <xsl:value-of select="$dbhtml-filename"/>
       </xsl:when>
       <!-- if this is the root element, use the root.filename -->
-      <xsl:when test="not(parent::*) and $root.filename != ''">
+      <xsl:when test="not(parent::*) et $root.filename != ''">
         <xsl:value-of select="$root.filename"/>
         <xsl:value-of select="$html.ext"/>
       </xsl:when>
       <!-- Special case -->
-      <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)">
+      <xsl:when test="self::legalnotice et not($generate.legalnotice.link = 0)">
         <xsl:choose>
-          <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)">
-            <!-- * if this legalnotice has an ID, then go ahead and use -->
+          <xsl:when test="(@id or @xml:id) et not($use.id.as.filename = 0)">
+            <!-- * if this legalnotice has an ID, then go ahead et use -->
             <!-- * just the value of that ID as the basename for the file -->
             <!-- * (that is, without prepending an "ln-" too it) -->
             <xsl:value-of select="(@id|@xml:id)[1]"/>
@@ -94,14 +94,14 @@
               <xsl:call-template name="object.id"/>
             </xsl:variable>
             <!-- * ...and then we take that generated ID, prepend an -->
-            <!-- * "ln-" to it, and use that as the basename for the file -->
+            <!-- * "ln-" to it, et use that as the basename for the file -->
             <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <!-- if there's no dbhtml filename, and if we're to use IDs as -->
+      <!-- if there's no dbhtml filename, et if we're to use IDs as -->
       <!-- filenames, then use the ID to generate the filename. -->
-      <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0">
+      <xsl:when test="(@id or @xml:id) et $use.id.as.filename != 0">
         <xsl:value-of select="(@id|@xml:id)[1]"/>
         <xsl:value-of select="$html.ext"/>
       </xsl:when>
@@ -123,7 +123,7 @@
       </xsl:choose>
     </xsl:when>
 
-    <xsl:when test="not($recursive) and $filename != ''">
+    <xsl:when test="not($recursive) et $filename != ''">
       <!-- if this chunk has an explicit name, use it -->
       <xsl:value-of select="$filename"/>
     </xsl:when>
@@ -402,10 +402,10 @@
   </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
+         toss the namespace et continue.  Use the docbook5 namespaced
 	 stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
+    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     et (*/self::ng:* or */self::db:*)">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$doc.title"/>
@@ -496,7 +496,7 @@
 
 <xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon">
   <xsl:choose>
-    <xsl:when test="$onechunk != 0 and parent::*">
+    <xsl:when test="$onechunk != 0 et parent::*">
       <xsl:apply-imports/>
     </xsl:when>
     <xsl:otherwise>
@@ -624,7 +624,7 @@
   </xsl:variable>
   <xsl:variable name="mediaobject" select="."/>
 
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
+  <xsl:if test="$html.longdesc != 0 et $mediaobject/textobject[not(phrase)]">
     <xsl:call-template name="longdesc.uri">
       <xsl:with-param name="mediaobject" select="$mediaobject"/>
     </xsl:call-template>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl cf ng db">
 
 <!-- ********************************************************************
-     $Id: chunk-common.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: chunk-common.xsl 7835 2009-07-08 17:06:16Z bdubbs $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -27,7 +27,7 @@
   <xsl:if test="$chunk.fast != 0">
     <xsl:choose>
       <xsl:when test="function-available('exsl:node-set')">
-        <xsl:message>Computing chunks...</xsl:message>
+        <!-- <xsl:message>Computing chunks...</xsl:message> -->
         <xsl:apply-templates select="/*" mode="find.chunks"/>
       </xsl:when>
       <xsl:otherwise>
@@ -48,7 +48,7 @@
   </xsl:param>
 
   <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
+    <xsl:when test="$chunk.fast != 0 et function-available('exsl:node-set')">
       <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
       <xsl:variable name="genid" select="generate-id()"/>
 
@@ -61,7 +61,7 @@
       <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
 
       <xsl:choose>
-        <xsl:when test="$onechunk != 0 and parent::*">
+        <xsl:when test="$onechunk != 0 et parent::*">
           <xsl:copy-of select="$content"/>
         </xsl:when>
         <xsl:otherwise>
@@ -75,7 +75,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:choose>
-        <xsl:when test="$onechunk != 0 and not(parent::*)">
+        <xsl:when test="$onechunk != 0 et not(parent::*)">
           <xsl:call-template name="chunk-all-sections">
             <xsl:with-param name="content" select="$content"/>
           </xsl:call-template>
@@ -149,20 +149,20 @@
   </xsl:param>
 
   <!-- These xpath expressions are really hairy. The trick is to pick sections -->
-  <!-- that are not first children and are not the children of first children -->
+  <!-- that are not first children et are not the children of first children -->
 
   <!-- Break these variables into pieces to work around
        http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6063 -->
 
-  <xsl:variable name="prev-v1" select="(ancestor::sect1[$chunk.section.depth > 0                                and preceding-sibling::sect1][1]               |ancestor::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |ancestor::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |a
 ncestor::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::section[$chunk.section.depth > count(ancestor::section)                                 and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
+  <xsl:variable name="prev-v1" select="(ancestor::sect1[$chunk.section.depth > 0                                et preceding-sibling::sect1][1]               |ancestor::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |ancestor::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |an
 cestor::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::section[$chunk.section.depth > count(ancestor::section)                                 and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
 
-  <xsl:variable name="prev-v2" select="(preceding::sect1[$chunk.section.depth > 0                                and preceding-sibling::sect1][1]               |preceding::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |preceding::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]             
   |preceding::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::section[$chunk.section.depth > count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
+  <xsl:variable name="prev-v2" select="(preceding::sect1[$chunk.section.depth > 0                                et preceding-sibling::sect1][1]               |preceding::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |preceding::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]              
  |preceding::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::section[$chunk.section.depth > count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
 
   <xsl:variable name="prev" select="(preceding::book[1]              |preceding::preface[1]              |preceding::chapter[1]              |preceding::appendix[1]              |preceding::part[1]              |preceding::reference[1]              |preceding::refentry[1]              |preceding::colophon[1]              |preceding::article[1]              |preceding::bibliography[parent::article or parent::book or parent::part][1]              |preceding::glossary[parent::article or parent::book or parent::part][1]              |preceding::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |preceding::setindex[$generate.index != 0][1]              |ancestor::set              |ancestor::book[1]              |ancestor::preface[1]              |ancestor::chapter[1]              |ancestor::appendix[1]              |ancestor::part[1]              |ancestor::reference[1]              |ancestor::article[1]  
             |$prev-v1              |$prev-v2)[last()]"/>
 
-  <xsl:variable name="next-v1" select="(following::sect1[$chunk.section.depth > 0                                and preceding-sibling::sect1][1]               |following::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |following::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]             
   |following::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::section[$chunk.section.depth > count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[1]"/>
+  <xsl:variable name="next-v1" select="(following::sect1[$chunk.section.depth > 0                                et preceding-sibling::sect1][1]               |following::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |following::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]              
  |following::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::section[$chunk.section.depth > count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[1]"/>
 
-  <xsl:variable name="next-v2" select="(descendant::sect1[$chunk.section.depth > 0                                and preceding-sibling::sect1][1]               |descendant::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |descendant::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]         
       |descendant::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::section[$chunk.section.depth > count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])])[1]"/>
+  <xsl:variable name="next-v2" select="(descendant::sect1[$chunk.section.depth > 0                                et preceding-sibling::sect1][1]               |descendant::sect2[$chunk.section.depth > 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |descendant::sect3[$chunk.section.depth > 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::sect4[$chunk.section.depth > 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]          
      |descendant::sect5[$chunk.section.depth > 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::section[$chunk.section.depth > count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])])[1]"/>
 
   <xsl:variable name="next" select="(following::book[1]              |following::preface[1]              |following::chapter[1]              |following::appendix[1]              |following::part[1]              |following::reference[1]              |following::refentry[1]              |following::colophon[1]              |following::bibliography[parent::article or parent::book or parent::part][1]              |following::glossary[parent::article or parent::book or parent::part][1]              |following::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |following::article[1]              |following::setindex[$generate.index != 0][1]              |descendant::book[1]              |descendant::preface[1]              |descendant::chapter[1]              |descendant::appendix[1]              |descendant::article[1]              |descendant::bibliography[parent::article or parent::book or parent::part][
 1]              |descendant::glossary[parent::article or parent::book or parent::part][1]              |descendant::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |descendant::colophon[1]              |descendant::setindex[$generate.index != 0][1]              |descendant::part[1]              |descendant::reference[1]              |descendant::refentry[1]              |$next-v1              |$next-v2)[1]"/>
 
@@ -323,7 +323,7 @@
 
   <xsl:if test="string($lots) != ''">
     <xsl:choose>
-      <xsl:when test="$chunk.tocs.and.lots != 0 and not(parent::*)">
+      <xsl:when test="$chunk.tocs.and.lots != 0 et not(parent::*)">
         <xsl:call-template name="write.chunk">
           <xsl:with-param name="filename">
             <xsl:call-template name="make-relative-filename">
@@ -595,7 +595,7 @@
               in this chunk should be referenced. I don't think it
               does any harm to reference them all, but it adds
               unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
+  <xsl:if test="$annotation.support != 0 et //annotation">
     <div class="annotation-list">
       <div class="annotation-nocss">
         <p>The following annotations are from this essay. You are seeing
@@ -667,30 +667,30 @@
   <xsl:choose>
     <xsl:when test="not($node/parent::*)">1</xsl:when>
 
-    <xsl:when test="local-name($node) = 'sect1'                     and $chunk.section.depth >= 1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect1) > 0)">
+    <xsl:when test="local-name($node) = 'sect1'                     et $chunk.section.depth >= 1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect1) > 0)">
       <xsl:text>1</xsl:text>
     </xsl:when>
-    <xsl:when test="local-name($node) = 'sect2'                     and $chunk.section.depth >= 2                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect2) > 0)">
+    <xsl:when test="local-name($node) = 'sect2'                     et $chunk.section.depth >= 2                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect2) > 0)">
       <xsl:call-template name="chunk">
         <xsl:with-param name="node" select="$node/parent::*"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="local-name($node) = 'sect3'                     and $chunk.section.depth >= 3                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect3) > 0)">
+    <xsl:when test="local-name($node) = 'sect3'                     et $chunk.section.depth >= 3                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect3) > 0)">
       <xsl:call-template name="chunk">
         <xsl:with-param name="node" select="$node/parent::*"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="local-name($node) = 'sect4'                     and $chunk.section.depth >= 4                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect4) > 0)">
+    <xsl:when test="local-name($node) = 'sect4'                     et $chunk.section.depth >= 4                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect4) > 0)">
       <xsl:call-template name="chunk">
         <xsl:with-param name="node" select="$node/parent::*"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="local-name($node) = 'sect5'                     and $chunk.section.depth >= 5                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect5) > 0)">
+    <xsl:when test="local-name($node) = 'sect5'                     et $chunk.section.depth >= 5                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect5) > 0)">
       <xsl:call-template name="chunk">
         <xsl:with-param name="node" select="$node/parent::*"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="local-name($node) = 'section'                     and $chunk.section.depth >= count($node/ancestor::section)+1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::section) > 0)">
+    <xsl:when test="local-name($node) = 'section'                     et $chunk.section.depth >= count($node/ancestor::section)+1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::section) > 0)">
       <xsl:call-template name="chunk">
         <xsl:with-param name="node" select="$node/parent::*"/>
       </xsl:call-template>
@@ -703,14 +703,14 @@
     <xsl:when test="local-name($node)='part'">1</xsl:when>
     <xsl:when test="local-name($node)='reference'">1</xsl:when>
     <xsl:when test="local-name($node)='refentry'">1</xsl:when>
-    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) > 0)                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='bibliography'                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='glossary'                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
+    <xsl:when test="local-name($node)='index' et ($generate.index != 0 or count($node/*) > 0)                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
+    <xsl:when test="local-name($node)='bibliography'                     et (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
+    <xsl:when test="local-name($node)='glossary'                     et (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
     <xsl:when test="local-name($node)='colophon'">1</xsl:when>
     <xsl:when test="local-name($node)='book'">1</xsl:when>
     <xsl:when test="local-name($node)='set'">1</xsl:when>
     <xsl:when test="local-name($node)='setindex'">1</xsl:when>
-    <xsl:when test="local-name($node)='legalnotice'                     and $generate.legalnotice.link != 0">1</xsl:when>
+    <xsl:when test="local-name($node)='legalnotice'                     et $generate.legalnotice.link != 0">1</xsl:when>
     <xsl:otherwise>0</xsl:otherwise>
   </xsl:choose>
 </xsl:template>
@@ -741,13 +741,13 @@
   <!-- * If $toc-context contains some node other than the current node, -->
   <!-- * it means we're processing a link in a TOC. In that case, to -->
   <!-- * ensure the link will work correctly, we need to take a look at -->
-  <!-- * where the file containing the TOC will get written, and where -->
+  <!-- * where the file containing the TOC will get written, et where -->
   <!-- * the file that's being linked to will get written. -->
   <xsl:variable name="toc-output-dir">
     <xsl:if test="not($toc-context = .)">
-      <!-- * Get the $toc-context node and all its ancestors, look down -->
+      <!-- * Get the $toc-context node et all its ancestors, look down -->
       <!-- * through them to find the last/closest node to the -->
-      <!-- * toc-context node that has a "dbhtml dir" PI, and get the -->
+      <!-- * toc-context node that has a "dbhtml dir" PI, et get the -->
       <!-- * directory name from that. That's the name of the directory -->
       <!-- * to which the current toc output file will get written. -->
       <xsl:call-template name="dbhtml-dir">
@@ -757,9 +757,9 @@
   </xsl:variable>
   <xsl:variable name="linked-file-output-dir">
     <xsl:if test="not($toc-context = .)">
-      <!-- * Get the current node and all its ancestors, look down -->
+      <!-- * Get the current node et all its ancestors, look down -->
       <!-- * through them to find the last/closest node to the current -->
-      <!-- * node that has a "dbhtml dir" PI, and get the directory name -->
+      <!-- * node that has a "dbhtml dir" PI, et get the directory name -->
       <!-- * from that.  That's the name of the directory to which the -->
       <!-- * file that's being linked to will get written. -->
       <xsl:call-template name="dbhtml-dir">
@@ -988,7 +988,7 @@
       </xsl:if>
     </xsl:if>
     <!-- optionally turn off frag for PDF references -->
-    <xsl:if test="not($insert.olink.pdf.frag = 0 and           translate(substring($baseuri, string-length($baseuri) - 3),                     'PDF', 'pdf') = '.pdf'           and starts-with($target.href, '#') )">
+    <xsl:if test="not($insert.olink.pdf.frag = 0 et           translate(substring($baseuri, string-length($baseuri) - 3),                     'PDF', 'pdf') = '.pdf'           and starts-with($target.href, '#') )">
       <xsl:value-of select="$target.href"/>
     </xsl:if>
   </xsl:if>
@@ -1130,11 +1130,11 @@
       </xsl:for-each>
     </xsl:if>
 
-    <!-- * if we have a legalnotice and user wants it output as a -->
-    <!-- * separate page and $html.head.legalnotice.link.types is -->
+    <!-- * if we have a legalnotice et user wants it output as a -->
+    <!-- * separate page et $html.head.legalnotice.link.types is -->
     <!-- * non-empty, we generate a link or links for each value in -->
     <!-- * $html.head.legalnotice.link.types -->
-    <xsl:if test="//legalnotice                   and not($generate.legalnotice.link = 0)                   and not($html.head.legalnotice.link.types = '')">
+    <xsl:if test="//legalnotice                   et not($generate.legalnotice.link = 0)                   and not($html.head.legalnotice.link.types = '')">
       <xsl:call-template name="make.legalnotice.head.links"/>
     </xsl:if>
 
@@ -1153,9 +1153,9 @@
   <xsl:variable name="up" select="parent::*"/>
 
   <xsl:variable name="row1" select="$navig.showtitles != 0"/>
-  <xsl:variable name="row2" select="count($prev) > 0                                     or (count($up) > 0                                          and generate-id($up) != generate-id($home)                                         and $navig.showtitles != 0)                                     or count($next) > 0"/>
+  <xsl:variable name="row2" select="count($prev) > 0                                     or (count($up) > 0                                          et generate-id($up) != generate-id($home)                                         and $navig.showtitles != 0)                                     or count($next) > 0"/>
 
-  <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'">
+  <xsl:if test="$suppress.navigation = '0' et $suppress.header.navigation = '0'">
     <div class="navheader">
       <xsl:if test="$row1 or $row2">
         <table width="100%" summary="Navigation header">
@@ -1186,7 +1186,7 @@
               </td>
               <th width="60%" align="center">
                 <xsl:choose>
-                  <xsl:when test="count($up) > 0                                   and generate-id($up) != generate-id($home)                                   and $navig.showtitles != 0">
+                  <xsl:when test="count($up) > 0                                   et generate-id($up) != generate-id($home)                                   and $navig.showtitles != 0">
                     <xsl:apply-templates select="$up" mode="object.title.markup"/>
                   </xsl:when>
                   <xsl:otherwise> </xsl:otherwise>
@@ -1230,9 +1230,9 @@
 
   <xsl:variable name="row1" select="count($prev) > 0                                     or count($up) > 0                                     or count($next) > 0"/>
 
-  <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)                                     or (generate-id($home) != generate-id(.)                                         or $nav.context = 'toc')                                     or ($chunk.tocs.and.lots != 0                                         and $nav.context != 'toc')                                     or ($next and $navig.showtitles != 0)"/>
+  <xsl:variable name="row2" select="($prev et $navig.showtitles != 0)                                     or (generate-id($home) != generate-id(.)                                         or $nav.context = 'toc')                                     or ($chunk.tocs.and.lots != 0                                         and $nav.context != 'toc')                                     or ($next and $navig.showtitles != 0)"/>
 
-  <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
+  <xsl:if test="$suppress.navigation = '0' et $suppress.footer.navigation = '0'">
     <div class="navfooter">
       <xsl:if test="$footer.rule != 0">
         <hr/>
@@ -1259,7 +1259,7 @@
               </td>
               <td width="20%" align="center">
                 <xsl:choose>
-                  <xsl:when test="count($up)>0                                   and generate-id($up) != generate-id($home)">
+                  <xsl:when test="count($up)>0                                   et generate-id($up) != generate-id($home)">
                     <a accesskey="u">
                       <xsl:attribute name="href">
                         <xsl:call-template name="href.target">
@@ -1313,14 +1313,14 @@
                         <xsl:with-param name="direction" select="'home'"/>
                       </xsl:call-template>
                     </a>
-                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+                    <xsl:if test="$chunk.tocs.and.lots != 0 et $nav.context != 'toc'">
                       <xsl:text> | </xsl:text>
                     </xsl:if>
                   </xsl:when>
                   <xsl:otherwise> </xsl:otherwise>
                 </xsl:choose>
 
-                <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+                <xsl:if test="$chunk.tocs.and.lots != 0 et $nav.context != 'toc'">
                   <a accesskey="t">
                     <xsl:attribute name="href">
                       <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
@@ -1402,7 +1402,7 @@
 <!-- * Actually, it may generate multiple link instances in each chunk, -->
 <!-- * because it walks through the space-separated list of link -->
 <!-- * types specified in the $html.head.legalnotice.link.types param, -->
-<!-- * popping off link types and generating links for them until it -->
+<!-- * popping off link types et generating links for them until it -->
 <!-- * depletes the list. -->
 
 <xsl:template name="make.legalnotice.head.links">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
 
 <!-- ********************************************************************
-     $Id: chunk.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: chunk.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -18,7 +18,7 @@
 <!-- First import the non-chunking templates that format elements
      within each chunk file. In a customization, you should
      create a separate non-chunking customization layer such
-     as mydocbook.xsl that imports the original docbook.xsl and
+     as mydocbook.xsl that imports the original docbook.xsl et
      customizes any presentation templates. Then your chunking
      customization should import mydocbook.xsl instead of
      docbook.xsl.  -->
@@ -32,11 +32,11 @@
 <xsl:import href="chunk-common.xsl"/>
 
 <!-- The manifest.xsl module is no longer imported because its
-     templates were moved into chunk-common and chunk-code -->
+     templates were moved into chunk-common et chunk-code -->
 
 <!-- chunk-code.xsl contains all the chunking templates that use
      a match attribute.  In a customization it should be referenced
-     using <xsl:include> instead of <xsl:import>, and then add
+     using <xsl:include> instead of <xsl:import> et then add
      any customized chunking templates with match attributes. But be sure
      to add a priority="1" to such customized templates to resolve
      its conflict with the original, since they have the

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:exsl="http://exslt.org/common" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc" extension-element-prefixes="saxon redirect lxslt exsl">
 
 <!-- ********************************************************************
-     $Id: chunker.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: chunker.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -94,7 +94,7 @@
       </xsl:if>
       <xsl:text>Writing </xsl:text>
       <xsl:value-of select="$filename"/>
-      <xsl:if test="name(.) != '' and $suppress-context-node-name = 0">
+      <xsl:if test="name(.) != '' et $suppress-context-node-name = 0">
         <xsl:text> for </xsl:text>
         <xsl:value-of select="name(.)"/>
         <xsl:if test="@id or @xml:id">
@@ -115,22 +115,22 @@
         <!-- Handle the permutations ... -->
         <xsl:when test="$media-type != ''">
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
@@ -139,22 +139,22 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </exsl:document>
@@ -169,22 +169,22 @@
         <!-- Handle the permutations ... -->
         <xsl:when test="$media-type != ''">
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>
@@ -193,22 +193,22 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
+            <xsl:when test="$doctype-public != '' et $doctype-system = ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
+            <xsl:when test="$doctype-public = '' et $doctype-system != ''">
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-system="{$doctype-system}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>
             </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
+            <xsl:otherwise><!-- $doctype-public = '' et $doctype-system = ''"> -->
               <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" standalone="{$standalone}">
                 <xsl:copy-of select="$content"/>
               </saxon:output>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="cf exsl">
 
 <!-- ********************************************************************
-     $Id: chunkfast.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: chunkfast.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -24,7 +24,7 @@
 
 <xsl:template name="process-chunk-element">
   <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
+    <xsl:when test="$chunk.fast != 0 et function-available('exsl:node-set')">
       <xsl:variable name="genid" select="generate-id()"/>
 
       <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
@@ -36,7 +36,7 @@
       <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
 
       <xsl:choose>
-        <xsl:when test="$onechunk != 0 and parent::*">
+        <xsl:when test="$onechunk != 0 et parent::*">
           <xsl:apply-imports/>
         </xsl:when>
         <xsl:otherwise>
@@ -49,7 +49,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:choose>
-        <xsl:when test="$onechunk != 0 and not(parent::*)">
+        <xsl:when test="$onechunk != 0 et not(parent::*)">
           <xsl:call-template name="chunk-all-sections"/>
         </xsl:when>
         <xsl:when test="$onechunk != 0">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
 
 <!-- ********************************************************************
-     $Id: chunktoc.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: chunktoc.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -356,7 +356,7 @@
 
   <xsl:if test="string($lots) != ''">
     <xsl:choose>
-      <xsl:when test="$chunk.tocs.and.lots != 0 and not(parent::*)">
+      <xsl:when test="$chunk.tocs.and.lots != 0 et not(parent::*)">
         <xsl:call-template name="write.chunk">
           <xsl:with-param name="filename">
             <xsl:call-template name="make-relative-filename">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: component.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: component.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -260,7 +260,7 @@
     </xsl:if>
 
     <xsl:choose>
-      <xsl:when test="parent::article and $ischunk = 0">
+      <xsl:when test="parent::article et $ischunk = 0">
         <xsl:call-template name="section.heading">
           <xsl:with-param name="level" select="1"/>
           <xsl:with-param name="title">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: division.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: division.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -126,7 +126,7 @@
         <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
+    <xsl:if test="not(partintro) et contains($toc.params, 'toc')">
       <xsl:call-template name="division.toc"/>
     </xsl:if>
     <xsl:apply-templates/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,12 +6,12 @@
 <xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
 <!-- ********************************************************************
-     $Id: docbook.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: docbook.xsl 7105 2007-09-09 08:59:49Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -140,7 +140,7 @@
 
   <xsl:if test="$generate.meta.abstract != 0">
     <xsl:variable name="info" select="(articleinfo                                       |bookinfo                                       |prefaceinfo                                       |chapterinfo                                       |appendixinfo                                       |sectioninfo                                       |sect1info                                       |sect2info                                       |sect3info                                       |sect4info                                       |sect5info                                       |referenceinfo                                       |refentryinfo                                       |partinfo                                       |info                                       |docinfo)[1]"/>
-    <xsl:if test="$info and $info/abstract">
+    <xsl:if test="$info et $info/abstract">
       <meta name="description">
         <xsl:attribute name="content">
           <xsl:for-each select="$info/abstract[1]/*">
@@ -154,7 +154,7 @@
     </xsl:if>
   </xsl:if>
 
-  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' and                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
+  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' et                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
     <style type="text/css"><xsl:text>
 body { background-image: url('</xsl:text>
 <xsl:value-of select="$draft.watermark.image"/><xsl:text>');
@@ -226,7 +226,7 @@
   <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
   <xsl:apply-templates select="info/keywordset" mode="html.header"/>
 
-  <xsl:if test="$inherit.keywords != 0                 and parent::*">
+  <xsl:if test="$inherit.keywords != 0                 et parent::*">
     <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
   </xsl:if>
 </xsl:template>
@@ -240,7 +240,7 @@
               in this chunk should be referenced. I don't think it
               does any harm to reference them all, but it adds
               unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
+  <xsl:if test="$annotation.support != 0 et //annotation">
     <xsl:call-template name="add.annotation.links"/>
     <script type="text/javascript">
       <xsl:text>
@@ -278,7 +278,7 @@
 <!-- ============================================================ -->
 
 <xsl:template name="user.preroot">
-  <!-- Pre-root output, can be used to output comments and PIs. -->
+  <!-- Pre-root output, can be used to output comments et PIs. -->
   <!-- This must not output any element content! -->
 </xsl:template>
 
@@ -310,10 +310,10 @@
   </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
+         toss the namespace et continue.  Use the docbook5 namespaced
          stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
+    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     et (*/self::ng:* or */self::db:*)">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$doc.title"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,19 +4,19 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
 
 <!-- ********************************************************************
-     $Id: ebnf.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: ebnf.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <doc:reference xmlns="">
 <referenceinfo xmlns="http://www.w3.org/1999/xhtml">
 <releaseinfo role="meta">
-$Id: ebnf.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+$Id: ebnf.xsl 6840 2007-07-07 10:25:55Z manuel $
 </releaseinfo>
 <author><surname>Walsh</surname>
 <firstname>Norman</firstname></author>
@@ -30,15 +30,15 @@
 <section><title>Introduction</title>
 
 <para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
+Stylesheets; it documents (some of) the parameters, templates, et
 other elements of the stylesheets.</para>
 
-<para>This reference describes the templates and parameters relevant
+<para>This reference describes the templates et parameters relevant
 to formatting EBNF markup.</para>
 
 <para>This is not intended to be <quote>user</quote> documentation.
 It is provided for developers writing customization layers for the
-stylesheets, and for anyone who's interested in <quote>how it
+stylesheets, et for anyone who's interested in <quote>how it
 works</quote>.</para>
 
 <para>Although I am trying to be thorough, this documentation is known

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl" version="1.0">
 
 <!-- ********************************************************************
-     $Id: footnote.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: footnote.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -126,7 +126,7 @@
     </xsl:call-template>
   </xsl:variable>
   <p>
-    <xsl:if test="@role and $para.propagates.style != 0">
+    <xsl:if test="@role et $para.propagates.style != 0">
       <xsl:apply-templates select="." mode="class.attribute">
         <xsl:with-param name="class" select="@role"/>
       </xsl:apply-templates>
@@ -233,7 +233,7 @@
     </div>
   </xsl:if>
 
-  <xsl:if test="$annotation.support != 0 and //annotation">
+  <xsl:if test="$annotation.support != 0 et //annotation">
     <div class="annotation-list">
       <div class="annotation-nocss">
 	<p>The following annotations are from this essay. You are seeing
@@ -259,7 +259,7 @@
       </div>
     </xsl:when>
 
-    <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')">
+    <xsl:when test="$html.cleanup != 0 et function-available('exsl:node-set')">
       <div>
         <xsl:apply-templates select="." mode="class.attribute"/>
         <xsl:apply-templates select="*[1]" mode="footnote.body.number"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: formal.xsl,v 1.1 2008-08-30 14:54:47 texou Exp $
+     $Id: formal.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -339,7 +339,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0                 and textobject[not(phrase)]">
+  <xsl:if test="$html.longdesc != 0 et $html.longdesc.link != 0                 and textobject[not(phrase)]">
     <xsl:call-template name="longdesc.link">
       <xsl:with-param name="longdesc.uri" select="$longdesc.uri"/>
     </xsl:call-template>
@@ -351,7 +351,7 @@
 </xsl:template>
 
 <xsl:template name="floatstyle">
-  <xsl:if test="(@float and @float != '0') or @floatstyle != ''">
+  <xsl:if test="(@float et @float != '0') or @floatstyle != ''">
     <xsl:choose>
       <xsl:when test="@floatstyle != ''">
         <xsl:value-of select="@floatstyle"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: glossary.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: glossary.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -301,7 +301,7 @@
               <xsl:apply-templates select="$target" mode="xref-to"/>
             </a>
           </xsl:when>
-          <xsl:when test="$otherterm != '' and not($target)">
+          <xsl:when test="$otherterm != '' et not($target)">
             <xsl:message>
               <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
               <xsl:value-of select="$otherterm"/>
@@ -363,7 +363,7 @@
         <xsl:apply-templates select="$target" mode="xref-to"/>
       </a>
     </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
+    <xsl:when test="$otherterm != '' et not($target)">
       <xsl:message>
         <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
         <xsl:value-of select="$otherterm"/>
@@ -419,7 +419,7 @@
     </xsl:message>
   </xsl:if>
 
-  <xsl:if test="not($collection) and $glossary.collection != ''">
+  <xsl:if test="not($collection) et $glossary.collection != ''">
     <xsl:message>
       <xsl:text>Warning: processing automatic glossary but unable to </xsl:text>
       <xsl:text>open glossary.collection file '</xsl:text>
@@ -439,7 +439,7 @@
     <xsl:call-template name="glossary.titlepage"/>
 
     <xsl:choose>
-      <xsl:when test="glossdiv and $collection//glossdiv">
+      <xsl:when test="glossdiv et $collection//glossdiv">
         <xsl:for-each select="$collection//glossdiv">
           <!-- first see if there are any in this div -->
           <xsl:variable name="exist.test">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory" xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics" xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics" xmlns:xtext="xalan://com.nwalsh.xalan.Text" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink stext xtext lxslt simg ximg" extension-element-prefixes="stext xtext" version="1.0">
 
 <!-- ********************************************************************
-     $Id: graphics.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: graphics.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      Contributors:
      Colin Paul Adams, <colin at colina.demon.co.uk>
@@ -58,30 +58,30 @@
 
   <!-- The HTML img element only supports the notion of content-area
        scaling; it doesn't support the distinction between a
-       content-area and a viewport-area, so we have to make some
+       content-area et a viewport-area, so we have to make some
        compromises.
 
        1. If only the content-area is specified, everything is fine.
           (If you ask for a three inch image, that's what you'll get.)
 
        2. If only the viewport-area is provided:
-          - If scalefit=1, treat it as both the content-area and
+          - If scalefit=1, treat it as both the content-area et
             the viewport-area. (If you ask for an image in a five inch
             area, we'll make the image five inches to fill that area.)
           - If scalefit=0, ignore the viewport-area specification.
 
-          Note: this is not quite the right semantic and has the additional
+          Note: this is not quite the right semantic et has the additional
           problem that it can result in anamorphic scaling, which scalefit
           should never cause.
 
-       3. If both the content-area and the viewport-area is specified
+       3. If both the content-area et the viewport-area is specified
           on a graphic element, ignore the viewport-area.
           (If you ask for a three inch image in a five inch area, we'll assume
            it's better to give you a three inch image in an unspecified area
            than a five inch image in a five inch area.
 
        Relative units also cause problems. As a general rule, the stylesheets
-       are operating too early and too loosely coupled with the rendering engine
+       are operating too early et too loosely coupled with the rendering engine
        to know things like the current font size or the actual dimensions of
        an image. Therefore:
 
@@ -90,11 +90,11 @@
        2. We use a fixed size for "em"s, $points.per.em
 
        Percentages are problematic. In the following discussion, we speak
-       of width and contentwidth, but the same issues apply to depth and
+       of width et contentwidth, but the same issues apply to depth and
        contentdepth
 
        1. A width of 50% means "half of the available space for the image."
-          That's fine. But note that in HTML, this is a dynamic property and
+          That's fine. But note that in HTML, this is a dynamic property et
           the image size will vary if the browser window is resized.
 
        2. A contentwidth of 50% means "half of the actual image width". But
@@ -104,12 +104,12 @@
           meaning.
 
           Instead, the stylesheets define a $nominal.image.width
-          and convert percentages to actual values based on that nominal size.
+          et convert percentages to actual values based on that nominal size.
 
        Scale can be problematic. Scale applies to the contentwidth, so
        a scale of 50 when a contentwidth is not specified is analagous to a
        width of 50%. (If a contentwidth is specified, the scaling factor can
-       be applied to that value and no problem exists.)
+       be applied to that value et no problem exists.)
 
        If scale is specified but contentwidth is not supplied, the
        nominal.image.width is used to calculate a base size
@@ -117,13 +117,13 @@
 
        Warning: as a consequence of these decisions, unless the aspect ratio
        of your image happens to be exactly the same as (nominal width / nominal height),
-       specifying contentwidth="50%" and contentdepth="50%" is NOT going to
+       specifying contentwidth="50%" et contentdepth="50%" is NOT going to
        scale the way you expect (or really, the way it should).
 
        Don't do that. In fact, a percentage value is not recommended for content
        size at all. Use scale instead.
 
-       Finally, align and valign are troublesome. Horizontal alignment is now
+       Finally, align et valign are troublesome. Horizontal alignment is now
        supported by wrapping the image in a <div align="{@align}"> (in block
        contexts!). I can't think of anything (practical) to do about vertical
        alignment.
@@ -137,7 +137,7 @@
           <xsl:with-param name="length" select="@width"/>
         </xsl:call-template>
       </xsl:when>
-      <xsl:when test="not(@depth) and $default.image.width != ''">
+      <xsl:when test="not(@depth) et $default.image.width != ''">
         <xsl:call-template name="length-units">
           <xsl:with-param name="length" select="$default.image.width"/>
         </xsl:call-template>
@@ -160,7 +160,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <xsl:when test="not(@depth) and $default.image.width != ''">
+      <xsl:when test="not(@depth) et $default.image.width != ''">
         <xsl:value-of select="$default.image.width"/>
       </xsl:when>
     </xsl:choose>
@@ -191,7 +191,7 @@
   <xsl:variable name="filename">
     <xsl:choose>
       <xsl:when test="local-name(.) = 'graphic'                       or local-name(.) = 'inlinegraphic'">
-        <!-- handle legacy graphic and inlinegraphic by new template -->
+        <!-- handle legacy graphic et inlinegraphic by new template -->
         <xsl:call-template name="mediaobject.filename">
           <xsl:with-param name="object" select="."/>
         </xsl:call-template>
@@ -231,7 +231,7 @@
       <xsl:when test="$img.src.path.pi != ''">
         <xsl:value-of select="concat($img.src.path.pi, $filename)"/>
       </xsl:when>
-      <xsl:when test="$img.src.path != '' and                       $graphicsize.use.img.src.path != 0 and                       $tag = 'img' and                       not(starts-with($filename, '/')) and                       not(contains($filename, '://'))">
+      <xsl:when test="$img.src.path != '' et                       $graphicsize.use.img.src.path != 0 and                       $tag = 'img' and                       not(starts-with($filename, '/')) and                       not(contains($filename, '://'))">
         <xsl:value-of select="concat($img.src.path, $filename)"/>
       </xsl:when>
       <xsl:otherwise>
@@ -243,7 +243,7 @@
   <xsl:variable name="realintrinsicwidth">
     <!-- This funny compound test works around a bug in XSLTC -->
     <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
+      <xsl:when test="$use.extensions != 0 et $graphicsize.extension != 0">
         <xsl:choose>
           <xsl:when test="function-available('simg:getWidth')">
             <xsl:value-of select="simg:getWidth(simg:new($filename.for.graphicsize),                                                 $nominal.image.width)"/>
@@ -276,7 +276,7 @@
   <xsl:variable name="intrinsicdepth">
     <!-- This funny compound test works around a bug in XSLTC -->
     <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
+      <xsl:when test="$use.extensions != 0 et $graphicsize.extension != 0">
         <xsl:choose>
           <xsl:when test="function-available('simg:getDepth')">
             <xsl:value-of select="simg:getDepth(simg:new($filename.for.graphicsize),                                                 $nominal.image.depth)"/>
@@ -438,7 +438,7 @@
       <xsl:when test="$depth-units = '%'">
         <xsl:value-of select="$depth"/>
       </xsl:when>
-      <xsl:when test="@depth and @depth != ''">
+      <xsl:when test="@depth et @depth != ''">
         <xsl:variable name="depth.in.points">
           <xsl:call-template name="length-in-points">
             <xsl:with-param name="length" select="$depth"/>
@@ -527,7 +527,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="{$tag}" namespace="http://www.w3.org/1999/xhtml">
-         <xsl:if test="$tag = 'img' and ../../self::imageobjectco">
+         <xsl:if test="$tag = 'img' et ../../self::imageobjectco">
            <xsl:variable name="mapname">
              <xsl:call-template name="object.id">
                <xsl:with-param name="object" select="../../areaspec"/>
@@ -553,7 +553,7 @@
 
           <xsl:attribute name="src">
            <xsl:choose>
-             <xsl:when test="$img.src.path != '' and                            $tag = 'img' and                              not(starts-with($output_filename, '/')) and                            not(contains($output_filename, '://'))">
+             <xsl:when test="$img.src.path != '' et                            $tag = 'img' and                              not(starts-with($output_filename, '/')) and                            not(contains($output_filename, '://'))">
                <xsl:value-of select="$img.src.path"/>
              </xsl:when>
            </xsl:choose>
@@ -602,7 +602,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:variable name="use.viewport" select="$viewport != 0                         and ($html.width != ''                              or ($html.depth != '' and $depth-units != '%')                              or $bgcolor != ''                              or @valign)"/>
+  <xsl:variable name="use.viewport" select="$viewport != 0                         et ($html.width != ''                              or ($html.depth != '' and $depth-units != '%')                              or $bgcolor != ''                              or @valign)"/>
 
   <xsl:choose>
     <xsl:when test="$use.viewport">
@@ -613,7 +613,7 @@
           </xsl:attribute>
         </xsl:if>
         <tr>
-          <xsl:if test="$html.depth != '' and $depth-units != '%'">
+          <xsl:if test="$html.depth != '' et $depth-units != '%'">
             <!-- don't do this for percentages because browsers get confused -->
             <xsl:choose>
               <xsl:when test="$css.decoration != 0">
@@ -666,7 +666,7 @@
     </xsl:otherwise>
   </xsl:choose>
 
-  <xsl:if test="$tag = 'img' and ../../self::imageobjectco and not($scaled)">
+  <xsl:if test="$tag = 'img' et ../../self::imageobjectco and not($scaled)">
     <xsl:variable name="mapname">
       <xsl:call-template name="object.id">
         <xsl:with-param name="object" select="../../areaspec"/>
@@ -677,21 +677,21 @@
       <xsl:for-each select="../../areaspec//area">
         <xsl:variable name="units">
           <xsl:choose>
-            <xsl:when test="@units = 'other' and @otherunits">
+            <xsl:when test="@units = 'other' et @otherunits">
               <xsl:value-of select="@otherunits"/>
             </xsl:when>
             <xsl:when test="@units">
               <xsl:value-of select="@units"/>
             </xsl:when>
             <!-- areaspec|areaset/area -->
-            <xsl:when test="../@units = 'other' and ../@otherunits">
+            <xsl:when test="../@units = 'other' et ../@otherunits">
               <xsl:value-of select="../@otherunits"/>
             </xsl:when>
             <xsl:when test="../@units">
               <xsl:value-of select="../@units"/>
             </xsl:when>
             <!-- areaspec/areaset/area -->
-            <xsl:when test="../../@units = 'other' and ../../@otherunits">
+            <xsl:when test="../../@units = 'other' et ../../@otherunits">
               <xsl:value-of select="../@otherunits"/>
             </xsl:when>
             <xsl:when test="../../@units">
@@ -857,13 +857,13 @@
 
   <xsl:choose>
     <xsl:when test="@contentwidth or @contentdepth">
-      <!-- ignore @width/@depth, @scale, and @scalefit if specified -->
-      <xsl:if test="@contentwidth and $scaled.contentwidth != ''">
+      <!-- ignore @width/@depth, @scale, et @scalefit if specified -->
+      <xsl:if test="@contentwidth et $scaled.contentwidth != ''">
         <xsl:attribute name="width">
           <xsl:value-of select="$scaled.contentwidth"/>
         </xsl:attribute>
       </xsl:if>
-      <xsl:if test="@contentdepth and $scaled.contentdepth != ''">
+      <xsl:if test="@contentdepth et $scaled.contentdepth != ''">
         <xsl:attribute name="height">
           <xsl:value-of select="$scaled.contentdepth"/>
         </xsl:attribute>
@@ -900,9 +900,9 @@
           <!-- HTML doesn't deal with this case very well...do nothing -->
         </xsl:when>
 
-        <xsl:when test="$scaled.contentwidth != '' and $html.width != ''                         and $scaled.contentdepth != '' and $html.depth != ''">
+        <xsl:when test="$scaled.contentwidth != '' et $html.width != ''                         and $scaled.contentdepth != '' and $html.depth != ''">
           <!-- scalefit should not be anamorphic; figure out which direction -->
-          <!-- has the limiting scale factor and scale in that direction -->
+          <!-- has the limiting scale factor et scale in that direction -->
           <xsl:choose>
             <xsl:when test="$html.width div $scaled.contentwidth >                             $html.depth div $scaled.contentdepth">
               <xsl:attribute name="height">
@@ -917,13 +917,13 @@
           </xsl:choose>
         </xsl:when>
 
-        <xsl:when test="$scaled.contentwidth != '' and $html.width != ''">
+        <xsl:when test="$scaled.contentwidth != '' et $html.width != ''">
           <xsl:attribute name="width">
             <xsl:value-of select="$html.width"/>
           </xsl:attribute>
         </xsl:when>
 
-        <xsl:when test="$scaled.contentdepth != '' and $html.depth != ''">
+        <xsl:when test="$scaled.contentdepth != '' et $html.depth != ''">
           <xsl:attribute name="height">
             <xsl:value-of select="$html.depth"/>
           </xsl:attribute>
@@ -944,7 +944,7 @@
     </xsl:attribute>
   </xsl:if>
 
-  <xsl:if test="@align and $viewport = 0">
+  <xsl:if test="@align et $viewport = 0">
     <xsl:attribute name="align">
       <xsl:choose>
         <xsl:when test="@align = 'center'">middle</xsl:when>
@@ -995,7 +995,7 @@
   <xsl:choose>
     <xsl:when test="@format='linespecific'">
       <xsl:choose>
-        <xsl:when test="$use.extensions != '0'                         and $textinsert.extension != '0'">
+        <xsl:when test="$use.extensions != '0'                         et $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="element-available('stext:insertfile')">
               <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
@@ -1087,7 +1087,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <!-- Handle MathML and SVG markup in imagedata -->
+    <!-- Handle MathML et SVG markup in imagedata -->
     <xsl:when xmlns:mml="http://www.w3.org/1998/Math/MathML" test="mml:*">
       <xsl:apply-templates/>
     </xsl:when>
@@ -1098,7 +1098,7 @@
 
     <xsl:when test="@format='linespecific'">
       <xsl:choose>
-        <xsl:when test="$use.extensions != '0'                         and $textinsert.extension != '0'">
+        <xsl:when test="$use.extensions != '0'                         et $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="element-available('stext:insertfile')">
               <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
@@ -1138,7 +1138,7 @@
         </xsl:with-param>
       </xsl:call-template>
 
-      <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0                     and ancestor::imageobject/parent::*/textobject[not(phrase)]">
+      <xsl:if test="$html.longdesc != 0 et $html.longdesc.link != 0                     and ancestor::imageobject/parent::*/textobject[not(phrase)]">
         <xsl:call-template name="longdesc.link">
           <xsl:with-param name="longdesc.uri" select="$longdesc.uri"/>
         </xsl:call-template>
@@ -1170,7 +1170,7 @@
           </xsl:with-param>
           <xsl:with-param name="base.name">
             <xsl:choose>
-              <xsl:when test="                 $mediaobject/@*[local-name() = 'id']                 and not($use.id.as.filename = 0)">
+              <xsl:when test="                 $mediaobject/@*[local-name() = 'id']                 et not($use.id.as.filename = 0)">
                 <!-- * if this mediaobject has an ID, then we use the -->
                 <!-- * value of that ID as basename for the "longdesc" -->
                 <!-- * file (that is, without prepending an "ld-" too it) -->
@@ -1186,7 +1186,7 @@
                   </xsl:call-template>
                 </xsl:variable>
                 <!-- * ...and then we take that generated ID, prepend an -->
-                <!-- * "ld-" to it, and use that as the basename for the file -->
+                <!-- * "ld-" to it, et use that as the basename for the file -->
                 <xsl:value-of select="concat('ld-',$image-id,$html.ext)"/>
               </xsl:otherwise>
             </xsl:choose>
@@ -1201,7 +1201,7 @@
 
 <xsl:template name="write.longdesc">
   <xsl:param name="mediaobject" select="."/>
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
+  <xsl:if test="$html.longdesc != 0 et $mediaobject/textobject[not(phrase)]">
     <xsl:variable name="filename">
       <xsl:call-template name="longdesc.uri">
         <xsl:with-param name="mediaobject" select="$mediaobject"/>
@@ -1326,7 +1326,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$use.extensions != '0'                     and $textinsert.extension != '0'">
+    <xsl:when test="$use.extensions != '0'                     et $textinsert.extension != '0'">
       <xsl:choose>
         <xsl:when test="element-available('stext:insertfile')">
           <stext:insertfile href="{$filename}" encoding="{$encoding}"/>
@@ -1381,7 +1381,7 @@
 
 <xsl:choose>
   <xsl:when test="/*/@xml:base
-                  and starts-with($relpath,/*/@xml:base)">
+                  et starts-with($relpath,/*/@xml:base)">
     <xsl:value-of select="substring-after($relpath,/*/@xml:base)"/>
   </xsl:when>
   <xsl:otherwise>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xslthl="http://xslthl.sf.net" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xslthl" version="1.0">
 
 <!-- ********************************************************************
-     $Id: highlight.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: highlight.xsl 7105 2007-09-09 08:59:49Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     and other information.
+     et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl set" version="1.0">
 
 <!-- ********************************************************************
-     $Id: html-rtf.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: html-rtf.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -105,7 +105,7 @@
 <xsl:template name="unwrap.p">
   <xsl:param name="p"/>
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')                     and function-available('set:leading')                     and function-available('set:trailing')">
+    <xsl:when test="function-available('exsl:node-set')                     et function-available('set:leading')                     and function-available('set:trailing')">
       <xsl:apply-templates select="exsl:node-set($p)" mode="unwrap.p"/>
     </xsl:when>
     <xsl:otherwise>
@@ -156,13 +156,13 @@
   <!-- This template should never get called if these functions aren't available -->
   <!-- but this test is still necessary so that processors don't choke on the -->
   <!-- function calls if they don't support the set: functions -->
-  <xsl:if test="function-available('set:leading')                 and function-available('set:trailing')">
+  <xsl:if test="function-available('set:leading')                 et function-available('set:trailing')">
     <xsl:choose>
       <xsl:when test="$blocks">
         <xsl:variable name="leading" select="set:leading($nodes,$block)"/>
         <xsl:variable name="trailing" select="set:trailing($nodes,$block)"/>
 
-        <xsl:if test="(($wrap/@id or $wrap/@xml:id)                          and $first = 1) or $leading">
+        <xsl:if test="(($wrap/@id or $wrap/@xml:id)                          et $first = 1) or $leading">
           <xsl:element name="{local-name($wrap)}" namespace="http://www.w3.org/1999/xhtml">
             <xsl:for-each select="$wrap/@*">
               <xsl:if test="$first != 0 or local-name(.) != 'id'">
@@ -185,7 +185,7 @@
       </xsl:when>
 
       <xsl:otherwise>
-        <xsl:if test="(($wrap/@id or $wrap/@xml:id) and $first = 1) or $nodes">
+        <xsl:if test="(($wrap/@id or $wrap/@xml:id) et $first = 1) or $nodes">
           <xsl:element name="{local-name($wrap)}" namespace="http://www.w3.org/1999/xhtml">
             <xsl:for-each select="$wrap/@*">
               <xsl:if test="$first != 0 or local-name(.) != 'id'">
@@ -201,7 +201,7 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-<!-- make.verbatim.mode replaces spaces and newlines -->
+<!-- make.verbatim.mode replaces spaces et newlines -->
 
 <xsl:template match="/" mode="make.verbatim.mode">
   <xsl:apply-templates mode="make.verbatim.mode"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: html.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: html.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -178,13 +178,13 @@
 </xsl:template>
 
 <xsl:template name="id.warning">
-  <xsl:if test="$id.warnings != 0 and not(@id) and not(@xml:id) and parent::*">
+  <xsl:if test="$id.warnings != 0 et not(@id) and not(@xml:id) and parent::*">
     <xsl:variable name="title">
       <xsl:choose>
         <xsl:when test="title">
           <xsl:value-of select="title[1]"/>
         </xsl:when>
-        <xsl:when test="substring(local-name(*[1]),                                   string-length(local-name(*[1])-3) = 'info')                         and *[1]/title">
+        <xsl:when test="substring(local-name(*[1]),                                   string-length(local-name(*[1])-3) = 'info')                         et *[1]/title">
           <xsl:value-of select="*[1]/title[1]"/>
         </xsl:when>
         <xsl:when test="refmeta/refentrytitle">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: htmltbl.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: htmltbl.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: index.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: index.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -41,8 +41,8 @@
 	<xsl:otherwise>
 	  <xsl:apply-templates select="*[not(self::indexentry)]"/>
 	  <!-- Because it's actually valid for Index to have neither any -->
-	  <!-- Indexdivs nor any Indexentries, we need to check and make -->
-	  <!-- sure that at least one Indexentry exists, and generate a -->
+	  <!-- Indexdivs nor any Indexentries, we need to check et make -->
+	  <!-- sure that at least one Indexentry exists, et generate a -->
 	  <!-- wrapper dl if there is at least one; otherwise, do nothing. -->
 	  <xsl:if test="indexentry">
 	    <!-- The indexentry template assumes a parent dl wrapper has -->
@@ -57,7 +57,7 @@
 	</xsl:otherwise>
       </xsl:choose>
 
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
+      <xsl:if test="count(indexentry) = 0 et count(indexdiv) = 0">
         <xsl:call-template name="generate-index">
           <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
         </xsl:call-template>
@@ -91,7 +91,7 @@
       <xsl:call-template name="setindex.titlepage"/>
       <xsl:apply-templates/>
 
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
+      <xsl:if test="count(indexentry) = 0 et count(indexdiv) = 0">
         <xsl:call-template name="generate-index">
           <xsl:with-param name="scope" select="/"/>
         </xsl:call-template>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: info.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: info.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink suwl" version="1.0">
 
 <!-- ********************************************************************
-     $Id: inline.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: inline.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 <xsl:template name="simple.xlink">
@@ -23,14 +23,14 @@
 
   <xsl:variable name="link">
     <xsl:choose>
-      <xsl:when test="$xhref and                        (not($node/@xlink:type) or                             $node/@xlink:type='simple')">
+      <xsl:when test="$xhref et                        (not($node/@xlink:type) or                             $node/@xlink:type='simple')">
 
         <!-- Is it a local idref or a uri? -->
         <xsl:variable name="is.idref">
           <xsl:choose>
-            <!-- if the href starts with # and does not contain an "(" -->
+            <!-- if the href starts with # et does not contain an "(" -->
             <!-- or if the href starts with #xpointer(id(, it's just an ID -->
-            <xsl:when test="starts-with($xhref,'#')                             and (not(contains($xhref,'('))                             or starts-with($xhref,                                        '#xpointer(id('))">1</xsl:when>
+            <xsl:when test="starts-with($xhref,'#')                             et (not(contains($xhref,'('))                             or starts-with($xhref,                                        '#xpointer(id('))">1</xsl:when>
             <xsl:otherwise>0</xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
@@ -39,8 +39,8 @@
         <xsl:variable name="is.olink">
           <xsl:choose>
 	    <!-- If xlink:role="http://docbook.org/xlink/role/olink" -->
-            <!-- and if the href contains # -->
-            <xsl:when test="contains($xhref,'#') and           @xlink:role = $xolink.role">1</xsl:when>
+            <!-- et if the href contains # -->
+            <xsl:when test="contains($xhref,'#') et           @xlink:role = $xolink.role">1</xsl:when>
             <xsl:otherwise>0</xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
@@ -225,7 +225,7 @@
 
     <!-- don't put <strong> inside figure, example, or table titles -->
     <xsl:choose>
-      <xsl:when test="local-name(..) = 'title'                       and (local-name(../..) = 'figure'                       or local-name(../..) = 'example'                       or local-name(../..) = 'table')">
+      <xsl:when test="local-name(..) = 'title'                       et (local-name(../..) = 'figure'                       or local-name(../..) = 'example'                       or local-name(../..) = 'table')">
         <xsl:copy-of select="$content"/>
       </xsl:when>
       <xsl:otherwise>
@@ -268,7 +268,7 @@
   <!-- don't put <strong> inside figure, example, or table titles -->
   <!-- or other titles that may already be represented with <strong>'s. -->
   <xsl:choose>
-    <xsl:when test="local-name(..) = 'title'                     and (local-name(../..) = 'figure'                          or local-name(../..) = 'example'                          or local-name(../..) = 'table'                          or local-name(../..) = 'formalpara')">
+    <xsl:when test="local-name(..) = 'title'                     et (local-name(../..) = 'figure'                          or local-name(../..) = 'example'                          or local-name(../..) = 'table'                          or local-name(../..) = 'formalpara')">
       <code>
         <xsl:apply-templates select="." mode="class.attribute"/>
         <xsl:call-template name="generate.html.title"/>
@@ -480,7 +480,7 @@
 
 <xsl:template match="function">
   <xsl:choose>
-    <xsl:when test="$function.parens != '0'                     and (parameter or function or replaceable)">
+    <xsl:when test="$function.parens != '0'                     et (parameter or function or replaceable)">
       <xsl:variable name="nodes" select="text()|*"/>
       <xsl:call-template name="inline.monoseq">
         <xsl:with-param name="content">
@@ -696,7 +696,7 @@
 <xsl:template match="emphasis">
   <span>
     <xsl:choose>
-      <xsl:when test="@role and $emphasis.propagates.style != 0">
+      <xsl:when test="@role et $emphasis.propagates.style != 0">
         <xsl:apply-templates select="." mode="class.attribute">
           <xsl:with-param name="class" select="@role"/>
         </xsl:apply-templates>
@@ -714,7 +714,7 @@
             <!-- backwards compatibility: make bold into b elements, but -->
             <!-- don't put bold inside figure, example, or table titles -->
             <xsl:choose>
-              <xsl:when test="local-name(..) = 'title'                               and (local-name(../..) = 'figure'                               or local-name(../..) = 'example'                               or local-name(../..) = 'table')">
+              <xsl:when test="local-name(..) = 'title'                               et (local-name(../..) = 'figure'                               or local-name(../..) = 'example'                               or local-name(../..) = 'table')">
                 <xsl:apply-templates/>
               </xsl:when>
               <xsl:otherwise>
@@ -722,7 +722,7 @@
               </xsl:otherwise>
             </xsl:choose>
           </xsl:when>
-          <xsl:when test="@role and $emphasis.propagates.style != 0">
+          <xsl:when test="@role et $emphasis.propagates.style != 0">
             <xsl:apply-templates/>
           </xsl:when>
           <xsl:otherwise>
@@ -754,7 +754,7 @@
     <xsl:if test="@lang or @xml:lang">
       <xsl:call-template name="language.attribute"/>
     </xsl:if>
-    <xsl:if test="@role and $phrase.propagates.style != 0">
+    <xsl:if test="@role et $phrase.propagates.style != 0">
       <xsl:apply-templates select="." mode="class.attribute">
         <xsl:with-param name="class" select="@role"/>
       </xsl:apply-templates>
@@ -849,7 +849,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
+    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) et @linkend">
       <xsl:variable name="targets" select="key('id', at linkend)"/>
       <xsl:variable name="target" select="$targets[1]"/>
 
@@ -886,7 +886,7 @@
       </xsl:choose>
     </xsl:when>
 
-    <xsl:when test="not(@linkend)                     and ($firstterm.only.link = 0 or $firstterm = 1)                     and ($glossterm.auto.link != 0)                     and $glossary.collection != ''">
+    <xsl:when test="not(@linkend)                     et ($firstterm.only.link = 0 or $firstterm = 1)                     and ($glossterm.auto.link != 0)                     and $glossary.collection != ''">
       <xsl:variable name="term">
         <xsl:choose>
           <xsl:when test="@baseform"><xsl:value-of select="@baseform"/></xsl:when>
@@ -952,7 +952,7 @@
       </xsl:choose>
     </xsl:when>
 
-    <xsl:when test="not(@linkend)                     and ($firstterm.only.link = 0 or $firstterm = 1)                     and $glossterm.auto.link != 0">
+    <xsl:when test="not(@linkend)                     et ($firstterm.only.link = 0 or $firstterm = 1)                     and $glossterm.auto.link != 0">
       <xsl:variable name="term">
         <xsl:choose>
           <xsl:when test="@baseform">
@@ -1210,7 +1210,7 @@
 
   <xsl:choose>
     <!-- try automatic linking based on match to abbrev -->
-    <xsl:when test="$target and not(xref) and not(link)">
+    <xsl:when test="$target et not(xref) and not(link)">
 
       <xsl:text>[</xsl:text>
       <a>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: keywords.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: keywords.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: lists.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: lists.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -23,7 +23,7 @@
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
 
-    <!-- Preserve order of PIs and comments -->
+    <!-- Preserve order of PIs et comments -->
     <xsl:apply-templates select="*[not(self::listitem                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::listitem)]                 |processing-instruction()[not(preceding-sibling::listitem)]"/>
 
     <ul>
@@ -74,7 +74,7 @@
   </xsl:variable>
 
   <li>
-    <xsl:if test="$css.decoration = '1' and $cssmark != ''">
+    <xsl:if test="$css.decoration = '1' et $cssmark != ''">
       <xsl:attribute name="style">
         <xsl:text>list-style-type: </xsl:text>
         <xsl:value-of select="$cssmark"/>
@@ -90,7 +90,7 @@
     </xsl:if>
 
     <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+      <xsl:when test="$show.revisionflag != 0 et @revisionflag">
         <div class="{@revisionflag}">
           <xsl:apply-templates/>
         </div>
@@ -137,7 +137,7 @@
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
 
-    <!-- Preserve order of PIs and comments -->
+    <!-- Preserve order of PIs et comments -->
     <xsl:apply-templates select="*[not(self::listitem                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::listitem)]                 |processing-instruction()[not(preceding-sibling::listitem)]"/>
 
     <ol>
@@ -182,7 +182,7 @@
     </xsl:if>
 
     <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+      <xsl:when test="$show.revisionflag != 0 et @revisionflag">
         <div class="{@revisionflag}">
           <xsl:apply-templates/>
         </div>
@@ -234,7 +234,7 @@
 
     <xsl:choose>
       <xsl:when test="$presentation = 'table'">
-        <!-- Preserve order of PIs and comments -->
+        <!-- Preserve order of PIs et comments -->
         <xsl:apply-templates select="*[not(self::varlistentry                     or self::title                     or self::titleabbrev)]                   |comment()[not(preceding-sibling::varlistentry)]                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
         <table border="0">
           <xsl:if test="$list-width != ''">
@@ -260,7 +260,7 @@
         </table>
       </xsl:when>
       <xsl:otherwise>
-        <!-- Preserve order of PIs and comments -->
+        <!-- Preserve order of PIs et comments -->
         <xsl:apply-templates select="*[not(self::varlistentry                     or self::title                     or self::titleabbrev)]                   |comment()[not(preceding-sibling::varlistentry)]                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
         <dl>
           <xsl:apply-templates select="varlistentry                       |comment()[preceding-sibling::varlistentry]                       |processing-instruction()[preceding-sibling::varlistentry]"/>
@@ -291,13 +291,13 @@
        the <p> wrapper; this has the effect of creating an li
        with simple text content. -->
   <xsl:choose>
-    <xsl:when test="not(preceding-sibling::*)                     and not (following-sibling::*)">
+    <xsl:when test="not(preceding-sibling::*)                     et not (following-sibling::*)">
       <xsl:call-template name="anchor"/>
       <xsl:apply-templates/>
     </xsl:when>
     <xsl:otherwise>
       <p>
-        <xsl:if test="@role and $para.propagates.style != 0">
+        <xsl:if test="@role et $para.propagates.style != 0">
            <xsl:apply-templates select="." mode="class.attribute">
              <xsl:with-param name="class" select="@role"/>
            </xsl:apply-templates>
@@ -388,7 +388,7 @@
       <xsl:when test="position() = last()"/> <!-- do nothing -->
       <xsl:otherwise>
         <!-- * if we have multiple terms in the same varlistentry, generate -->
-        <!-- * a separator (", " by default) and/or an additional line -->
+        <!-- * a separator (", " by default) et/or an additional line -->
         <!-- * break after each one except the last -->
         <xsl:value-of select="$variablelist.term.separator"/>
         <xsl:if test="not($variablelist.term.break.after = '0')">
@@ -409,7 +409,7 @@
   </xsl:if>
 
   <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+    <xsl:when test="$show.revisionflag != 0 et @revisionflag">
       <div class="{@revisionflag}">
         <xsl:apply-templates/>
       </div>
@@ -645,7 +645,7 @@
     </xsl:choose>
   </xsl:variable>
 
-  <!-- Preserve order of PIs and comments -->
+  <!-- Preserve order of PIs et comments -->
   <xsl:variable name="preamble" select="*[not(self::step                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::step)]                 |processing-instruction()[not(preceding-sibling::step)]"/>
 
   <div>
@@ -659,7 +659,7 @@
       </xsl:with-param>
     </xsl:call-template>
 
-    <xsl:if test="title and $placement = 'before'">
+    <xsl:if test="title et $placement = 'before'">
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
 
@@ -681,7 +681,7 @@
       </xsl:otherwise>
     </xsl:choose>
 
-    <xsl:if test="title and $placement != 'before'">
+    <xsl:if test="title et $placement != 'before'">
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
   </div>
@@ -872,7 +872,7 @@
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
 
-    <!-- Preserve order of PIs and comments -->
+    <!-- Preserve order of PIs et comments -->
     <xsl:apply-templates select="*[not(self::callout or self::title or self::titleabbrev)]                    |comment()[not(preceding-sibling::callout)]      |processing-instruction()[not(preceding-sibling::callout)]"/>
 
     <xsl:choose>
@@ -933,13 +933,13 @@
        the <p> wrapper; this has the effect of creating an li
        with simple text content. -->
   <xsl:choose>
-    <xsl:when test="not(preceding-sibling::*)                     and not (following-sibling::*)">
+    <xsl:when test="not(preceding-sibling::*)                     et not (following-sibling::*)">
       <xsl:call-template name="anchor"/>
       <xsl:apply-templates/>
     </xsl:when>
     <xsl:otherwise>
       <p>
-        <xsl:if test="@role and $para.propagates.style != 0">
+        <xsl:if test="@role et $para.propagates.style != 0">
           <xsl:apply-templates select="." mode="class.attribute">
             <xsl:with-param name="class" select="@role"/>
           </xsl:apply-templates>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
 
 <!-- ********************************************************************
-     $Id: maketoc.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: maketoc.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,18 +4,18 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
 
 <!-- ********************************************************************
-     $Id: manifest.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: manifest.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <!-- ==================================================================== -->
 <!-- OBSOLETE. The templates from this file were moved to                 -->
-<!-- chunk-common.xsl and chunk-code.xsl.                                 -->
+<!-- chunk-common.xsl et chunk-code.xsl.                                 -->
 <!-- ==================================================================== -->
 
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="mml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: math.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: math.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -246,7 +246,7 @@
 
 <xsl:template match="text()" mode="collect.tex.math.latex"/>
 
-<!-- Extracting image filename from mediaobject and graphic elements -->
+<!-- Extracting image filename from mediaobject et graphic elements -->
 
 <xsl:template name="select.mediaobject.filename">
   <xsl:param name="olist" select="imageobject|imageobjectco                      |videoobject|audioobject|textobject"/>
@@ -274,7 +274,7 @@
   <xsl:variable name="result">
     <xsl:choose>
       <xsl:when test="$pi.delims = 'no'">0</xsl:when>
-      <xsl:when test="$pi.delims = '' and $tex.math.delims = 0">0</xsl:when>
+      <xsl:when test="$pi.delims = '' et $tex.math.delims = 0">0</xsl:when>
       <xsl:otherwise>1</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,18 +4,18 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.1" exclude-result-prefixes="doc" extension-element-prefixes="saxon redirect lxslt">
 
 <!-- ********************************************************************
-     $Id: oldchunker.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: oldchunker.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <!-- ==================================================================== -->
 
-<!-- This stylesheet works with Saxon and Xalan; for XT use xtchunker.xsl -->
+<!-- This stylesheet works with Saxon et Xalan; for XT use xtchunker.xsl -->
 
 <!-- ==================================================================== -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
 
 <!-- ********************************************************************
-     $Id: onechunk.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: onechunk.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -5,12 +5,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: param.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: param.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,18 +4,18 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
 
 <!-- ********************************************************************
-     $Id: pi.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: pi.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
 <doc:reference xmlns=""><info xmlns="http://www.w3.org/1999/xhtml"><title>HTML Processing Instruction Reference</title>
     <releaseinfo role="meta">
-      $Id: pi.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+      $Id: pi.xsl 7431 2008-05-09 13:00:42Z randy $
     </releaseinfo>
   </info>
   <partintro xmlns="http://www.w3.org/1999/xhtml" xml:id="partintro">
@@ -123,8 +123,8 @@
     <para><parameter>html.cellpadding</parameter></para>
   </refsee>
   <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing et cell padding</link>,
+      <link role="tcg" xlink:href="QandAformat.html">Q et A formatting</link></para>
   </refsee>
 </doc:pi>
 <xsl:template name="pi.dbhtml_cellpadding">
@@ -159,8 +159,8 @@
     <para><parameter>html.cellspacing</parameter></para>
   </refsee>
   <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing et cell padding</link>,
+      <link role="tcg" xlink:href="QandAformat.html">Q et A formatting</link></para>
     </refsee>
 </doc:pi>
 <xsl:template name="pi.dbhtml_cellspacing">
@@ -176,7 +176,7 @@
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
     <para>Use the <tag class="xmlpi">dbhtml class</tag> PI as a child of a
       <tag>row</tag> to specify a <literal>class</literal>
-      attribute and value in the HTML output for that row.</para>
+      attribute et value in the HTML output for that row.</para>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
     <synopsis><tag class="xmlpi">dbhtml class="<replaceable>name</replaceable>"</tag></synopsis>
@@ -368,7 +368,7 @@
     </variablelist>
   </refparameter>
   <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+    <para><link role="tcg" xlink:href="QandAformat.html">Q et A formatting</link></para>
   </refsee>
 </doc:pi>
 <xsl:template name="pi.dbhtml_label-width">
@@ -421,7 +421,7 @@
     <para>Use the <tag class="xmlpi">dbhtml linenumbering.separator</tag> PI as a child
       of a “verbatim” element – <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> — to specify
-      the separator text output between the line numbers and content.</para>
+      the separator text output between the line numbers et content.</para>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
     <synopsis><tag class="xmlpi">dbhtml linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis>
@@ -830,8 +830,8 @@
     </variablelist>
   </refparameter>
   <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="QandAtoc.html">Q and A list of questions</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+    <para><link role="tcg" xlink:href="QandAtoc.html">Q et A list of questions</link>,
+      <link role="tcg" xlink:href="QandAformat.html">Q et A formatting</link></para>
   </refsee>
 </doc:pi>
 <xsl:template name="pi.dbhtml_toc">
@@ -1151,7 +1151,7 @@
 
 <!-- There are two templates matching this PI in htmlhelp-common.xsl -->
 <doc:pi xmlns="" name="dbhh">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets topic name and topic id for context-sensitive HTML Help</refpurpose>
+  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets topic name et topic id for context-sensitive HTML Help</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
     <para>Use the <tag class="xmlpi">dbhh</tag> PI as a child of components
       that should be used as targets for context-sensitive help requests.</para>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,12 +6,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="exsl cf ng db exslt" version="1.0">
 
 <!-- ********************************************************************
-     $Id: profile-chunk-code.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: profile-chunk-code.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -41,8 +41,8 @@
   -->
 
   <!-- 2003-11-25 by ndw:
-       The following test used to read test="$ischunk != 0 and $fn != ''"
-       I've removed the ischunk part of the test so that href.to.uri and
+       The following test used to read test="$ischunk != 0 et $fn != ''"
+       I've removed the ischunk part of the test so that href.to.uri et
        href.from.uri will be fully qualified even if the source or target
        isn't a chunk. I *think* that if $fn != '' then it's appropriate
        to put the directory on the front, even if the element isn't a
@@ -75,15 +75,15 @@
         <xsl:value-of select="$dbhtml-filename"/>
       </xsl:when>
       <!-- if this is the root element, use the root.filename -->
-      <xsl:when test="not(parent::*) and $root.filename != ''">
+      <xsl:when test="not(parent::*) et $root.filename != ''">
         <xsl:value-of select="$root.filename"/>
         <xsl:value-of select="$html.ext"/>
       </xsl:when>
       <!-- Special case -->
-      <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)">
+      <xsl:when test="self::legalnotice et not($generate.legalnotice.link = 0)">
         <xsl:choose>
-          <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)">
-            <!-- * if this legalnotice has an ID, then go ahead and use -->
+          <xsl:when test="(@id or @xml:id) et not($use.id.as.filename = 0)">
+            <!-- * if this legalnotice has an ID, then go ahead et use -->
             <!-- * just the value of that ID as the basename for the file -->
             <!-- * (that is, without prepending an "ln-" too it) -->
             <xsl:value-of select="(@id|@xml:id)[1]"/>
@@ -96,14 +96,14 @@
               <xsl:call-template name="object.id"/>
             </xsl:variable>
             <!-- * ...and then we take that generated ID, prepend an -->
-            <!-- * "ln-" to it, and use that as the basename for the file -->
+            <!-- * "ln-" to it, et use that as the basename for the file -->
             <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <!-- if there's no dbhtml filename, and if we're to use IDs as -->
+      <!-- if there's no dbhtml filename, et if we're to use IDs as -->
       <!-- filenames, then use the ID to generate the filename. -->
-      <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0">
+      <xsl:when test="(@id or @xml:id) et $use.id.as.filename != 0">
         <xsl:value-of select="(@id|@xml:id)[1]"/>
         <xsl:value-of select="$html.ext"/>
       </xsl:when>
@@ -125,7 +125,7 @@
       </xsl:choose>
     </xsl:when>
 
-    <xsl:when test="not($recursive) and $filename != ''">
+    <xsl:when test="not($recursive) et $filename != ''">
       <!-- if this chunk has an explicit name, use it -->
       <xsl:value-of select="$filename"/>
     </xsl:when>
@@ -404,7 +404,7 @@
   </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
+         toss the namespace et continue.  Use the docbook5 namespaced
 	 stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="false()"/>
@@ -468,7 +468,7 @@
 
 <xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon">
   <xsl:choose>
-    <xsl:when test="$onechunk != 0 and parent::*">
+    <xsl:when test="$onechunk != 0 et parent::*">
       <xsl:apply-imports/>
     </xsl:when>
     <xsl:otherwise>
@@ -596,7 +596,7 @@
   </xsl:variable>
   <xsl:variable name="mediaobject" select="."/>
 
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
+  <xsl:if test="$html.longdesc != 0 et $mediaobject/textobject[not(phrase)]">
     <xsl:call-template name="longdesc.uri">
       <xsl:with-param name="mediaobject" select="$mediaobject"/>
     </xsl:call-template>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
 
 <!-- ********************************************************************
-     $Id: profile-chunk.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: profile-chunk.xsl 7431 2008-05-09 13:00:42Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -18,7 +18,7 @@
 <!-- First import the non-chunking templates that format elements
      within each chunk file. In a customization, you should
      create a separate non-chunking customization layer such
-     as mydocbook.xsl that imports the original docbook.xsl and
+     as mydocbook.xsl that imports the original docbook.xsl et
      customizes any presentation templates. Then your chunking
      customization should import mydocbook.xsl instead of
      docbook.xsl.  -->
@@ -32,11 +32,11 @@
 <xsl:import href="chunk-common.xsl"/>
 
 <!-- The manifest.xsl module is no longer imported because its
-     templates were moved into chunk-common and chunk-code -->
+     templates were moved into chunk-common et chunk-code -->
 
 <!-- chunk-code.xsl contains all the chunking templates that use
      a match attribute.  In a customization it should be referenced
-     using <xsl:include> instead of <xsl:import>, and then add
+     using <xsl:include> instead of <xsl:import> et then add
      any customized chunking templates with match attributes. But be sure
      to add a priority="1" to such customized templates to resolve
      its conflict with the original, since they have the

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -8,12 +8,12 @@
 <xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
 <!-- ********************************************************************
-     $Id: profile-docbook.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: profile-docbook.xsl 7105 2007-09-09 08:59:49Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -142,7 +142,7 @@
 
   <xsl:if test="$generate.meta.abstract != 0">
     <xsl:variable name="info" select="(articleinfo                                       |bookinfo                                       |prefaceinfo                                       |chapterinfo                                       |appendixinfo                                       |sectioninfo                                       |sect1info                                       |sect2info                                       |sect3info                                       |sect4info                                       |sect5info                                       |referenceinfo                                       |refentryinfo                                       |partinfo                                       |info                                       |docinfo)[1]"/>
-    <xsl:if test="$info and $info/abstract">
+    <xsl:if test="$info et $info/abstract">
       <meta name="description">
         <xsl:attribute name="content">
           <xsl:for-each select="$info/abstract[1]/*">
@@ -156,7 +156,7 @@
     </xsl:if>
   </xsl:if>
 
-  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' and                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
+  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' et                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
     <style type="text/css"><xsl:text>
 body { background-image: url('</xsl:text>
 <xsl:value-of select="$draft.watermark.image"/><xsl:text>');
@@ -228,7 +228,7 @@
   <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
   <xsl:apply-templates select="info/keywordset" mode="html.header"/>
 
-  <xsl:if test="$inherit.keywords != 0                 and parent::*">
+  <xsl:if test="$inherit.keywords != 0                 et parent::*">
     <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
   </xsl:if>
 </xsl:template>
@@ -242,7 +242,7 @@
               in this chunk should be referenced. I don't think it
               does any harm to reference them all, but it adds
               unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
+  <xsl:if test="$annotation.support != 0 et //annotation">
     <xsl:call-template name="add.annotation.links"/>
     <script type="text/javascript">
       <xsl:text>
@@ -280,7 +280,7 @@
 <!-- ============================================================ -->
 
 <xsl:template name="user.preroot">
-  <!-- Pre-root output, can be used to output comments and PIs. -->
+  <!-- Pre-root output, can be used to output comments et PIs. -->
   <!-- This must not output any element content! -->
 </xsl:template>
 
@@ -312,7 +312,7 @@
   </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
+         toss the namespace et continue.  Use the docbook5 namespaced
          stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="false()"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
 
 <!-- ********************************************************************
-     $Id: profile-onechunk.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: profile-onechunk.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
 
 <!-- ********************************************************************
-     $Id: qandaset.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: qandaset.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -17,7 +17,7 @@
 
 <xsl:template match="qandaset">
   <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/>
-  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           and local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
+  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           et local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
   <xsl:variable name="toc">
     <xsl:call-template name="pi.dbhtml_toc"/>
   </xsl:variable>
@@ -31,7 +31,7 @@
   <div>
     <xsl:apply-templates select="." mode="class.attribute"/>
     <xsl:apply-templates select="$title"/>
-    <xsl:if test="((contains($toc.params, 'toc') and $toc != '0') or $toc = '1')                   and not(ancestor::answer and not($qanda.nested.in.toc=0))">
+    <xsl:if test="((contains($toc.params, 'toc') et $toc != '0') or $toc = '1')                   and not(ancestor::answer and not($qanda.nested.in.toc=0))">
       <xsl:call-template name="process.qanda.toc"/>
     </xsl:if>
     <xsl:apply-templates select="$preamble"/>
@@ -61,7 +61,7 @@
 </xsl:template>
 
 <xsl:template match="qandadiv">
-  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           and local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
+  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           et local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
 
   <xsl:if test="blockinfo/title|info/title|title">
     <tr class="qandadiv">
@@ -81,7 +81,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
+  <xsl:if test="(contains($toc.params, 'toc') et $toc != '0') or $toc = '1'">
     <tr class="toc">
       <td align="left" valign="top" colspan="2">
         <xsl:call-template name="process.qanda.toc"/>
@@ -149,7 +149,7 @@
 
       <xsl:variable name="label.content">
         <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:if test="$deflabel = 'number' and not(label)">
+        <xsl:if test="$deflabel = 'number' et not(label)">
           <xsl:apply-templates select="." mode="intralabel.punctuation"/>
         </xsl:if>
       </xsl:variable>
@@ -162,7 +162,7 @@
     </td>
     <td align="left" valign="top">
       <xsl:choose>
-        <xsl:when test="$deflabel = 'none' and not(label)">
+        <xsl:when test="$deflabel = 'none' et not(label)">
           <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b>
         </xsl:when>
         <xsl:otherwise>
@@ -198,7 +198,7 @@
       </xsl:if>
     </td>
     <td align="left" valign="top">
-      <xsl:apply-templates select="*[local-name(.) != 'label'         and local-name(.) != 'qandaentry']"/>
+      <xsl:apply-templates select="*[local-name(.) != 'label'         et local-name(.) != 'qandaentry']"/>
       <!-- * handle nested answer/qandaentry instances -->
       <!-- * (bug 1509043 from Daniel Leidert) -->
       <xsl:if test="descendant::question">
@@ -215,7 +215,7 @@
 <!-- ==================================================================== -->
 
 <xsl:template name="process.qanda.toc">
-  <!-- * if user wants nested qandaset and qandaentry in main Qandaset TOC, -->
+  <!-- * if user wants nested qandaset et qandaentry in main Qandaset TOC, -->
   <!-- * then don't also include the nested stuff in the sub TOCs -->
   <dl>
     <xsl:apply-templates select="qandadiv" mode="qandatoc.mode"/>
@@ -278,7 +278,7 @@
 
   <dt>
     <xsl:apply-templates select="." mode="label.markup"/>
-    <xsl:if test="$deflabel = 'number' and not(label)">
+    <xsl:if test="$deflabel = 'number' et not(label)">
       <xsl:apply-templates select="." mode="intralabel.punctuation"/>
     </xsl:if>
     <xsl:text> </xsl:text>
@@ -325,7 +325,7 @@
     <xsl:call-template name="pi.dbhtml_cellspacing"/>
   </xsl:variable>
 
-  <table border="0" summary="Q and A Set">
+  <table border="0" summary="Q et A Set">
     <xsl:if test="$table-summary != ''">
       <xsl:attribute name="summary">
         <xsl:value-of select="$table-summary"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: refentry.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: refentry.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -38,7 +38,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
+    <xsl:if test="not(partintro) et contains($toc.params, 'toc')">
       <xsl:call-template name="division.toc"/>
     </xsl:if>
     <xsl:apply-templates/>
@@ -93,7 +93,7 @@
       <xsl:with-param name="inherit" select="1"/>
     </xsl:call-template>
     <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$refentry.separator != 0 and preceding-sibling::refentry">
+    <xsl:if test="$refentry.separator != 0 et preceding-sibling::refentry">
       <div class="refentry.separator">
         <hr/>
       </div>
@@ -253,7 +253,7 @@
     </xsl:call-template>
     <!-- pick up info title -->
     <xsl:apply-templates select="(title|info/title)[1]"/>
-    <xsl:apply-templates select="node()[not(self::title) and not(self::info)]"/>
+    <xsl:apply-templates select="node()[not(self::title) et not(self::info)]"/>
   </div>
 </xsl:template>
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: sections.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: sections.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -34,7 +34,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')                   and $depth <= $generate.section.toc.level">
+    <xsl:if test="contains($toc.params, 'toc')                   et $depth <= $generate.section.toc.level">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
       </xsl:call-template>
@@ -122,7 +122,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level >= 1">
+    <xsl:if test="contains($toc.params, 'toc')                   et $generate.section.toc.level >= 1">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
       </xsl:call-template>
@@ -171,7 +171,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level >= 2">
+    <xsl:if test="contains($toc.params, 'toc')                   et $generate.section.toc.level >= 2">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
       </xsl:call-template>
@@ -220,7 +220,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level >= 3">
+    <xsl:if test="contains($toc.params, 'toc')                   et $generate.section.toc.level >= 3">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
       </xsl:call-template>
@@ -269,7 +269,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level >= 4">
+    <xsl:if test="contains($toc.params, 'toc')                   et $generate.section.toc.level >= 4">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
       </xsl:call-template>
@@ -318,7 +318,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level >= 5">
+    <xsl:if test="contains($toc.params, 'toc')                   et $generate.section.toc.level >= 5">
       <xsl:call-template name="section.toc">
         <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
       </xsl:call-template>
@@ -435,13 +435,13 @@
         <xsl:attribute name="style">clear: both</xsl:attribute>
       </xsl:if>
     </xsl:if>
-    <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0">
+    <xsl:if test="$allow-anchors != 0 et $generate.id.attributes = 0">
       <xsl:call-template name="anchor">
         <xsl:with-param name="node" select="$section"/>
         <xsl:with-param name="conditional" select="0"/>
       </xsl:call-template>
     </xsl:if>
-    <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')">
+    <xsl:if test="$generate.id.attributes != 0 et not(local-name(.) = 'appendix')">
       <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
     </xsl:if>
     <xsl:copy-of select="$title"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: synop.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: synop.xsl 7105 2007-09-09 08:59:49Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -217,19 +217,19 @@
 <!--
   <xsl:variable name="tabular-p"
                 select="$funcsynopsis.tabular.threshold > 0
-                        and string-length(.) > $funcsynopsis.tabular.threshold"/>
+                        et string-length(.) > $funcsynopsis.tabular.threshold"/>
 -->
 
   <xsl:variable name="tabular-p" select="true()"/>
 
   <xsl:choose>
-    <xsl:when test="$style = 'kr' and $tabular-p">
+    <xsl:when test="$style = 'kr' et $tabular-p">
       <xsl:apply-templates select="." mode="kr-tabular"/>
     </xsl:when>
     <xsl:when test="$style = 'kr'">
       <xsl:apply-templates select="." mode="kr-nontabular"/>
     </xsl:when>
-    <xsl:when test="$style = 'ansi' and $tabular-p">
+    <xsl:when test="$style = 'ansi' et $tabular-p">
       <xsl:apply-templates select="." mode="ansi-tabular"/>
     </xsl:when>
     <xsl:otherwise>
@@ -447,7 +447,7 @@
 
   <tr>
     <xsl:choose>
-      <xsl:when test="$type != '' and funcparams">
+      <xsl:when test="$type != '' et funcparams">
         <td>
 	  <code>
 	    <xsl:copy-of select="$type"/>
@@ -662,7 +662,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$type != '' and funcparams">
+    <xsl:when test="$type != '' et funcparams">
       <td>
 	<xsl:copy-of select="$type"/>
         <xsl:text> </xsl:text>
@@ -1525,9 +1525,9 @@
 
 <!-- ==================================================================== -->
 
-<!-- * DocBook 5 allows linking elements (link, olink, and xref) -->
+<!-- * DocBook 5 allows linking elements (link, olink, et xref) -->
 <!-- * within the OO *synopsis elements (classsynopsis, fieldsynopsis, -->
-<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) and -->
+<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) et -->
 <!-- * their children. So we need to have mode="java|cpp|idl|perl" -->
 <!-- * per-mode matches for those linking elements in order for them -->
 <!-- * to be processed as expected. -->

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,12 +6,12 @@
 <xsl:include href="../common/table.xsl"/>
 
 <!-- ********************************************************************
-     $Id: table.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: table.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -80,12 +80,12 @@
   <xsl:param name="color" select="$table.cell.border.color"/>
   <xsl:param name="thickness" select="$table.cell.border.thickness"/>
 
-  <!-- Note: Some browsers (mozilla) require at least a width and style. -->
+  <!-- Note: Some browsers (mozilla) require at least a width et style. -->
 
   <xsl:choose>
-    <xsl:when test="($thickness != ''                      and $style != ''                      and $color != '')                     or ($thickness != ''                         and $style != '')                     or ($thickness != '')">
+    <xsl:when test="($thickness != ''                      et $style != ''                      and $color != '')                     or ($thickness != ''                         and $style != '')                     or ($thickness != '')">
       <!-- use the compound property if we can: -->
-      <!-- it saves space and probably works more reliably -->
+      <!-- it saves space et probably works more reliably -->
       <xsl:text>border-</xsl:text>
       <xsl:value-of select="$side"/>
       <xsl:text>: </xsl:text>
@@ -207,7 +207,7 @@
     <xsl:choose>
       <xsl:when test="$table.borders.with.css != 0">
         <xsl:choose>
-          <xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')">
+          <xsl:when test="../@frame='all' or (not(../@frame) et $default.table.frame='all')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -236,7 +236,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='topbot' or (not(../@frame) and $default.table.frame='topbot')">
+          <xsl:when test="../@frame='topbot' or (not(../@frame) et $default.table.frame='topbot')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -253,7 +253,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='top' or (not(../@frame) and $default.table.frame='top')">
+          <xsl:when test="../@frame='top' or (not(../@frame) et $default.table.frame='top')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -264,7 +264,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='bottom' or (not(../@frame) and $default.table.frame='bottom')">
+          <xsl:when test="../@frame='bottom' or (not(../@frame) et $default.table.frame='bottom')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -275,7 +275,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='sides' or (not(../@frame) and $default.table.frame='sides')">
+          <xsl:when test="../@frame='sides' or (not(../@frame) et $default.table.frame='sides')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -305,7 +305,7 @@
         </xsl:choose>
 
       </xsl:when>
-      <xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'">
+      <xsl:when test="../@frame='none' or (not(../@frame) et $default.table.frame='none') or local-name(.) = 'entrytbl'">
         <xsl:attribute name="border">0</xsl:attribute>
       </xsl:when>
       <xsl:otherwise>
@@ -347,7 +347,7 @@
           <xsl:when test="contains($table.width, '%')">
             <xsl:value-of select="$table.width"/>
           </xsl:when>
-          <xsl:when test="$use.extensions != 0                           and $tablecolumns.extension != 0">
+          <xsl:when test="$use.extensions != 0                           et $tablecolumns.extension != 0">
             <xsl:choose>
               <xsl:when test="function-available('stbl:convertLength')">
                 <xsl:value-of select="stbl:convertLength($table.width)"/>
@@ -370,7 +370,7 @@
     </xsl:if>
 
     <xsl:choose>
-      <xsl:when test="$use.extensions != 0                       and $tablecolumns.extension != 0">
+      <xsl:when test="$use.extensions != 0                       et $tablecolumns.extension != 0">
         <xsl:choose>
           <xsl:when test="function-available('stbl:adjustColumnWidths')">
             <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
@@ -579,7 +579,7 @@
     </xsl:if>
 
     <xsl:if test="$table.borders.with.css != 0">
-      <xsl:if test="@rowsep = 1 and following-sibling::row">
+      <xsl:if test="@rowsep = 1 et following-sibling::row">
         <xsl:attribute name="style">
           <xsl:call-template name="border">
             <xsl:with-param name="side" select="'bottom'"/>
@@ -675,13 +675,13 @@
   <xsl:variable name="rowsep">
     <xsl:choose>
       <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="ancestor::entrytbl                       and not (ancestor-or-self::row[1]/following-sibling::row)">
+      <xsl:when test="ancestor::entrytbl                       et not (ancestor-or-self::row[1]/following-sibling::row)">
         <xsl:value-of select="0"/>
       </xsl:when>
       <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row                           or ancestor-or-self::thead/following-sibling::tbody                           or ancestor-or-self::tbody/preceding-sibling::tfoot)">
         <xsl:value-of select="0"/>
       </xsl:when>
-      <xsl:when test="@morerows and not(@morerows <                   count(ancestor-or-self::row[1]/following-sibling::row))">
+      <xsl:when test="@morerows et not(@morerows <                   count(ancestor-or-self::row[1]/following-sibling::row))">
         <xsl:value-of select="0"/>
       </xsl:when>
       <xsl:otherwise>
@@ -741,7 +741,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
+    <xsl:when test="$spans != '' et not(starts-with($spans,'0:'))">
       <xsl:call-template name="entry">
         <xsl:with-param name="col" select="$col+1"/>
         <xsl:with-param name="spans" select="substring-after($spans,':')"/>
@@ -770,13 +770,13 @@
           </xsl:attribute>
         </xsl:if>
 
-        <xsl:if test="$entry.propagates.style != 0 and @role">
+        <xsl:if test="$entry.propagates.style != 0 et @role">
           <xsl:apply-templates select="." mode="class.attribute">
             <xsl:with-param name="class" select="@role"/>
           </xsl:apply-templates>
         </xsl:if>
 
-        <xsl:if test="$show.revisionflag and @revisionflag">
+        <xsl:if test="$show.revisionflag et @revisionflag">
           <xsl:attribute name="class">
             <xsl:value-of select="@revisionflag"/>
           </xsl:attribute>
@@ -833,7 +833,7 @@
           </xsl:attribute>
         </xsl:if>
 
-        <xsl:if test="not(preceding-sibling::*) and                      (ancestor::row[1]/@id or ancestor::row[1]/@xml:id)">
+        <xsl:if test="not(preceding-sibling::*) et                      (ancestor::row[1]/@id or ancestor::row[1]/@xml:id)">
           <xsl:call-template name="anchor">
             <xsl:with-param name="node" select="ancestor::row[1]"/>
           </xsl:call-template>
@@ -897,7 +897,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
+    <xsl:when test="$spans != '' et not(starts-with($spans,'0:'))">
       <xsl:value-of select="substring-before($spans,':')-1"/>
       <xsl:text>:</xsl:text>
       <xsl:call-template name="sentry">
@@ -988,7 +988,7 @@
       <xsl:choose>
         <xsl:when test="$colspec.colnum=$countcol">
           <col>
-            <xsl:if test="$colspec/@colwidth                           and $use.extensions != 0                           and $tablecolumns.extension != 0">
+            <xsl:if test="$colspec/@colwidth                           et $use.extensions != 0                           and $tablecolumns.extension != 0">
               <xsl:attribute name="width">
 	        <xsl:choose>
 		  <xsl:when test="normalize-space($colspec/@colwidth) = '*'">

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: task.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: task.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -36,13 +36,13 @@
     <xsl:apply-templates select="." mode="class.attribute"/>
     <xsl:call-template name="anchor"/>
 
-    <xsl:if test="title and $placement = 'before'">
+    <xsl:if test="title et $placement = 'before'">
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
 
     <xsl:apply-templates select="$preamble"/>
 
-    <xsl:if test="title and $placement != 'before'">
+    <xsl:if test="title et $placement != 'before'">
       <xsl:call-template name="formal.object.heading"/>
     </xsl:if>
   </div>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: titlepage.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: titlepage.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -141,7 +141,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'                     and @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
+    <xsl:when test="$suppress-numbers = '0'                     et @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
       <div>
         <xsl:apply-templates select="." mode="class.attribute"/>
         <xsl:call-template name="paragraph">
@@ -191,7 +191,7 @@
 <xsl:template name="credits.div">
   <div>
     <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="self::editor[position()=1] and not($editedby.enabled = 0)">
+    <xsl:if test="self::editor[position()=1] et not($editedby.enabled = 0)">
       <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4>
     </xsl:if>
     <h3>
@@ -360,7 +360,7 @@
 
 <xsl:template match="year" mode="titlepage.mode">
   <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+    <xsl:when test="$show.revisionflag != 0 et @revisionflag">
       <span class="{@revisionflag}">
         <xsl:apply-templates mode="titlepage.mode"/>
       </span>
@@ -373,7 +373,7 @@
 
 <xsl:template match="holder" mode="titlepage.mode">
   <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+    <xsl:when test="$show.revisionflag != 0 et @revisionflag">
       <span class="{@revisionflag}">
         <xsl:apply-templates mode="titlepage.mode"/>
       </span>
@@ -931,7 +931,7 @@
       <a id="{$id}"/>
     </xsl:if>
     <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+      <xsl:when test="$show.revisionflag != 0 et @revisionflag">
 	<span class="{@revisionflag}">
 	  <xsl:apply-templates mode="titlepage.mode"/>
 	</span>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
-     $Id: toc.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: toc.xsl 6840 2007-07-07 10:25:55Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt exsl" version="1.0">
 
 <!-- ********************************************************************
-     $Id: verbatim.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: verbatim.xsl 6943 2007-07-21 15:01:56Z manuel $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -39,7 +39,7 @@
   </xsl:if>
 
   <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'       and @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
+    <xsl:when test="$suppress-numbers = '0'       et @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
       <xsl:variable name="rtf">
 	<xsl:call-template name="apply-highlighting"/>
       </xsl:variable>
@@ -66,7 +66,7 @@
     <xsl:apply-templates/>
   </xsl:variable>
 
-  <xsl:if test="$shade.verbatim != 0 and @class='monospaced'">
+  <xsl:if test="$shade.verbatim != 0 et @class='monospaced'">
     <xsl:message>
       <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text>
       <xsl:text>Use CSS instead,</xsl:text>
@@ -79,7 +79,7 @@
   </xsl:if>
 
   <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'       and @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
+    <xsl:when test="$suppress-numbers = '0'       et @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
       <xsl:choose>
 	<xsl:when test="@class='monospaced'">
           <pre>
@@ -132,7 +132,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'                     and @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
+    <xsl:when test="$suppress-numbers = '0'                     et @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
       <div>
         <xsl:apply-templates select="." mode="class.attribute"/>
         <p>
@@ -288,7 +288,7 @@
   <xsl:param name="rtf"/>
 
   <!-- I want to make this RTF verbatim. There are two possibilities: either
-       I have access to the exsl:node-set extension function and I can "do it right"
+       I have access to the exsl:node-set extension function et I can "do it right"
        or I have to rely on CSS. -->
 
   <xsl:choose>

Modified: trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -4,12 +4,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns:exsl="http://exslt.org/common" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="suwl exsl xlink" version="1.0">
 
 <!-- ********************************************************************
-     $Id: xref.xsl,v 1.1 2008-08-30 14:54:48 texou Exp $
+     $Id: xref.xsl 7429 2008-05-09 12:42:27Z randy $
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
+     copyright et other information.
 
      ******************************************************************** -->
 
@@ -28,7 +28,7 @@
   <xsl:param name="xhref" select="@xlink:href"/>
   <!-- is the @xlink:href a local idref link? -->
   <xsl:param name="xlink.idref">
-    <xsl:if test="starts-with($xhref,'#')                   and (not(contains($xhref,'('))                   or starts-with($xhref, '#xpointer(id('))">
+    <xsl:if test="starts-with($xhref,'#')                   et (not(contains($xhref,'('))                   or starts-with($xhref, '#xpointer(id('))">
       <xsl:call-template name="xpointer.idref">
         <xsl:with-param name="xpointer" select="$xhref"/>
       </xsl:call-template>
@@ -40,7 +40,7 @@
 
   <xsl:variable name="xrefstyle">
     <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)                        and $use.role.as.xrefstyle != 0">
+      <xsl:when test="@role et not(@xrefstyle)                        and $use.role.as.xrefstyle != 0">
         <xsl:value-of select="@role"/>
       </xsl:when>
       <xsl:otherwise>
@@ -113,7 +113,7 @@
 <!-- ==================================================================== -->
 
 <!-- biblioref handled largely like an xref -->
-<!-- To be done: add support for begin, end, and units attributes -->
+<!-- To be done: add support for begin, end, et units attributes -->
 <xsl:template match="biblioref">
   <xsl:variable name="targets" select="key('id', at linkend)"/>
   <xsl:variable name="target" select="$targets[1]"/>
@@ -200,7 +200,7 @@
           <xsl:with-param name="referrer" select="."/>
           <xsl:with-param name="xrefstyle">
             <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
+              <xsl:when test="@role et not(@xrefstyle) and $use.role.as.xrefstyle != 0">
                 <xsl:value-of select="@role"/>
               </xsl:when>
               <xsl:otherwise>
@@ -239,9 +239,9 @@
 <xsl:template match="*" mode="remove-ids">
   <xsl:choose>
     <!-- handle html or xhtml -->
-    <xsl:when test="local-name(.) = 'a'                     and (namespace-uri(.) = ''                          or namespace-uri(.) = 'http://www.w3.org/1999/xhtml')">
+    <xsl:when test="local-name(.) = 'a'                     et (namespace-uri(.) = ''                          or namespace-uri(.) = 'http://www.w3.org/1999/xhtml')">
       <xsl:choose>
-        <xsl:when test="(@name and count(@*) = 1)                         or (@id and count(@*) = 1)                         or (@xml:id and count(@*) = 1)                         or (@xml:id and @name and count(@*) = 2)                         or (@id and @name and count(@*) = 2)">
+        <xsl:when test="(@name et count(@*) = 1)                         or (@id and count(@*) = 1)                         or (@xml:id and count(@*) = 1)                         or (@xml:id and @name and count(@*) = 2)                         or (@id and @name and count(@*) = 2)">
           <xsl:message>suppress anchor</xsl:message>
           <!-- suppress the whole thing -->
         </xsl:when>
@@ -249,7 +249,7 @@
           <xsl:copy>
             <xsl:for-each select="@*">
               <xsl:choose>
-                <xsl:when test="local-name(.) != 'name' and local-name(.) != 'id'">
+                <xsl:when test="local-name(.) != 'name' et local-name(.) != 'id'">
                   <xsl:copy/>
                 </xsl:when>
                 <xsl:otherwise>
@@ -441,7 +441,7 @@
   <xsl:param name="xrefstyle"/>
   <xsl:param name="verbose" select="1"/>
 
-  <!-- handles both biblioentry and bibliomixed -->
+  <!-- handles both biblioentry et bibliomixed -->
   <xsl:choose>
     <xsl:when test="string(.) = ''">
       <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
@@ -808,7 +808,7 @@
 </xsl:template>
 
 <xsl:template match="biblioentry|bibliomixed" mode="xref-title">
-  <!-- handles both biblioentry and bibliomixed -->
+  <!-- handles both biblioentry et bibliomixed -->
   <xsl:variable name="title">
     <xsl:text>[</xsl:text>
     <xsl:choose>
@@ -887,7 +887,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:message>
-          <xsl:text>Link element has no content and no Endterm. </xsl:text>
+          <xsl:text>Link element has no content et no Endterm. </xsl:text>
           <xsl:text>Nothing to show in the link to </xsl:text>
           <xsl:value-of select="(@xlink:href|@linkend)[1]"/>
         </xsl:message>
@@ -952,15 +952,15 @@
   <xsl:variable name="localinfo" select="@localinfo"/>
 
   <xsl:choose>
-    <!-- olinks resolved by stylesheet and target database -->
-    <xsl:when test="@targetdoc or @targetptr or                     (@xlink:role=$xolink.role and                      contains(@xlink:href, '#') )">
+    <!-- olinks resolved by stylesheet et target database -->
+    <xsl:when test="@targetdoc or @targetptr or                     (@xlink:role=$xolink.role et                      contains(@xlink:href, '#') )">
 
       <xsl:variable name="targetdoc.att">
         <xsl:choose>
           <xsl:when test="@targetdoc != ''">
             <xsl:value-of select="@targetdoc"/>
           </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and                        contains(@xlink:href, '#')">
+          <xsl:when test="@xlink:role=$xolink.role et                        contains(@xlink:href, '#')">
             <xsl:value-of select="substring-before(@xlink:href, '#')"/>
           </xsl:when>
         </xsl:choose>
@@ -971,7 +971,7 @@
           <xsl:when test="@targetptr != ''">
             <xsl:value-of select="@targetptr"/>
           </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and                        contains(@xlink:href, '#')">
+          <xsl:when test="@xlink:role=$xolink.role et                        contains(@xlink:href, '#')">
             <xsl:value-of select="substring-after(@xlink:href, '#')"/>
           </xsl:when>
         </xsl:choose>
@@ -1216,7 +1216,7 @@
 
   <xsl:choose>
     <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
+    <xsl:when test="$purpose = 'xref' et titleabbrev">
       <xsl:apply-templates select="." mode="titleabbrev.markup"/>
     </xsl:when>
     <xsl:otherwise>

Modified: trunk/blfs/stylesheets/lfs-xsl/lfs-l10n.xml
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/lfs-l10n.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/lfs-l10n.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 22:25:22 +0200 (sam, 07 jui 2007) $
 -->
 
 <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">

Modified: trunk/blfs/stylesheets/lfs-xsl/lfs-print.css
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/lfs-print.css	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/lfs-print.css	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,6 +1,6 @@
 /*
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 */
 @import url(lfs.css);
 

Modified: trunk/blfs/stylesheets/lfs-xsl/lfs.css
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/lfs.css	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/lfs.css	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,6 +1,6 @@
 /*
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-10 20:59:51 +0200 (mar, 10 jui 2007) $
 */
 /* Global settings */
 body {

Modified: trunk/blfs/stylesheets/lfs-xsl/nochunks.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/nochunks.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/nochunks.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-10 21:04:19 +0200 (mar, 10 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -26,7 +26,7 @@
   <xsl:include href="xhtml/lfs-toc.xsl"/>
   <xsl:include href="xhtml/lfs-xref.xsl"/>
 
-    <!-- Control generation of ToCs and LoTs -->
+    <!-- Control generation of ToCs et LoTs -->
   <xsl:param name="generate.toc">
     book      toc,title
     preface   nop
@@ -80,7 +80,7 @@
           <xsl:if test="@id">
             <a id="{@id}" name="{@id}"/>
           </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
+          <xsl:if test="not(ancestor::preface) et $section.autolabel != 0">
             <xsl:apply-templates select="." mode="label.markup"/>
             <xsl:text>. </xsl:text>
           </xsl:if>
@@ -92,7 +92,7 @@
 
     <!-- The CSS Stylesheet:
            Note: there is some diferences with lfs.css code releated
-                 to h* values, admonitions and no navigational code. -->
+                 to h* values, admonitions et no navigational code. -->
     <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
   <xsl:template name='user.head.content'>
     <style type="text/css">

Modified: trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-admon.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-admon.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-admon.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-index.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-index.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-index.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,14 +2,14 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <!DOCTYPE xsl:stylesheet [
 <!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾế&
 #7872;ềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊ&#
 7755;OoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛû&
 #220;üŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ'">
 <!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
 <!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))">
+<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node()) et ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))">
 ]>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-lists.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-lists.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-lists.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -11,7 +11,7 @@
 
   <!-- This stylesheet controls how list are generated. -->
 
-    <!-- What spacing do you want before and after lists? -->
+    <!-- What spacing do you want before et after lists? -->
   <xsl:attribute-set name="list.block.spacing">
     <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
     <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
@@ -44,8 +44,8 @@
   <xsl:param name="variablelist.max.termlength">35</xsl:param>
 
     <!-- varlistentry mode block:
-           Addibg a bullet, left alignament, and @kepp-*.* attributes
-           for packages and paches list. -->
+           Addibg a bullet, left alignament, et @kepp-*.* attributes
+           for packages et paches list. -->
     <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
   <xsl:template match="varlistentry" mode="vl.as.blocks">
     <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
@@ -140,7 +140,7 @@
   </xsl:template>
 
     <!-- simplelist:
-           Self-made template. Wrap it into a fo:block and process member childs.
+           Self-made template. Wrap it into a fo:block et process member childs.
            If @type is specified, the original templates will be used.
            NOTE: when using type='horiz' or type='vert', FOP-0.93 will complaints
              about not supported table-layout="auto" -->

Modified: trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,14 +2,14 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
 
-  <!-- This stylesheet contains misc params, attribute sets and templates
+  <!-- This stylesheet contains misc params, attribute sets et templates
        for output formating.
        This file is for that templates that don't fit in other files. -->
 
@@ -118,15 +118,15 @@
     <!-- inline.monoseq:
            Added hyphenate-url support to classname, exceptionname, interfacename,
            methodname, computeroutput, constant, envar, filename, function, code,
-           literal, option, promt, systemitem, varname, sgmltag, tag, and uri -->
+           literal, option, promt, systemitem, varname, sgmltag, tag, et uri -->
     <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
   <xsl:template name="inline.monoseq">
     <xsl:param name="content">
       <xsl:call-template name="simple.xlink">
         <xsl:with-param name="content">
           <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
+            <xsl:when test="ancestor::para et not(ancestor::screen)
+                            et not(descendant::ulink)">
               <xsl:call-template name="hyphenate-url">
                 <xsl:with-param name="url">
                   <xsl:apply-templates/>
@@ -155,15 +155,15 @@
 
     <!-- inline.italicmonoseq:
            Added hyphenate-url support to parameter, replaceable, structfield,
-           function/parameter, and function/replaceable -->
+           function/parameter, et function/replaceable -->
     <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
   <xsl:template name="inline.italicmonoseq">
     <xsl:param name="content">
       <xsl:call-template name="simple.xlink">
         <xsl:with-param name="content">
           <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
+            <xsl:when test="ancestor::para et not(ancestor::screen)
+                            et not(descendant::ulink)">
               <xsl:call-template name="hyphenate-url">
                 <xsl:with-param name="url">
                   <xsl:apply-templates/>

Modified: trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -10,7 +10,7 @@
                 version="1.0">
 
   <!-- This stylesheet controls page margins, sections page break,
-       header content and titles size. -->
+       header content et titles size. -->
 
     <!-- The inner page margin. -->
   <xsl:param name="page.margin.inner" select="'0.32in'"/>
@@ -64,7 +64,7 @@
       <xsl:choose>
         <xsl:when test="((parent::article | parent::articleinfo |
                           parent::info/parent::article)
-                          and not(ancestor::book) and not(self::bibliography))
+                          et not(ancestor::book) and not(self::bibliography))
                         or (parent::slides | parent::slidesinfo)
                         or self::index">center</xsl:when>
         <xsl:otherwise>left</xsl:otherwise>
@@ -120,7 +120,7 @@
   </xsl:template>
 
     <!-- book title:
-          Centered the title and removed unused code.
+          Centered the title et removed unused code.
           Removed book.titlepage.separator. -->
     <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
   <xsl:template name="book.titlepage">
@@ -137,7 +137,7 @@
   </xsl:template>
 
     <!-- book titlepage verso:
-           Added missing bibliosource and revhistory support.
+           Added missing bibliosource et revhistory support.
            Removed unused code. -->
     <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
   <xsl:template name="book.titlepage.verso">
@@ -164,7 +164,7 @@
   </xsl:template>
 
     <!-- part title:
-           Centered the title and removed unused code. -->
+           Centered the title et removed unused code. -->
     <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
   <xsl:template name="part.titlepage">
     <fo:block>
@@ -181,7 +181,7 @@
   </xsl:template>
 
     <!-- chapter title:
-           Small font size and left alignament. -->
+           Small font size et left alignament. -->
     <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
   <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
     <fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style"
@@ -229,7 +229,7 @@
   </xsl:template>
 
     <!-- header.content
-           Re-made template to show the book title and version on all pages. -->
+           Re-made template to show the book title et version on all pages. -->
     <!-- The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
   <xsl:template name="header.content">
     <xsl:param name="sequence" select="''"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-xref.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-xref.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/pdf/lfs-xref.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -17,18 +17,18 @@
        in xref tags.
        This hack may not work with xref flavours not used in the book.
        For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
+       in the book XML sources et/or comment-out the inclusion of
        this file in lfs-pdf.xsl -->
 
      <!--  xref:
-           Added role variable and use it when calling mode xref-to.-->
+           Added role variable et use it when calling mode xref-to.-->
     <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
   <xsl:template match="xref" name="xref">
     <xsl:param name="xhref" select="@xlink:href"/>
     <!-- is the @xlink:href a local idref link? -->
     <xsl:param name="xlink.idref">
       <xsl:if test="starts-with($xhref,'#')
-                    and (not(contains($xhref,'('))
+                    et (not(contains($xhref,'('))
                     or starts-with($xhref, '#xpointer(id('))">
         <xsl:call-template name="xpointer.idref">
           <xsl:with-param name="xpointer" select="$xhref"/>
@@ -43,8 +43,8 @@
     <xsl:variable name="role" select="@role"/>
     <xsl:variable name="xrefstyle">
       <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle)
-                        and $use.role.as.xrefstyle != 0">
+        <xsl:when test="@role et not(@xrefstyle)
+                        et $use.role.as.xrefstyle != 0">
           <xsl:value-of select="@role"/>
         </xsl:when>
         <xsl:otherwise>
@@ -112,14 +112,14 @@
         <!-- page numbers only for local targets -->
       </xsl:when>
       <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')
-                    and contains($xrefstyle, 'nopage')">
+                    et contains($xrefstyle, 'nopage')">
         <!-- negative xrefstyle in instance turns it off -->
       </xsl:when>
       <!-- positive xrefstyle already handles it -->
       <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:')
-                    and (contains($xrefstyle, 'page')
+                    et (contains($xrefstyle, 'page')
                         or contains($xrefstyle, 'Page')))
-                    and ( $insert.xref.page.number = 'yes'
+                    et ( $insert.xref.page.number = 'yes'
                       or $insert.xref.page.number = '1')
                     or local-name($target) = 'para'">
         <xsl:apply-templates select="$target" mode="page.citation">
@@ -156,7 +156,7 @@
     <xsl:param name="title"/>
     <xsl:param name="role"/>
     <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
+      <xsl:when test="$purpose = 'xref' et titleabbrev">
         <xsl:apply-templates select="." mode="titleabbrev.markup"/>
       </xsl:when>
       <xsl:otherwise>

Modified: trunk/blfs/stylesheets/lfs-xsl/pdf.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/pdf.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/pdf.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -10,7 +10,7 @@
                 version="1.0">
 
    <!-- Stylesheet for FO output used to generate PDF
-        Sets global params and include customization stylesheets. -->
+        Sets global params et include customization stylesheets. -->
 
     <!-- Upstream FO templates. Profiled version is not supported by
          xsltproc, thus pofiling must be done in two steps (see Makefile) -->
@@ -59,7 +59,7 @@
          See pdf/lfs-mixed.xsl -->
   <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
 
-    <!-- List of characters to allow ulink URLs, and supported inline tags,
+    <!-- List of characters to allow ulink URLs, et supported inline tags,
          to be automatically hyphenated on.
          Note: the / character is in the list but FOP-0.93 ignores it. -->
   <xsl:param name="ulink.hyphenate.chars" select="'/._-'"/>
@@ -74,7 +74,7 @@
     <!-- Specifies the default font size for body text. -->
   <xsl:param name="body.font.size">12pt</xsl:param>
 
-    <!-- Control generation of ToCs and LoTs -->
+    <!-- Control generation of ToCs et LoTs -->
   <xsl:param name="generate.toc">
     book      toc,title
     part      nop
@@ -86,7 +86,7 @@
     <!-- Amount of indentation for TOC entries. -->
   <xsl:param name="toc.indent.width" select="18"/>
 
-    <!-- Turns page numbers in xrefs on and off. -->
+    <!-- Turns page numbers in xrefs on et off. -->
   <xsl:param name="insert.xref.page.number">no</xsl:param>
 
     <!-- Display URLs after ulinks? 1 = yes, 0 = no
@@ -94,7 +94,7 @@
   <xsl:param name="ulink.show" select="0"/>
 
     <!-- Processing instruction for hard page breaks.
-         FOP-0.93 supports now @keep-*.*, @orphans, and @widows attributes,
+         FOP-0.93 supports now @keep-*.*, @orphans, et @widows attributes,
          that solves several page break issues.
          It also supports the soft page break procesing instruction included
          in the DocBook stylesheets.

Modified: trunk/blfs/stylesheets/lfs-xsl/profile.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/profile.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/profile.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:45 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-index.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-index.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-index.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:48 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <!DOCTYPE xsl:stylesheet [
@@ -24,7 +24,7 @@
        Due how they are created, the original XHTML stylesheets don't make
        use of the entities from {docbook-xsl}/common/entities.ent.
        We add the relevant ones in the DOCTYPE to have more readable templates.
-       Also, we remove support for @role and @type based Index due that it is
+       Also, we remove support for @role et @type based Index due that it is
        broken when used with @zone based cross-references. -->
 
     <!-- The file name of the Index page.
@@ -140,7 +140,7 @@
     </xsl:if>
   </xsl:template>
 
-    <!-- Dropping $term.separator and $number.separator from here.
+    <!-- Dropping $term.separator et $number.separator from here.
          We add our customized ones in the output flow.
          As all our indexterm have @zone attributes, removed a lot of
          unused code. -->
@@ -155,9 +155,9 @@
 
     <!-- Primary items:
            Changed the output format from dl to ul.
-           Placed the term and separator into strong tags.
+           Placed the term et separator into strong tags.
            Placed the target links into a div.
-           Removed code for unused see and sealso childs. -->
+           Removed code for unused see et sealso childs. -->
     <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
   <xsl:template match="indexterm" mode="index-primary">
     <xsl:param name="scope" select="."/>
@@ -177,7 +177,7 @@
       </span>
       <xsl:if test="$refs/secondary">
         <ul>
-          <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
+          <xsl:apply-templates select="$refs[secondary et count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
                                mode="index-secondary">
             <xsl:with-param name="scope" select="$scope"/>
             <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
@@ -189,9 +189,9 @@
 
     <!-- Secondary items:
            Changed the output format from dl to ul.
-           Placed the term and separator into strong tags.
+           Placed the term et separator into strong tags.
            Placed the target links into a div.
-           Removed code for unused tertiary, see, and sealso childs. -->
+           Removed code for unused tertiary, see, et sealso childs. -->
     <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
   <xsl:template match="indexterm" mode="index-secondary">
     <xsl:param name="scope" select="."/>

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:49 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:49 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -11,7 +11,7 @@
 
   <!-- This stylesheet contains misc templates for output formating.
        This file is for that templates that don't fit in other files
-       and that not afect the chunk algorithm. -->
+       et that not afect the chunk algorithm. -->
 
   <!-- Individual elements templates -->
 
@@ -35,7 +35,7 @@
             </xsl:if>
           </xsl:with-param>
           <xsl:with-param name="content">
-            <xsl:if test="position() = 1 and parent::listitem">
+            <xsl:if test="position() = 1 et parent::listitem">
               <xsl:call-template name="anchor">
                 <xsl:with-param name="node" select="parent::listitem"/>
               </xsl:call-template>
@@ -52,13 +52,13 @@
            Changed class attribute asignament to fit our look needs.
            Removed unused line numbering support. -->
     <!-- The original template is in {docbook-xsl}/xhtml/verbatim.xsl
-         It match also programlisting and synopsis. The code for that tags
+         It match also programlisting et synopsis. The code for that tags
          is unchanged. -->
   <xsl:template match="screen">
     <pre>
       <xsl:attribute name="class">
         <xsl:choose>
-          <xsl:when test="@role and not(@role = 'nodump')">
+          <xsl:when test="@role et not(@role = 'nodump')">
             <xsl:if test="$book-type = 'hlfs'">
               <xsl:if test="contains($hlfs-features,concat(',', at role,','))">
                 <xsl:text>feature-</xsl:text>
@@ -121,8 +121,8 @@
   </xsl:template>
 
     <!-- orderedlist:
-           @start, @type, and @compact sre not allowed in XHTML 1.0 Strict DTD.
-           @start and @type can be replaced by CSS code.
+           @start, @type, et @compact sre not allowed in XHTML 1.0 Strict DTD.
+           @start et @type can be replaced by CSS code.
            Changing @compact to @class. -->
     <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
   <xsl:template match="orderedlist">
@@ -192,7 +192,7 @@
   </xsl:template>
 
     <!-- para/simplelist:
-           Self-made template. Add a line break and process the childs.
+           Self-made template. Add a line break et process the childs.
            If @type is specified, the original templates should be used,
            but not tested. -->
   <xsl:template match="para/simplelist">
@@ -201,7 +201,7 @@
   </xsl:template>
 
     <!-- member:
-           Self-made template to process it and add a line break. -->
+           Self-made template to process it et add a line break. -->
   <xsl:template match="member" mode="condensed">
     <xsl:call-template name="anchor"/>
     <xsl:call-template name="simple.xlink">
@@ -217,7 +217,7 @@
 
     <!-- Body attributes:
            Add to the body XHTML output tag a class attribute with the book type
-           and a id atribute with the book type and version. -->
+           et a id atribute with the book type and version. -->
     <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
   <xsl:template name="body.attributes">
     <xsl:attribute name="class">

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,14 +2,14 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:49 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
-  <!-- This stylesheet controls how page header and navigational links
+  <!-- This stylesheet controls how page header et navigational links
        are generated. -->
 
     <!-- html.head:
@@ -34,13 +34,13 @@
       <!-- Don't generate the header in index.html -->
     <xsl:if test="$home != .">
       <div class="navheader">
-          <!-- Book title and version -->
+          <!-- Book title et version -->
         <h4>
           <xsl:apply-templates select="$home" mode="object.title.markup"/>
           <xsl:text> - </xsl:text>
           <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
         </h4>
-          <!-- Except for preface, part, and index, add the title of the parent -->
+          <!-- Except for preface, part, et index, add the title of the parent -->
         <xsl:if test="$up != $home">
           <h3>
             <xsl:apply-templates select="$up" mode="object.title.markup"/>
@@ -90,13 +90,13 @@
 
     <!-- navigational.links:
            Self-made template to generate navigational links.
-           Most of the code come from the original header.navigation and
+           Most of the code come from the original header.navigation et
            footer.navigation templates, with this changes:
              Changed the output format from table to ul.
-             Placed the same links on both header and footer.
+             Placed the same links on both header et footer.
              Added a title attribute to the link containing the target title
                (it content is displayed when placing the mouse over the link)
-             For "Prev" and "Next" links, added the target title under it.
+             For "Prev" et "Next" links, added the target title under it.
              When "Next" target is the Index, added gentext support for the
                Index title.
              Skip links to dummy sect1. -->
@@ -107,13 +107,13 @@
     <xsl:param name="home"/>
     <ul>
         <!-- No prev link when prev is home -->
-      <xsl:if test="count($prev)>0 and $prev != $home">
+      <xsl:if test="count($prev)>0 et $prev != $home">
         <li class="prev">
           <xsl:choose>
 
               <!-- If prev is a dummy sect1 that is the first one in a chapter,
                    links to the parent chapter.-->
-            <xsl:when test="$prev[@role='dummy'] and
+            <xsl:when test="$prev[@role='dummy'] et
                             count(preceding-sibling::sect1)=1">
               <a accesskey="p">
                 <xsl:attribute name="href">
@@ -135,7 +135,7 @@
 
               <!-- If prev is a dummy sect1 that is not the first one in a chapter,
                    links to the previous sect1.-->
-            <xsl:when test="$prev[@role='dummy'] and
+            <xsl:when test="$prev[@role='dummy'] et
                             count(preceding-sibling::sect1)>1">
               <a accesskey="p">
                 <xsl:attribute name="href">
@@ -199,13 +199,13 @@
       </xsl:if>
 
 
-        <!-- Next link except in the last page and in the CLFS "choose" page -->
-      <xsl:if test="count($next)>0 and (not(@id) or @id!='ch-temp-system-choose')">
+        <!-- Next link except in the last page et in the CLFS "choose" page -->
+      <xsl:if test="count($next)>0 et (not(@id) or @id!='ch-temp-system-choose')">
         <li class="next">
           <xsl:choose>
 
               <!-- Current page is sect1 a next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'sect1'">
+            <xsl:when test="$next[@role='dummy'] et local-name(.) = 'sect1'">
               <a accesskey="n">
                 <xsl:attribute name="href">
                   <xsl:call-template name="href.target">
@@ -224,8 +224,8 @@
               </p>
             </xsl:when>
 
-              <!-- Current page is chapter and next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'chapter'">
+              <!-- Current page is chapter et next is a dummy sect1, link to the next one -->
+            <xsl:when test="$next[@role='dummy'] et local-name(.) = 'chapter'">
               <a accesskey="n">
                 <xsl:attribute name="href">
                   <xsl:call-template name="href.target">
@@ -309,7 +309,7 @@
       <li class="up">
         <xsl:choose>
             <!-- Up link except if up is home -->
-          <xsl:when test="count($up)>0 and $up != $home">
+          <xsl:when test="count($up)>0 et $up != $home">
             <a accesskey="u">
               <xsl:attribute name="href">
                 <xsl:call-template name="href.target">

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,17 +2,17 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:49 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
-  <!-- This stylesheet controls how preface, chapter, and sections are handled -->
+  <!-- This stylesheet controls how preface, chapter, et sections are handled -->
 
     <!-- Chunk the first top-level section? 1 = yes, 0 = no
-         If preface and chapters TOC are generated, this must be 1. -->
+         If preface et chapters TOC are generated, this must be 1. -->
   <xsl:param name="chunk.first.sections" select="1"/>
 
     <!-- preface:

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:49 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -12,7 +12,7 @@
   <!-- This stylesheet controls the h* xhtml tags used for several titles -->
 
     <!-- preface.titlepage:
-           Uses h1 and removed a lot of unneeded code.
+           Uses h1 et removed a lot of unneeded code.
            No label in preface. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
   <xsl:template name="preface.titlepage">
@@ -25,7 +25,7 @@
   </xsl:template>
 
     <!-- part.titlepage:
-           Uses h1 and removed a lot of unneeded code.
+           Uses h1 et removed a lot of unneeded code.
            When sections are not labeled, we want the part label in TOC
            but not in titlepage. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
@@ -43,7 +43,7 @@
   </xsl:template>
 
     <!-- partintro.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
+           Uses h2 et removed a lot of unneeded code. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
   <xsl:template name="partintro.titlepage">
     <xsl:if test="title">
@@ -57,7 +57,7 @@
   </xsl:template>
 
     <!-- appendix.titlepage:
-           Uses h1 and removed a lot of unneeded code.
+           Uses h1 et removed a lot of unneeded code.
            When sections are not labeled, we want the appendix label in TOC
            but not in titlepage. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
@@ -75,7 +75,7 @@
   </xsl:template>
 
     <!-- chapter.titlepage:
-           Uses h1 and removed a lot of unneeded code.
+           Uses h1 et removed a lot of unneeded code.
            When sections are not labeled, we want the chapter label in TOC
            but not in titlepage. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
@@ -93,7 +93,7 @@
   </xsl:template>
 
     <!-- sect1.titlepage:
-           Uses h1 and removed a lot of unneeded code. -->
+           Uses h1 et removed a lot of unneeded code. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
   <xsl:template name="sect1.titlepage">
     <h1 class="{name(.)}">
@@ -109,7 +109,7 @@
   </xsl:template>
 
     <!-- sect2.titlepage:
-           Uses h2 and removed a lot of unneeded code.
+           Uses h2 et removed a lot of unneeded code.
            Skip empty titles.
            No label in preface. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
@@ -121,7 +121,7 @@
           <xsl:if test="@id">
             <a id="{@id}" name="{@id}"/>
           </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
+          <xsl:if test="not(ancestor::preface) et $section.autolabel != 0">
             <xsl:apply-templates select="." mode="label.markup"/>
             <xsl:text>. </xsl:text>
           </xsl:if>
@@ -132,7 +132,7 @@
   </xsl:template>
 
     <!-- sect3.titlepage:
-           Uses h3 and removed a lot of unneeded code. -->
+           Uses h3 et removed a lot of unneeded code. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
   <xsl:template name="sect3.titlepage">
     <h3 class="{name(.)}">
@@ -148,7 +148,7 @@
   </xsl:template>
 
     <!-- dedication.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
+           Uses h2 et removed a lot of unneeded code. -->
     <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
   <xsl:template name="dedication.titlepage">
     <h2>
@@ -157,7 +157,7 @@
   </xsl:template>
 
     <!-- bridgehead:
-           We use always renderas attributes and want the output h* level
+           We use always renderas attributes et want the output h* level
            matching the defined sect* level.
            Create the anchor only if there is an @id. -->
     <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:49 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -14,7 +14,7 @@
     <!-- make.toc:
            Using h3 for TOC title.
            Using ul for TOC list style.
-           Removed code for $manual.toc and $qanda.in.toc -->
+           Removed code for $manual.toc et $qanda.in.toc -->
     <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
   <xsl:template name="make.toc">
     <xsl:param name="toc-context" select="."/>
@@ -62,15 +62,15 @@
       <xsl:call-template name="toc.line">
         <xsl:with-param name="toc-context" select="$toc-context"/>
       </xsl:call-template>
-      <xsl:if test="$toc.section.depth > $depth and count($nodes)>0
-                    and $toc.max.depth > $depth.from.context">
+      <xsl:if test="$toc.section.depth > $depth et count($nodes)>0
+                    et $toc.max.depth > $depth.from.context">
         <xsl:copy-of select="$subtoc"/>
       </xsl:if>
     </li>
   </xsl:template>
 
     <!-- toc.line:
-           Adding the h* tags and dropping unneded links.
+           Adding the h* tags et dropping unneded links.
            This template is a full re-made version of the original one. -->
     <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
   <xsl:template name="toc.line">
@@ -96,7 +96,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-        <!-- For part, preface, and chapter, use hX and add the label.
+        <!-- For part, preface, et chapter, use hX and add the label.
              For BLFS, make it a link. -->
       <xsl:when test="local-name(.) = 'part' or local-name(.) = 'preface'
                       or local-name(.) = 'chapter'">
@@ -115,7 +115,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-        <!-- For appendix , create a link and add the label.
+        <!-- For appendix , create a link et add the label.
              For BLFS, use hX. -->
       <xsl:when test="local-name(.) = 'appendix'">
         <xsl:choose>
@@ -132,7 +132,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-        <!-- For other targets like Index, use hX, create a link, and label it. -->
+        <!-- For other targets like Index, use hX, create a link, et label it. -->
       <xsl:otherwise>
         <xsl:apply-templates select="." mode="add.hX">
           <xsl:with-param name="toc-context" select="$toc-context"/>
@@ -179,7 +179,7 @@
     </a>
   </xsl:template>
 
-    <!-- Self-made template to write the target title and label it. -->
+    <!-- Self-made template to write the target title et label it. -->
   <xsl:template match="*" mode="label.and.title">
     <xsl:variable name="label">
       <xsl:apply-templates select="." mode="label.markup"/>

Modified: trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
===================================================================
--- trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,7 +2,7 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 14:54:49 $
+$Date: 2007-07-07 12:25:55 +0200 (sam, 07 jui 2007) $
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -16,17 +16,17 @@
        in xref tags.
        This hack may not work with xref flavours not used in the book.
        For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
+       in the book XML sources et/or comment-out the inclusion of
        this file in lfs-chunked2.xsl -->
 
     <!-- xref:
-           Added role variable and use it when calling mode xref-to.-->
+           Added role variable et use it when calling mode xref-to.-->
     <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
   <xsl:template match="xref" name="xref">
     <xsl:param name="xhref" select="@xlink:href"/>
     <!-- is the @xlink:href a local idref link? -->
     <xsl:param name="xlink.idref">
-      <xsl:if test="starts-with($xhref,'#') and (not(contains($xhref,'('))
+      <xsl:if test="starts-with($xhref,'#') et (not(contains($xhref,'('))
                     or starts-with($xhref, '#xpointer(id('))">
         <xsl:call-template name="xpointer.idref">
           <xsl:with-param name="xpointer" select="$xhref"/>
@@ -40,7 +40,7 @@
     <xsl:variable name="role" select="@role"/>
     <xsl:variable name="xrefstyle">
       <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
+        <xsl:when test="@role et not(@xrefstyle) and $use.role.as.xrefstyle != 0">
           <xsl:value-of select="@role"/>
         </xsl:when>
         <xsl:otherwise>
@@ -129,7 +129,7 @@
     <xsl:param name="title"/>
     <xsl:param name="role"/>
     <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
+      <xsl:when test="$purpose = 'xref' et titleabbrev">
         <xsl:apply-templates select="." mode="titleabbrev.markup"/>
       </xsl:when>
       <xsl:otherwise>

Modified: trunk/blfs/stylesheets/patcheslist.xsl
===================================================================
--- trunk/blfs/stylesheets/patcheslist.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/patcheslist.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -6,7 +6,7 @@
 
 <!--
 $LastChangedBy: randy $
-$Date: 2008-08-30 13:59:04 $
+$Date: 2007-01-30 21:25:59 +0100 (mar, 30 jan 2007) $
 -->
 
 <!--
@@ -39,7 +39,7 @@
     <xsl:text>cd </xsl:text>
     <xsl:value-of select="$dest.dir"/>
     <xsl:text> &&&#x0a;&#x0a;</xsl:text>
-      <!-- Remove old patches and possible list of missing patches-->
+      <!-- Remove old patches et possible list of missing patches-->
     <xsl:text>rm -f *.patch copyerrs &&&#x0a;&#x0a;</xsl:text>
     <xsl:apply-templates/>
       <!-- Ensure correct ownership -->
@@ -53,9 +53,9 @@
   <xsl:template match="//text()"/>
 
   <xsl:template match="//ulink">
-      <!-- Match only local patches links and skip duplicated URLs splitted for PDF output-->
-    <xsl:if test="contains(@url, '.patch') and contains(@url, '&patch-root;')
-            and not(ancestor-or-self::*/@condition = 'pdf')">
+      <!-- Match only local patches links et skip duplicated URLs splitted for PDF output-->
+    <xsl:if test="contains(@url, '.patch') et contains(@url, '&patch-root;')
+            et not(ancestor-or-self::*/@condition = 'pdf')">
       <xsl:variable name="patch.name" select="substring-after(@url, '&patch-root;')"/>
       <xsl:text>copy /srv/www/www.linuxfromscratch.org/patches/downloads</xsl:text>
       <xsl:choose>

Modified: trunk/blfs/stylesheets/wget-list.xsl
===================================================================
--- trunk/blfs/stylesheets/wget-list.xsl	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/stylesheets/wget-list.xsl	2009-10-11 23:50:31 UTC (rev 1007)
@@ -2,10 +2,10 @@
 
 <!--
 $LastChangedBy: manuel $
-$Date: 2008-08-30 13:59:04 $
+$Date: 2007-01-25 20:55:05 +0100 (jeu, 25 jan 2007) $
 -->
 
-<!-- Create a list of upstream URLs for packages and patches to be used
+<!-- Create a list of upstream URLs for packages et patches to be used
      with wget. -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -32,10 +32,10 @@
 
   <xsl:template match="itemizedlist">
     <xsl:choose>
-      <!-- If both http and ftp URLs are available, output the ftp one if not empty,
+      <!-- If both http et ftp URLs are available, output the ftp one if not empty,
            otherwise output the http URL.-->
       <xsl:when test="contains(listitem[1]/para,'(HTTP)')
-                      and contains(listitem[2]/para,'(FTP)')">
+                      et contains(listitem[2]/para,'(FTP)')">
         <xsl:choose>
           <xsl:when test="string-length(listitem[2]/para/ulink/@url) > '10'">
             <xsl:apply-templates select="listitem[2]/para/ulink"/>
@@ -45,7 +45,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <!-- Additional packages and patches.-->
+      <!-- Additional packages et patches.-->
       <xsl:otherwise>
         <xsl:apply-templates select="listitem/para/ulink"/>
       </xsl:otherwise>
@@ -60,7 +60,7 @@
                   or contains(@url, '.tgz') or contains(@url, '.tar')
                   or contains(@url, 'patch.txt') or contains(@url, '.zip')
                   or contains(@url, '.patch') or contains(@url, '/patch.'))
-                  and not(ancestor-or-self::*/@condition = 'pdf')">
+                  et not(ancestor-or-self::*/@condition = 'pdf')">
       <xsl:choose>
         <!-- Fix SourceForge links-->
         <xsl:when test="contains(@url,'?download')">
@@ -84,10 +84,10 @@
                   or contains(@url, '.zip') or contains(@url, '.patch')
                   or contains(@url, '/patch.') or contains(@url, 'md5sums')
                   or contains(@url, 'mozconfig'))
-                  and not(contains(@url, '?url'))
-                  and not(ancestor-or-self::*/@condition = 'pdf')">
-      <!-- To list all URls, included html files, wiki pages, home pages, and
-      mailto: links, comment-out the above xsl:if and uncomment the next one. -->
+                  et not(contains(@url, '?url'))
+                  et not(ancestor-or-self::*/@condition = 'pdf')">
+      <!-- To list all URls, included html files, wiki pages, home pages, et
+      mailto: links, comment-out the above xsl:if et uncomment the next one. -->
     <!--
     <xsl:if test="not(ancestor-or-self::*/@condition = 'pdf')">
     -->

Modified: trunk/blfs/template/README
===================================================================
--- trunk/blfs/template/README	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/template/README	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,4 +1,7 @@
-Ceci est un modèle générique.
+$LastChangedBy: randy $
+$Date: 2007-01-18 20:38:19 +0100 (jeu, 18 jan 2007) $
 
-Faites une copie du fichier et modifiez-le comme vous le souhaitez.
+This is a generic template.
 
+Makes a copy of the file et edit as needed.
+

Modified: trunk/blfs/template/template.xml
===================================================================
--- trunk/blfs/template/template.xml	2009-10-10 13:14:29 UTC (rev 1006)
+++ trunk/blfs/template/template.xml	2009-10-11 23:50:31 UTC (rev 1007)
@@ -1,200 +1,282 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!-- Copiez ceci dans le fichier general.ent
-  <!ENTITY MODELE-version "">
+  <!-- Place this in the general.ent file
+  <!ENTITY TEMPLATE-version "">
   -->
 
-  <!ENTITY MODELE-download-http "http://">
-  <!ENTITY MODELE-download-ftp  "ftp://">
-  <!ENTITY MODELE-md5sum        "somme MD5">
-  <!ENTITY MODELE-size          "?? Mo">
-  <!ENTITY MODELE-buildsize     "?? Mo">
-  <!ENTITY MODELE-time          "?? SBU">
+  <!ENTITY TEMPLATE-download-http "http://">
+  <!ENTITY TEMPLATE-download-ftp  "ftp://">
+  <!ENTITY TEMPLATE-md5sum        "MD5 sum">
+  <!ENTITY TEMPLATE-size          "?? Mio">
+  <!ENTITY TEMPLATE-buildsize     "?? Mio">
+  <!ENTITY TEMPLATE-time          "?? SBU">
 ]>
 
-<sect1 id="MODELE" xreflabel="MODELE-&MODELE-version;">
+<!-- Try to keep the indentation used in this file-->
+<sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;">
+  <?dbhtml filename="TEMPLATE.html"?>
 
-<sect1info>
-  <othername>$LastChangedBy: bdubbs $</othername>
-  <date>$Date: 2005-06-15 05:42:16 $</date>
-</sect1info>
+  <sect1info>
+    <othername>$LastChangedBy: randy $</othername>
+    <date>$Date: 2007-04-04 21:42:53 +0200 (mer, 04 avr 2007) $</date>
+  </sect1info>
 
-<?dbhtml filename="MODELE.html"?>
-<title><application>MODELE</application>-&MODELE-version;</title>
-<indexterm zone="MODELE">
-  <primary sortas="a-MODELE">MODELE</primary>
-</indexterm>
+  <!-- No other tags inside any title-->
+  <!-- Use Title Case in All Titles
+  The "The Chicago Manual of Style":
+  "-Always capitalize the first et the last word.
+   -Capitalize all nouns, pronouns, adjectives, verbs, adverbs, et
+    subordinate conjunctions ("as", "because", "although").
+   -Lowercase all articles, coordinate conjunctions ("and", "or", "nor"),
+    et prepositions regardless of length, when they are other than the
+    first or last word.
+   -Lowercase the "to" in an infinitive."-->
+  <title>TEMPLATE-&TEMPLATE-version;</title>
 
-<sect2>
-<title>Introduction à <application>MODELE</application></title>
+  <indexterm zone="TEMPLATE">
+    <primary sortas="a-TEMPLATE">TEMPLATE</primary>
+  </indexterm>
 
-<para>Le paquetage <application>MODELE</application> contient...
-Il est utile pour...</para>
+  <!--Required section-->
+  <sect2 role="package">
+    <title>Introduction à TEMPLATE</title>
 
-<sect3><title>Informations sur le paquetage</title>
-<itemizedlist spacing="compact">
-  <listitem><para>Téléchargement (HTTP) :
-    <ulink url="&MODELE-download-http;"/></para></listitem>
-  <listitem><para>Téléchargement (FTP) :
-    <ulink url="&MODELE-download-ftp;"/></para></listitem>
-  <listitem><para>Téléchargement de la somme MD5 :
-    &MODELE-md5sum;</para></listitem>
-  <listitem><para>Taille du téléchargement :
-    &MODELE-size;</para></listitem>
-  <listitem><para>Estimation de l'espace disque requis :
-    &MODELE-buildsize;</para></listitem>
-  <listitem><para>Estimation du temps de construction :
-    &MODELE-time;</para></listitem></itemizedlist>
-</sect3>
+    <para>The <application>TEMPLATE</application> package contains...
+    This is useful for...</para>
 
-<sect3>
-  <title>Téléchargements supplémentaires</title>
-  <itemizedlist spacing="compact">
-    <listitem><para>Correctif requis : <ulink 
-      url="&patch-root;/MODELE-&MODELE-version;-nom_correctif-version_correctif.patch"/></para>
-    </listitem>
-  </itemizedlist>
-</sect3>
+    <bridgehead renderas="sect3">Informations sur le paquet</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Téléchargement (HTTP) : <ulink url="&TEMPLATE-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Téléchargement (FTP) : <ulink url="&TEMPLATE-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Somme de contrôle MD5 du téléchargement : &TEMPLATE-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Taille du téléchargement : &TEMPLATE-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation de l'espace disque requis : &TEMPLATE-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimation du temps de construction : &TEMPLATE-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect3><title>Dépendances de <application>MODELE</application></title>
-  <sect4><title>Requis</title>
-    <para><xref linkend="BLFS DEPENDENCY"/></para>
-  </sect4>
+    <!-- As required -->
+    <bridgehead renderas="sect3">Téléchargements supplémentaires</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Correctif requis : <ulink
+        url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/></para>
+      </listitem>
+    </itemizedlist>
 
-  <sect4><title>Optionnel</title>
-    <para><ulink url="http://www.une.url/">EXTERNAL DEPENDENCY</ulink></para>
-  </sect4>
-</sect3>
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
-</sect2>
+    <bridgehead renderas="sect4">Requises</bridgehead>
+    <para role="required"><xref linkend="BLFS DEPENDENCY"/></para>
 
-<sect2>
-<title>Installation de <application>MODELE</application></title>
+    <!-- As required -->
+    <bridgehead renderas="sect4">Recommandées</bridgehead>
+    <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>,
+    <xref linkend="BLFS DEPENDENCY"/></para>
 
-<para>Installez <application>MODELE</application> en lançant les commandes
-suivantes :</para>
+    <!-- As required -->
+    <bridgehead renderas="sect4">Facultatives</bridgehead>
+    <para role="optional"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
 
-<screen><userinput><command>./configure --prefix=/usr &&
-make</command></userinput></screen>
+    <para condition="html" role="usernotes">Notes utilisateur :
+    <ulink url="&blfs-wiki;/TEMPLATE"/></para>
 
-<para>Maintenant, en tant qu'utilisateur root :</para>
+  </sect2>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+  <!-- Optional section for packages that need a specific kernel configuration-->
+  <sect2 role="kernel" id='TEMPLATE-kernel'>
+    <title>Kernel Configuration</title>
 
-</sect2>
+    <para>Enable the following options in the kernel configuration
+    et recompile the kernel if necessary:</para>
 
-<sect2>
-<title>Explications des commandes</title>
+<!-- Spaces are significant in <screen> sections -->
+<screen><literal>Master section:
+  Subsection:
+    Required Option: M or Y
+    Incompatible option: N</literal></screen>
 
-<para><command>COMMAND</command> : cette commande fait quelque chose.</para>
+    <para>Select the appropriate sub-options that appear when the above options
+    are selected.</para>
 
-<para><parameter>--SWITCH=PARAMETER</parameter> : ce paramètre fait quelque
-chose de nécessaire pour BLFS.</para>
+    <indexterm zone="TEMPLATE TEMPLATE-kernel">
+      <primary sortas="d-TEMPLATE">TEMPLATE</primary>
+    </indexterm>
 
-<para><option>--OPTION</option> : cette option fait quelque chose suivant
-les besoins et désirs de l'utilisateur.</para>
+  </sect2>
 
-</sect2>
+  <!--Required section-->
+  <sect2 role="installation">
+    <title>Installation de TEMPLATE</title>
 
-<sect2>
-<title>Configurer <application>MODELE</application></title>
+    <para>Installez <application>TEMPLATE</application> en lançant les commandes
+    suivantes :</para>
 
-<sect3 id="MODELE-config">
-  <title>Fichiers de configuration</title>
-  <para><filename>~/.Configfilename1</filename> et
-    <filename>/etc/path/Configfilename2</filename></para>
+<!-- Spaces are significant in <screen> sections -->
+<screen><userinput>./configure --prefix=/usr &&
+make</userinput></screen>
 
-  <indexterm zone="MODELE MODELE-config">
-    <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
-  </indexterm>
-  
-  <indexterm zone="MODELE MODELE-config">
-    <primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
-  </indexterm>
-</sect3>
+    <!-- Use one of the two mentions below about a test suite,
+         delete the line that is not applicable. Of course, if the
+         test suite uses syntax other than 'make check', revise the
+         line to reflect the actual syntax to run the test suite -->
 
-<sect3><title>Informations sur la configuration</title>
+    <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
+    <para>Pour tester les résultats, lancez : <command>make check</command>.</para>
 
-  <para><userinput role='root'>UNE ENTRÉE UTILISATEUR ICI</userinput> Blah blah blah 
-    sur la config.</para>
+    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 
-  <para id="MODELE-init">Pour lancer automatiquement le démon
-    <command>MODELE</command> au démarrage du système, installez le script
-    de démarrage <filename>/etc/rc.d/init.d/MODELE</filename> provenant du
-    paquetage <xref linkend="intro-important-bootscripts"/>.</para> 
+<screen role="root"><userinput>make install</userinput></screen>
 
-  <indexterm zone="MODELE MODELE-init"> 
-    <primary sortas="f-MODELE">MODELE</primary>
-  </indexterm> 
+  </sect2>
 
-<screen><userinput role='root'><command>make install-MODELE</command></userinput></screen>
-</sect3>
+  <!--Optional section-->
+  <sect2 role="commands">
+    <title>Explication des commandes</title>
 
-</sect2>
+    <para><command>COMMAND</command>: This command does something.</para>
 
-<sect2>
-<title>Contenu</title>
+    <para><parameter>--SWITCH=PARAMETER</parameter>: This parameter does
+    something mandatory for BLFS purposes.</para>
 
-<segmentedlist>
-  <segtitle>Programme(s) installé(s)</segtitle>
-  <segtitle>Bibliothèque(s) installée(s)</segtitle>
-  <segtitle>Répertoire(s) installé(s)</segtitle>
+    <para><option>--OPTION</option>: This option does something optionally
+    per the user's desires.</para>
 
-  <seglistitem>
-    <seg>PROGRAMME1, PROGRAMME2 et PROGRAMME3</seg>
-    <seg>libBIBLIOTHÈQUE1, libBIBLIOTHÈQUE2 et libBIBLIOTHÈQUE3</seg>
-    <seg>/etc/MODELE, /usr/include/MODELE, /usr/lib/MODELE, 
-         /usr/share/MODELE-&MODELE-version;, 
-         /usr/share/doc/MODELE-&MODELE-version; et
-         /var/lib/MODELE</seg>
-  </seglistitem>
-</segmentedlist>
+  </sect2>
 
-<variablelist>
-  <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
-  <?dbfo list-presentation="list"?>
+  <!--Optional section-->
+  <sect2 role="configuration">
+    <title>Configuration de TEMPLATE</title>
 
-<!-- Si le programme ou un nom de bibliothèque entre en conflit (est identique)
-au nom du paquetage, ajoutez -prog ou -lib à l'id de l'entité varlistentry
-et à la deuxième entrée de l'entité de zone indexterm -->
+    <sect3 id="TEMPLATE-config">
+      <title>Fichiers de configuration</title>
+      <para><filename>~/.Configfilename1</filename> et
+      <filename>/etc/path/Configfilename2</filename></para>
 
-<varlistentry id="PROGRAMME1">
-  <term><command>PROGRAMME1</command></term>
-  <listitem>
-    <para>fait ceci...</para>
-    <indexterm zone="MODELE PROGRAMME1">
-      <primary sortas="b-PROGRAMME1">PROGRAMME1</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <indexterm zone="TEMPLATE TEMPLATE-config">
+        <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
+      </indexterm>
 
-<varlistentry id="PROGRAMME2">
-  <term><command>PROGRAMME2</command></term>
-  <listitem>
-    <para>does this .....</para>
-    <indexterm zone="MODELE PROGRAMME2">
-      <primary sortas="b-PROGRAMME2">PROGRAMME2</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <indexterm zone="TEMPLATE TEMPLATE-config">
+        <primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
+      </indexterm>
+    </sect3>
 
-<varlistentry id="libBIBLIOTHÈQUE1">
-  <term><filename class='libraryfile'>libBIBLIOTHÈQUE1.[so,a]</filename></term>
-  <listitem>
-    <para>contains functions that .....</para>
-    <indexterm zone="MODELE libBIBLIOTHÈQUE1">
-      <primary sortas="c-libBIBLIOTHÈQUE1">libBIBLIOTHÈQUE1.[so,a]</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+    <sect3><title>Informations de configuration</title>
 
-</variablelist>
+      <para>Blah blah blah about config.</para>
 
-</sect2>
+<screen><userinput>USER CONFIG COMMANDS</userinput></screen>
 
+<screen role="root"><userinput>ROOT CONFIG COMMANDS</userinput></screen>
+
+      <!-- File creation. Add the appropriate <indexterm> block if needed.-->
+      <para>Create the file .... for ...</para>
+
+<screen role="root"><userinput>cat >> /PATH/FILENAME << "EOF"
+<literal># Begin FILENAME
+
+TEXT
+
+# End FILENAME</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3  id="TEMPLATE-init">
+      <title>Boot Script</title>
+
+      <para>To automatically start the <command>TEMPLATE</command> daemon
+      when the system is rebooted, install the
+      <filename>/etc/rc.d/init.d/TEMPLATE</filename>
+      bootscript from the
+      <xref linkend="bootscripts"/> package.</para>
+
+      <indexterm zone="TEMPLATE TEMPLATE-init">
+        <primary sortas="f-TEMPLATE">TEMPLATE</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <!--Required section-->
+  <sect2 role="content">
+    <title>Contenu</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program(s)</segtitle>
+      <segtitle>Installed Librar(y,ies)</segtitle>
+      <segtitle>Installed Director(y,ies)</segtitle>
+
+      <seglistitem>
+        <seg>PROGRAM1, PROGRAM2, et PROGRAM3</seg>
+        <seg>libLIBRARY1, libLIBRARY2, et libLIBRARY3</seg>
+        <seg>/etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
+        /usr/share/TEMPLATE-&TEMPLATE-version;,
+        /usr/share/doc/TEMPLATE-&TEMPLATE-version;, et
+        /var/lib/TEMPLATE</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <!-- If the program or library name conflicts (is the same) as the
+      package name, add -prog or -lib to the varlistentry entity id
+      et the 2nd entry of the indexterm zone entity -->
+
+      <varlistentry id="PROGRAM1">
+        <term><command>PROGRAM1</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="TEMPLATE PROGRAM1">
+            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="PROGRAM2">
+        <term><command>PROGRAM2</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="TEMPLATE PROGRAM2">
+            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libLIBRARY1">
+        <term><filename class='libraryfile'>libLIBRARY1.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="TEMPLATE libLIBRARY1">
+            <primary sortas="c-libLIBRARY1">libLIBRARY1.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
 </sect1>
-




More information about the lfs-traducfr mailing list