From 14df0b73d6274a88363389b852f5ad951ec5b951 Mon Sep 17 00:00:00 2001
From: bmah <bmah@FreeBSD.org>
Date: Wed, 20 Nov 2002 17:17:11 +0000
Subject: [PATCH] MFC noted:  trm driver.

Approved by:	re (implicitly)
---
 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 268e797dda68..758e5312af72 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1421,7 +1421,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	<varname>kern.cam.scsi_delay</varname> tunable/sysctl.</para>
 
       <para>The trm driver has been added to support SCSI adapters
-        using the Tekram TRM-S1040 SCSI chipset.</para>
+        using the Tekram TRM-S1040 SCSI chipset. &merged;</para>
 
       <para arch="i386" role="historic">The &man.twe.4; 3ware ATA RAID driver has
 	added. &merged;</para>
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 268e797dda68..758e5312af72 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1421,7 +1421,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	<varname>kern.cam.scsi_delay</varname> tunable/sysctl.</para>
 
       <para>The trm driver has been added to support SCSI adapters
-        using the Tekram TRM-S1040 SCSI chipset.</para>
+        using the Tekram TRM-S1040 SCSI chipset. &merged;</para>
 
       <para arch="i386" role="historic">The &man.twe.4; 3ware ATA RAID driver has
 	added. &merged;</para>