summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2002-02-09 01:38:23 +0000
committerbmah <bmah@FreeBSD.org>2002-02-09 01:38:23 +0000
commitac05f93787f37af1d52752519ead773452d7e617 (patch)
tree5a5f657700f14343c759123faf0eb0d2ded57795 /release
parent11fa082235d45b12b0c0fc87c95aa79439b480e7 (diff)
downloadFreeBSD-src-ac05f93787f37af1d52752519ead773452d7e617.zip
FreeBSD-src-ac05f93787f37af1d52752519ead773452d7e617.tar.gz
MFC noted: an(4) LEAP, Home key, and Linux utility support.
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 f49a6e9..ca3cb77 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 f49a6e9..ca3cb77 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>
OpenPOWER on IntegriCloud