summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml7
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml7
2 files changed, 12 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 0ca3a23..788c90f 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -148,6 +148,7 @@
<para arch="i386">The &man.safe.4; driver has been added
to support SafeNet 1141, 1741-based crypto accelerators.
+ &merged;
<note>
<para>The public key support is not implemented.</para>
@@ -170,6 +171,9 @@
support for 802.11a/b/g devices based on the AR5210, AR5211,
and AR5212 chips.</para>
+ <para>&man.bge.4; now supports Broadcom 5705 based Gigabit Ethernet NICs.
+ &merged;</para>
+
<para>A bug in the &man.bge.4; driver that prevented it from
working correctly at 10 Mbps has been fixed.</para>
@@ -323,7 +327,8 @@
the <filename>/stand</filename> directory installed by
&man.sysinstall.8;, but it <filename>/rescue</filename> includes
more functionality and is updated by as part of
- buildworld/installworld operations.
+ buildworld/installworld operations. More details can be found in
+ &man.rescue.7;.
<note>
<para>Due to some cross-build interactions,
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 0ca3a23..788c90f 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -148,6 +148,7 @@
<para arch="i386">The &man.safe.4; driver has been added
to support SafeNet 1141, 1741-based crypto accelerators.
+ &merged;
<note>
<para>The public key support is not implemented.</para>
@@ -170,6 +171,9 @@
support for 802.11a/b/g devices based on the AR5210, AR5211,
and AR5212 chips.</para>
+ <para>&man.bge.4; now supports Broadcom 5705 based Gigabit Ethernet NICs.
+ &merged;</para>
+
<para>A bug in the &man.bge.4; driver that prevented it from
working correctly at 10 Mbps has been fixed.</para>
@@ -323,7 +327,8 @@
the <filename>/stand</filename> directory installed by
&man.sysinstall.8;, but it <filename>/rescue</filename> includes
more functionality and is updated by as part of
- buildworld/installworld operations.
+ buildworld/installworld operations. More details can be found in
+ &man.rescue.7;.
<note>
<para>Due to some cross-build interactions,
OpenPOWER on IntegriCloud