MFen

svn path=/head/; revision=91305

release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent

@@ -4,16 +4,12 @@
 
      $Id$
      $FreeBSD$
-     Original revision: 1.1.2.3
+     Original revision: 1.2
 -->
 <!-- Text constants which probably don't need to be changed.-->
 
-<!-- 
-  -CURRENT defines a merged entity, which we use to indicate when a
-  release notes item has been merged.  We remove it from any -STABLE
-  branch(es) because it's not used in this environment and leaving
-  the entity undefined helps us locate cut-n-paste errors.
--->
+<!-- The marker for MFCs. -->
+<!ENTITY merged "[MERGED]">
 
 <!-- Files to be included -->
 

release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml

@@ -4,7 +4,7 @@
 
      $Id$
      $FreeBSD$
-     Original revision: 1.1.2.3
+     Original revision: 1.3
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [