aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorBruce A. Mah <bmah@FreeBSD.org>2002-11-20 17:17:11 +0000
committerBruce A. Mah <bmah@FreeBSD.org>2002-11-20 17:17:11 +0000
commite4ef47f1eeab1ff5bd34c1a0765d64dab5510428 (patch)
treee6ee0422483c8afe079fd844cc3541248795f6aa /release
parent2555374c4f0353e822d36f8800155782ec4ab984 (diff)
Notes
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml2
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml2
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 268e797dda681..758e5312af720 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 268e797dda681..758e5312af720 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>