summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 f49a6e9f72df..ca3cb777750c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -493,7 +493,7 @@
<para>The &man.an.4; driver now supports Cisco LEAP, as well as
the <quote>Home</quote> WEP key. The Linux Aironet
- utilities are now supported under emulation.</para>
+ utilities are now supported under emulation. &merged;</para>
<para arch="i386">Generic support for ARCNET token-based
networks has been added.</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 f49a6e9f72df..ca3cb777750c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -493,7 +493,7 @@
<para>The &man.an.4; driver now supports Cisco LEAP, as well as
the <quote>Home</quote> WEP key. The Linux Aironet
- utilities are now supported under emulation.</para>
+ utilities are now supported under emulation. &merged;</para>
<para arch="i386">Generic support for ARCNET token-based
networks has been added.</para>