From 47b563639b7f4bed4b456283056008297950b9b9 Mon Sep 17 00:00:00 2001
From: "Bruce A. Mah" <bmah@FreeBSD.org>
Date: Sat, 2 Apr 2005 23:28:42 +0000
Subject: [PATCH] MFC noted:  arcmsr(4).

---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml    | 2 +-
 release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index c5fe522b33a9..0a85b21840b8 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -563,7 +563,7 @@
       <para arch="i386,ia64">The &man.arcmsr.4; driver has been added.
 	It supports the Areca ARC-11<replaceable>xx</replaceable> and
 	ARC-12<replaceable>xx</replaceable> series of SATA RAID
-	controllers.</para>
+	controllers.  &merged;</para>
 
       <para>The SHSEC GEOM class has been added.  It provides for the
 	sharing of a secret between multiple GEOM providers.  All of
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index c5fe522b33a9..0a85b21840b8 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -563,7 +563,7 @@
       <para arch="i386,ia64">The &man.arcmsr.4; driver has been added.
 	It supports the Areca ARC-11<replaceable>xx</replaceable> and
 	ARC-12<replaceable>xx</replaceable> series of SATA RAID
-	controllers.</para>
+	controllers.  &merged;</para>
 
       <para>The SHSEC GEOM class has been added.  It provides for the
 	sharing of a secret between multiple GEOM providers.  All of