From 922578311dfc26a09815a8b68eca06e1fec6b029 Mon Sep 17 00:00:00 2001
From: Stephane Legrand <stephane@FreeBSD.org>
Date: Tue, 8 Jul 2003 17:04:10 +0000
Subject: [PATCH] Merge from the English version:

  1.56  -> 1.59  fr/includes.sgml
  1.146 -> 1.155 fr/news/news.xml
---
 fr/includes.sgml | 18 ++++++----
 fr/news/news.xml | 87 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/fr/includes.sgml b/fr/includes.sgml
index 428f161c00..6e28acf525 100644
--- a/fr/includes.sgml
+++ b/fr/includes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/fr/includes.sgml,v 1.2 2003/01/26 13:59:03 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/includes.sgml,v 1.3 2003/04/06 16:35:25 stephane Exp $ -->
 <!--  
   Base is the absolute URL for the given page, minus the actual page
   part.  It should either be specified as a fully qualified URL, or
@@ -14,7 +14,7 @@
 
 <!-- 
    The FreeBSD French Documentation Project
-   Original revision: 1.56
+   Original revision: 1.59
    
    Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
 -->
@@ -28,11 +28,10 @@
 <!-- Components making up the standard headers and footers. -->
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.                                      -->
-<!ENTITY copyright 'Copyright &copy; 1995-2003 Le Projet FreeBSD.  
+<!ENTITY copyright '&copy; 1995-2003 Le Projet FreeBSD.  
   Tous droits r&eacute;serv&eacute;s.'>
 <!ENTITY email 'freebsd-questions'>
-<!ENTITY author '<a href="&base;/mailto.html">&email@FreeBSD.ORG</a><br>
-  &copyright;'>
+<!ENTITY author '<a href="&base;/index.html">accueil</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contacts</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">infos l&eacute;gales</a> &nbsp; | &nbsp; &copyright;'>
 <!ENTITY date ''>
 <!ENTITY home '<a href="&base;/index.html"><img src="&base;/gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
@@ -85,8 +84,8 @@ src="&base;/gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0
      rel.* and u.rel.* for the "latest and greatest" version and
      rel2.* and u.rel2.* for the "conservative users" version.
 -->
-<!ENTITY rel.current '5.0'>
-<!ENTITY rel.current.date 'Janvier 2003'>
+<!ENTITY rel.current '5.1'>
+<!ENTITY rel.current.date 'Juin 2003'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>
@@ -120,6 +119,11 @@ les pages web FreeBSD &agrave; partir du d&eacute;p&ocirc;t CVS.</p>'>
 <!ENTITY raquo SDATA "[raquo ]">
 <!ENTITY laquo SDATA "[laquo ]">
 
+<!-- Often used trademarks -->
+<!ENTITY unix 'UNIX&reg;'>
+<!ENTITY java 'Java&trade;'>
+<!ENTITY jdk 'JDK&trade;'>
+
 <!-- 
      Local Variables:
      mode: sgml
diff --git a/fr/news/news.xml b/fr/news/news.xml
index e9e926cffb..a40c0582b6 100644
--- a/fr/news/news.xml
+++ b/fr/news/news.xml
@@ -20,7 +20,7 @@
 
 <!-- 
    The FreeBSD French Documentation Project
-   Original revision: 1.146
+   Original revision: 1.155
    
    Version francaise : Francois TIFFREAU <dc@freebsd-fr.org>
    Version francaise (mise a jour) : 1.13 2002/08/22 11:03:57 eagle
@@ -31,13 +31,96 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/fr/news/news.xml,v 1.4 2003/04/06 16:35:26 stephane Exp $
+      $FreeBSD: www/fr/news/news.xml,v 1.5 2003/06/01 15:03:08 stephane Exp $
     </cvs:keyword>
   </cvs:keywords>
 
   <year>
     <name>2003</name>
 
+    <month>
+      <name>Juin</name>
+
+      <day>
+        <name>24</name>
+          <event>
+            <p>Nouveau participant : <a
+                  href="mailto:smkelly@FreeBSD.org">Sean Kelly</a></p>
+          </event>
+      </day>
+
+      <day>
+        <name>23</name>
+          <event>
+            <p>Nouveau participant : <a
+                  href="mailto:dds@FreeBSD.org">Diomidis D. Spinellis</a></p>
+          </event>
+      </day>
+
+      <day>
+        <name>19</name>
+          <event>
+	    <title>Le Projet FreeBSD f&#234;te ses 10 ans !</title>
+
+            <p>Il y a 10 ans jour pour jour, le nom "FreeBSD" a &#233;t&#233; invent&#233; 
+	      par David Greenman dans <a
+	      href="$base/news/1993/freebsd-coined.html">ce
+	      message</a>. Viva FreeBSD !</p>
+
+          </event>
+      </day>
+
+      <day>
+        <name>17</name>
+          <event>
+            <p>Nouveau participant : <a
+                  href="mailto:lev@FreeBSD.org">Lev Serebryakov</a>
+               (Ports)</p>
+          </event>
+      </day>
+
+      <day>
+        <name>13</name>
+          <event>
+            <p>Retour d'un participant : <a
+                  href="mailto:jmg@FreeBSD.org">John-Mark Gurney</a></p>
+          </event>
+      </day>
+
+      <day>
+	<name>9</name>
+	<event>
+	  <title>FreeBSD 5.1-RELEASE est maintenant disponible</title>
+
+          <p><a href="$base/releases/5.1R/announce.html">FreeBSD
+	    5.1-RELEASE</a> est sorti. Veuillez consulter la page <a
+	    href="$base/releases/index.html">d'information sur les versions</a>
+	    pour plus de d&#233;tails. Consultez &#233;galement <a
+	    href="$base/releases/5.1R/errata.html">l'errata</a>
+	    pour conna&#238;tre les derni&#232;res informations et/ou 
+	    les probl&#232;mes de derni&#232;re minute concernant cette version 5.1.</p>
+	</event>
+      </day>
+
+      <day>
+        <name>6</name>
+          <event>
+            <p>Nouveau participant : <a
+                  href="mailto:osa@FreeBSD.org">Sergey A. Osokin</a>
+                  (Ports)</p>
+          </event>
+      </day>
+
+      <day>
+        <name>4</name>
+          <event>
+            <p>Nouveau participant : <a
+                  href="mailto:erwin@FreeBSD.org">Erwin Lansing</a>
+                  (Ports)</p>
+          </event>
+      </day>
+    </month>
+    
     <month>
       <name>Mai</name>