diff --git a/fr/includes.xsl b/fr/includes.xsl
index 1b95dee6a8..4f720245c4 100644
--- a/fr/includes.xsl
+++ b/fr/includes.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/fr/includes.xsl,v 1.5 2003/12/29 16:41:05 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/includes.xsl,v 1.6 2004/05/30 19:20:18 stephane Exp $ -->
 
 <!-- 
    The FreeBSD French Documentation Project
@@ -28,8 +28,14 @@
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
   <xsl:variable name="u.rel.hardware">
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/hardware.html</xsl:variable>
+  <xsl:variable name="u.rel.installation">
+    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/installation.html</xsl:variable>
+  <xsl:variable name="u.rel.readme">
+    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/readme.html</xsl:variable>
   <xsl:variable name="u.rel.early">
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
+  <xsl:variable name="u.rel.migration">
+    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
 
   <xsl:variable name="u.rel2.notes">
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
@@ -39,6 +45,10 @@
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/errata.html</xsl:variable>
   <xsl:variable name="u.rel2.hardware">
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/hardware.html</xsl:variable>
+  <xsl:variable name="u.rel2.installation">
+    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/installation.html</xsl:variable>
+  <xsl:variable name="u.rel2.readme">
+    <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/readme.html</xsl:variable>
 
   <!-- -->
 
diff --git a/fr/index.xsl b/fr/index.xsl
index 8fd5d9aaa1..f13bb1f938 100644
--- a/fr/index.xsl
+++ b/fr/index.xsl
@@ -1,8 +1,8 @@
-<!-- $FreeBSD: www/fr/index.xsl,v 1.9 2004/01/12 20:21:21 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/index.xsl,v 1.10 2004/02/29 13:20:40 stephane Exp $ -->
 
 <!-- 
    The FreeBSD French Documentation Project
-   Original revision: 1.95
+   Original revision: 1.117
    
    Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
 -->
@@ -13,12 +13,13 @@
   <xsl:import href="news/includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/index.xsl,v 1.9 2004/01/12 20:21:21 stephane Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/index.xsl,v 1.10 2004/02/29 13:20:40 stephane Exp $'"/>
   <xsl:variable name="title" select="'Le Projet FreeBSD'"/>
 
   <!-- these params should be externally bound. The values
        here are not used actually -->
   <xsl:param name="advisories.xml" select="'none'"/>
+  <xsl:param name="notices.xml" select="'none'"/>
   <xsl:param name="mirrors.xml" select="'none'"/>
   <xsl:param name="news.press.xml" select="'none'"/>
   <xsl:param name="news.project.xml" select="'none'"/>
@@ -38,6 +39,20 @@
 	      CVS, CVSup, Nouvelles, Revendeurs, homepage, CTM, Unix"/>
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
 	<link rel="icon" href="/favicon.ico" type="image/x-icon"/>
+   <link rel="alternate" type="application/rss+xml"
+         title="Nouvelles du projet FreeBSD" href="{$base}/news/news.rdf" />
+   <!-- le RDF des avis de securite n'est pas traduit => enbase -->
+   <link rel="alternate" type="application/rss+xml"
+         title="Avis de s&#233;curit&#233; FreeBSD" href="{$enbase}/security/advisories.rdf" />
+   <link rel="alternate" type="application/rss+xml"
+         title="Nouvelles du projet GNOME pour FreeBSD" href="{$base}/gnome/news.rdf" />
+
+   <!-- Formatted to be easy to spam harvest, please do not reformat. -->
+   <xsl:comment>
+    Spamtrap, do not email:
+    &lt;a href="mailto:bruscar@freebsd.org"&gt;bruscar@freebsd.org&lt;/a&gt;
+   </xsl:comment>
+
       </head>
 
       <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#840084"
@@ -60,10 +75,6 @@
 		<br/>
 
 		<select name="goto">
-		  <!--  Only list TRUE mirrors here! Native language pages 
-		        which are not mirrored should be listed in
-		        support.sgml.  -->
-
 		  <xsl:call-template name="html-index-mirrors-options-list">
 		    <xsl:with-param name="mirrors.xml" select="$mirrors.xml" />
 		  </xsl:call-template>
@@ -117,7 +128,8 @@
 			      <input type="text" name="words" size="10"/>
 			      <input type="hidden" name="max" value="25"/>
 			      <input type="hidden" name="source" value="www"/>
-			      <input type="submit" value="Go"/></small>
+			      <input type="submit" value="Go"/>
+             </small>
 			  </form>
                         </td>
 		      </tr>
@@ -135,7 +147,9 @@
 	      <h2><font color="#990000">Qu'est-ce que FreeBSD ?</font></h2>
 	
 	      <p>FreeBSD est un syst&#232;me d'exploitation avanc&#233; pour
-		les architectures compatibles x86, AMD64, Alpha, IA-64, PC-98 et UltraSPARC&#174;.
+		les architectures compatibles x86 (y compris Pentium et Athlon), compatibles 
+      amd64 (y compris Opteron, Athlon 64 et EM64T), 
+      Alpha/AXP, IA-64, PC-98 et UltraSPARC&#174;.
 		Il est d&#233;riv&#233; de UNIX BSD, la version d'<xsl:value-of select="$unix"/> 
 		d&#233;velopp&#233; &#224;
 		l'Universit&#233; de Californie, Berkeley.
@@ -161,9 +175,7 @@
 		Il offre des services r&#233;seaux robustes, m&#234;me sous de fortes
 		charges, et utilise efficacement la m&#233;moire afin de maintenir des
 		temps de r&#233;ponses corrects pour des milliers de processus utilisateurs
-		simultan&#233;s. Vous pouvez consulter notre
-		<a href="gallery/gallery.html">galerie</a> d'exemples de
-		services et d'applications utilisant FreeBSD.</p>
+		simultan&#233;s.</p>
 
 	      <h2><font color="#990000">Une grande vari&#233;t&#233;
 		  d'applications</font></h2>
@@ -187,16 +199,16 @@
 
 	      <h2><font color="#990000">FreeBSD est <i>libre et gratuit</i></font></h2>
 
-	      <a href="copyright/daemon.html"><img src="{$enbase}/gifs/dae_up3.gif"
-						   alt=""
-						   height="81" width="72"
-						   align="right"
-						   border="0"/></a>
+	      <a href="copyright/daemon.html"><img 
+            src="{$enbase}/gifs/dae_up3.gif" alt="The BSD Daemon"
+			   height="81" width="72" align="right"
+				border="0"/></a>
 
 	      <p>Alors que vous pourriez vous attendre &#224; ce qu'un syst&#232;me d'exploitation
 		avec ce type de fonctions soit vendu &#224; un prix &#233;lev&#233;, FreeBSD est disponible
 		<a href="{$base}/copyright/index.html">gratuitement</a>
-		et est fourni avec l'int&#233;gralit&#233; de son code source. Si vous voulez l'essayer,
+		et est fourni avec l'int&#233;gralit&#233; de son code source. Si vous voulez 
+      acheter ou t&#233;l&#233;charger une copie afin de l'essayer,
 		<a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/mirrors.html">de plus
 		  amples informations sont disponibles</a>.</p>
 
@@ -212,7 +224,7 @@
 		&#224; FreeBSD</a>pour plus d'informations.</p>
 
 		<p>M&#234;me si vous n'&#234;tes pas un programmeur, il existe d'autres fa&#231;ons de
- 		contribuer &#224; FreeBSD. La Fondation FreeBSD est une
+ 		contribuer &#224; FreeBSD. La <a href="http://www.FreeBSDFoundation.org">Fondation FreeBSD</a> est une
 		organisation &#224; but non-lucratif pour laquelle les dons directs
 		sont enti&#232;rement d&#233;ductibles. Veuillez contacter
 		<a href="mailto:bod@FreeBSDFoundation.org">bod@FreeBSDFoundation.org</a>
@@ -241,39 +253,41 @@
 		    <table cellpadding="4" cellspacing="0" border="0"
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
-			<td valign="top"><p>
-			    <a href="{$u.rel.early}">
-			      <font size="+1" color="#990000"><b>Version la plus r&#233;cente :
+			<td valign="top">
+           <p><a href="{$u.rel.announce}">
+			      <font size="+1" color="#990000"><b>Version de production :
 				  <xsl:value-of select="$rel.current"/></b></font></a><br/>
-			    <small>&#183; <a href="{$u.rel.announce}">Annonce</a><br/>
-			      &#183; <a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/install.html">Guide d'installation</a><br/>
+			     <small>&#183; <a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/install.html">Guide d'installation</a><br/>
 			      &#183; <a href="{$u.rel.notes}">Notes</a><br/>
 			      &#183; <a href="{$u.rel.hardware}">Compatibilit&#233; mat&#233;riel</a><br/>
+               &#183; <a href="{$u.rel.installation}">Notes d'installation</a><br/>
 			      &#183; <a href="{$u.rel.errata}">Errata</a><br/>
-			      &#183; <a href="{$u.rel.early}">Guide pour les premiers utilisateurs</a></small></p>
+               &#183; <a href="{$u.rel.migration}">Guide de migration</a></small>
+             </p>
            
-			  <p>
-			    <a href="{$u.rel2.announce}">
-			      <font size="+1" color="#990000"><b>Version de production :
+			  <p><a href="{$u.rel2.announce}">
+			      <font size="+1" color="#990000"><b>Version (ancienne) de production :
 				  <xsl:value-of select="$rel2.current"/></b></font></a><br/>
 
-			    <small>&#183; <a href="{$u.rel2.announce}">Annonce</a><br/>
-			      &#183; <a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/install.html">Guide d'installation</a><br/>
+			    <small>&#183; <a href="{$enbase}/doc/{$url.doc.langcode}/books/handbook/install.html">Guide d'installation</a><br/>
 			      &#183; <a href="{$u.rel2.notes}">Notes</a><br/>
 			      &#183; <a href="{$u.rel2.hardware}">Compatibilit&#233; mat&#233;riel</a><br/>
-			      &#183; <a href="{$u.rel2.errata}">Errata</a></small></p>
+			      &#183; <a href="{$u.rel2.installation}">Notes d'installation</a><br/>
+               &#183; <a href="{$u.rel2.errata}">Errata</a></small>
+           </p>
 
-			  <p><font size="+1" color="#990000"><b>Nouvelles du Projet</b></font><br/>
-			    <font size="-1">
-			      Derni&#232;re mise &#224; jour :
+			  <p><font size="+1" color="#990000"><b>Nouvelles du Projet</b></font>
+           <xsl:text> </xsl:text>
+             <font color="#990000">(<a href="news/news.rdf">RSS</a>)</font><br/>
+			    <font size="-1">Derni&#232;re mise &#224; jour :
 			      <xsl:call-template name="html-index-news-project-items-lastmodified">
-				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
+				     <xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			      </xsl:call-template>
 
 			      <br/>
 			      
 			      <xsl:call-template name="html-index-news-project-items">
-				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
+				     <xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			      </xsl:call-template>
 
 			      <a href="news/newsflash.html">Plus...</a>
@@ -297,23 +311,50 @@
 			    </font>
 			  </p>
            
-			  <p><font size="+1" color="#990000"><b>Avis de s&#233;curit&#233;</b></font><br/>
-
+			  <p><font size="+1" color="#990000"><b>Avis de s&#233;curit&#233;</b></font>
+           <xsl:text> </xsl:text>
+             <!-- le RDF des avis de securite n'est pas traduit => enbase -->
+             <font color="#990000">(<a href="{$enbase}/security/advisories.rdf">RSS</a>)</font><br/>
 			    <font size="-1">
 			      Derni&#232;re mise &#224; jour :
 			      <xsl:call-template name="html-index-advisories-items-lastmodified">
-				<xsl:with-param name="advisories.xml" select="$advisories.xml" />
+				     <xsl:with-param name="advisories.xml" select="$advisories.xml" />
+                 <xsl:with-param name="type" select="'advisory'" />
 			      </xsl:call-template>
 
 			      <br/>
 			      
 			      <xsl:call-template name="html-index-advisories-items">
-				<xsl:with-param name="advisories.xml" select="$advisories.xml" />
+				     <xsl:with-param name="advisories.xml" select="$advisories.xml" />
+                 <xsl:with-param name="type" select="'advisory'" />
 			      </xsl:call-template>
 
 			      <a href="security/">Plus...</a>
 			    </font>
 			  </p>
+           
+           <!-- pas encore integre -->
+           <xsl:comment>
+           <p><font size="+1" color="#990000"><b><!-- Errata --></b></font>
+             <xsl:text> </xsl:text>
+             <br/>
+             <font size="-1">
+               <!-- Derni&#232;re mise &#224; jour : -->
+               <xsl:call-template name="html-index-advisories-items-lastmodified">
+                 <xsl:with-param name="advisories.xml" select="$notices.xml" />
+                 <xsl:with-param name="type" select="'notice'" />
+               </xsl:call-template>
+
+               <br/>
+
+               <xsl:call-template name="html-index-advisories-items">
+                 <xsl:with-param name="advisories.xml" select="$notices.xml" />
+                 <xsl:with-param name="type" select="'notice'" />
+               </xsl:call-template>
+             </font>
+           </p>
+           </xsl:comment>
+           
 			</td>
 		      </tr>
 		    </table>
@@ -350,23 +391,24 @@
 	  <tr>
 	    <td><a href="http://www.freebsdmall.com/"><img
 							   src="{$enbase}/gifs/mall_title_medium.gif" alt="[FreeBSD Mall]"
-							   height="65" width="165" border="0"/></a></td>
+							   height="65" width="165" border="0"/></a>
+       </td>
 
-	    <td><a href="http://www.ugu.com/"><img src="{$enbase}/gifs/ugu_icon.gif"
-						   alt="[Sponsor of Unix Guru Universe]"
-						   height="64" width="76"
-						   border="0"/></a></td>
+	    <td><a href="http://www.ugu.com/"><img 
+            src="{$enbase}/gifs/ugu_icon.gif" alt="[Sponsor of Unix Guru 
+            Universe]" height="64" width="76"
+				border="0"/></a>
+       </td>
 
-	    <td><a href="http://www.daemonnews.org/"><img src="{$enbase}/gifs/darbylogo.gif"
-		alt="[Daemon News]" height="45" width="130"
-		border="0"/></a></td>
+	    <td><a href="http://www.daemonnews.org/"><img 
+             src="{$enbase}/gifs/darbylogo.gif" alt="[Daemon News]" 
+             height="45" width="130" border="0"/></a>
+       </td>
 
-	    <td><a href="{$base}/copyright/daemon.html"><img
-							     src="{$enbase}/gifs/powerlogo.gif"
-							     alt="[Powered by FreeBSD]"
-							     height="64"
-							     width="160"
-							     border="0"/></a></td>
+	    <td><a href="{$base}/art.html"><img
+				 src="{$enbase}/gifs/powerlogo.gif" alt="[Powered by FreeBSD]"
+		       height="64" width="160" border="0"/></a>
+       </td>
 	  </tr>
 	</table>