summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2001-07-04 05:34:20 +0000
committerbmah <bmah@FreeBSD.org>2001-07-04 05:34:20 +0000
commitc51c7305acaa15a47171633f8da1681ca8a7e5d2 (patch)
tree2f90847c65bea35de0c9049e54814d7733b66d55
parentcf247593d5f1503da087ddc5ff6a02e88977b738 (diff)
downloadFreeBSD-src-c51c7305acaa15a47171633f8da1681ca8a7e5d2.zip
FreeBSD-src-c51c7305acaa15a47171633f8da1681ca8a7e5d2.tar.gz
MFCs noted: ALS4000 driver, ifconfig(8) support for IEEE 802.11
devices, traceroute(8) default TTL from sysctl MIB.
-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, 8 insertions, 6 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 7bc0e56..7574dd5 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -630,7 +630,8 @@
CS4281 sound chip has been added. A driver for the S3
Sonicvobes chipset has been added. &merged;</para>
- <para arch="i386">A driver for the Advance Logic ALS4000 has been added.</para>
+ <para arch="i386">A driver for the Advance Logic ALS4000 has
+ been added. &merged;</para>
<para arch="i386">A driver for the
ESS Maestro-3/Allegro has been added, however due to licensing
@@ -946,7 +947,7 @@
<para>&man.ifconfig.8; now has support for setting parameters for
IEEE 802.11 wireless network devices. &man.wi.4; and
&man.an.4; devices are supported, and partial support is provided
- for awi devices.</para>
+ for &man.awi.4; devices. &merged;</para>
<para>&man.ifconfig.8; no longer displays the list of supported
media by default. Instead it displays it when the
@@ -1646,7 +1647,7 @@
<para>&man.traceroute.8; now takes its default maximum TTL value
from the <varname>net.inet.ip.ttl</varname> sysctl
- variable.</para>
+ variable. &merged;</para>
<sect4>
<title>OpenSSH</title>
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 7bc0e56..7574dd5 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -630,7 +630,8 @@
CS4281 sound chip has been added. A driver for the S3
Sonicvobes chipset has been added. &merged;</para>
- <para arch="i386">A driver for the Advance Logic ALS4000 has been added.</para>
+ <para arch="i386">A driver for the Advance Logic ALS4000 has
+ been added. &merged;</para>
<para arch="i386">A driver for the
ESS Maestro-3/Allegro has been added, however due to licensing
@@ -946,7 +947,7 @@
<para>&man.ifconfig.8; now has support for setting parameters for
IEEE 802.11 wireless network devices. &man.wi.4; and
&man.an.4; devices are supported, and partial support is provided
- for awi devices.</para>
+ for &man.awi.4; devices. &merged;</para>
<para>&man.ifconfig.8; no longer displays the list of supported
media by default. Instead it displays it when the
@@ -1646,7 +1647,7 @@
<para>&man.traceroute.8; now takes its default maximum TTL value
from the <varname>net.inet.ip.ttl</varname> sysctl
- variable.</para>
+ variable. &merged;</para>
<sect4>
<title>OpenSSH</title>
OpenPOWER on IntegriCloud