summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbrueffer <brueffer@FreeBSD.org>2006-07-31 16:49:25 +0000
committerbrueffer <brueffer@FreeBSD.org>2006-07-31 16:49:25 +0000
commitc5930e848f14c60ef7e3c14394213b9a26561728 (patch)
tree4db9aa9bd97e74286cb41507353bc73087ac74b9 /release
parent9e8f7c8846f79d49f8b249dd09c56c01cbf6f218 (diff)
downloadFreeBSD-src-c5930e848f14c60ef7e3c14394213b9a26561728.zip
FreeBSD-src-c5930e848f14c60ef7e3c14394213b9a26561728.tar.gz
Mark two more items as merged.
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml4
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml4
2 files changed, 4 insertions, 4 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index ed8c586..65285b4 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -618,7 +618,7 @@
<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
- <para>The &man.my.4; driver now supports &man.altq.4;.</para>
+ <para>The &man.my.4; driver now supports &man.altq.4;. &merged;</para>
<para arch="i386,amd64">The &man.mxge.4; driver,
which supports Myricom Myri10GE 10 Gigabit Ethernet
@@ -641,7 +641,7 @@
<para>The &man.sk.4; driver is now MPSAFE. &merged;</para>
- <para>The &man.ste.4; driver is now MPSAFE.</para>
+ <para>The &man.ste.4; driver is now MPSAFE. &merged;</para>
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was
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 ed8c586..65285b4 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -618,7 +618,7 @@
<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
- <para>The &man.my.4; driver now supports &man.altq.4;.</para>
+ <para>The &man.my.4; driver now supports &man.altq.4;. &merged;</para>
<para arch="i386,amd64">The &man.mxge.4; driver,
which supports Myricom Myri10GE 10 Gigabit Ethernet
@@ -641,7 +641,7 @@
<para>The &man.sk.4; driver is now MPSAFE. &merged;</para>
- <para>The &man.ste.4; driver is now MPSAFE.</para>
+ <para>The &man.ste.4; driver is now MPSAFE. &merged;</para>
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was
OpenPOWER on IntegriCloud