summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authordd <dd@FreeBSD.org>2001-07-30 18:26:53 +0000
committerdd <dd@FreeBSD.org>2001-07-30 18:26:53 +0000
commite48e9e85c370ae01275e3a3f9ea2d466844937f5 (patch)
tree1de42901fabca4d6c1cff425e7ca857d1d4eb585 /release
parent4b62071a699622d4df29fe1329fbf1b75f105d94 (diff)
downloadFreeBSD-src-e48e9e85c370ae01275e3a3f9ea2d466844937f5.zip
FreeBSD-src-e48e9e85c370ae01275e3a3f9ea2d466844937f5.tar.gz
Note import of BIND 8.2.4-REL and the MFC of txp(4)
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml5
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml5
2 files changed, 8 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 cd2a43b..a9aef70 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -385,7 +385,7 @@
series of adaptors.</para>
<para>The &man.txp.4; driver has been added to support NICs
- based on the 3Com 3XP Typhoon/Sidewinder (3CR990) chipset.</para>
+ based on the 3Com 3XP Typhoon/Sidewinder (3CR990) chipset. &merged;</para>
</sect3>
<sect3>
@@ -1692,6 +1692,9 @@
to operate in a more consistent fashion for certain common
misconfigurations. &merged;</para>
+ <para><application>BIND</application> has been updated to
+ 8.2.4-REL.</para>
+
<para><application>Binutils</application> have been upgraded a
snapshot from 19 July 2001 on the 2.11 development branch.</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 cd2a43b..a9aef70 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -385,7 +385,7 @@
series of adaptors.</para>
<para>The &man.txp.4; driver has been added to support NICs
- based on the 3Com 3XP Typhoon/Sidewinder (3CR990) chipset.</para>
+ based on the 3Com 3XP Typhoon/Sidewinder (3CR990) chipset. &merged;</para>
</sect3>
<sect3>
@@ -1692,6 +1692,9 @@
to operate in a more consistent fashion for certain common
misconfigurations. &merged;</para>
+ <para><application>BIND</application> has been updated to
+ 8.2.4-REL.</para>
+
<para><application>Binutils</application> have been upgraded a
snapshot from 19 July 2001 on the 2.11 development branch.</para>
OpenPOWER on IntegriCloud