diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 6249c4343ede..e6923825c609 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -490,10 +490,10 @@
support NICs based on the Intel 82542, 82543, and 82544 Gigabit
Ethernet controller chips. The driver supports transmit/receive
checksum offload and jumbo frames on 82543 and 82544-based
- adapters.
+ adapters. &merged;
The &man.faith.4; device is now loadable, unloadable, and
- clonable.
+ clonable. &merged;
Support for Fujitsu MB86960A/MB86965A based Ethernet
PC-Cards has been added back in the &man.fe.4; driver. &merged;
@@ -558,8 +558,8 @@
Added support for PCI Ethernet adapters based on the
National Semiconductor DP83815 chipset, including the NetGear
- FA311-TX and FA312-TX, in the form of the &man.sis.4; driver. &merged;
- This device has support for VLANs.
+ FA311-TX and FA312-TX, in the form of the &man.sis.4; driver.
+ This device has support for VLANs. &merged;
The snc driver for the National Semiconductor
DP8393X (SONIC) Ethernet controller has been added. Currently,
@@ -597,11 +597,11 @@
The per-interface ifnet structure now
has the ability to indicate a set of capabilities supported by a
network interface, and which ones are enabled. &man.ifconfig.8;
- has support for querying these capabilities.
+ has support for querying these capabilities. &merged;
Performance with hosts having a large number of IP aliases
has been improved, by replacing the per-interface
- if_inaddr linear list with a hash table.
+ if_inaddr linear list with a hash table. &merged;
Network devices now automatically appear as special files in
/dev/net. Interface hardware ioctls (not
@@ -740,7 +740,7 @@
the connection as usual. This so-called
syncache
makes a host much more resistant to
TCP-based Denial of Service attacks. Work on this feature was
- sponsored by DARPA and NAI Labs.
+ sponsored by DARPA and NAI Labs. &merged;
A bug in the TCP implementation, which could cause
connections to stall if a sender saw a zero-sized window, has
@@ -948,6 +948,15 @@
The virtual memory subsystem now backs UFS directory
memory requirements by default (this behavior is controlled via
the vfs.vmiodirenable sysctl variable. &merged;
+
+ A bug that prevented the root filesystem from being
+ mounted from a SCSI CDROM has been fixed (ATAPI CDROMs were
+ always supported). &merged;
+
+ A number of bugs in the filesystem code, discovered
+ through the use of a filesystem test tool, have been fixed.
+ Under certain circumstances (primarily related to use of NFS),
+ these bugs could cause data corruption or kernel panics.
@@ -1865,7 +1874,7 @@
by &man.newfs.8; are now 16384 and 2048 bytes, respectively (the
old defaults were 8192 and 1024 bytes). This change generally
provides increased performance, at the expense of some wasted disk
- space.
+ space. &merged;
&man.newsyslog.8; now has the ability to ability to compress
log files using &man.bzip2.1;. &merged;
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 6249c4343ede..e6923825c609 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -490,10 +490,10 @@
support NICs based on the Intel 82542, 82543, and 82544 Gigabit
Ethernet controller chips. The driver supports transmit/receive
checksum offload and jumbo frames on 82543 and 82544-based
- adapters.
+ adapters. &merged;
The &man.faith.4; device is now loadable, unloadable, and
- clonable.
+ clonable. &merged;
Support for Fujitsu MB86960A/MB86965A based Ethernet
PC-Cards has been added back in the &man.fe.4; driver. &merged;
@@ -558,8 +558,8 @@
Added support for PCI Ethernet adapters based on the
National Semiconductor DP83815 chipset, including the NetGear
- FA311-TX and FA312-TX, in the form of the &man.sis.4; driver. &merged;
- This device has support for VLANs.
+ FA311-TX and FA312-TX, in the form of the &man.sis.4; driver.
+ This device has support for VLANs. &merged;
The snc driver for the National Semiconductor
DP8393X (SONIC) Ethernet controller has been added. Currently,
@@ -597,11 +597,11 @@
The per-interface ifnet structure now
has the ability to indicate a set of capabilities supported by a
network interface, and which ones are enabled. &man.ifconfig.8;
- has support for querying these capabilities.
+ has support for querying these capabilities. &merged;
Performance with hosts having a large number of IP aliases
has been improved, by replacing the per-interface
- if_inaddr linear list with a hash table.
+ if_inaddr linear list with a hash table. &merged;
Network devices now automatically appear as special files in
/dev/net. Interface hardware ioctls (not
@@ -740,7 +740,7 @@
the connection as usual. This so-called
syncache
makes a host much more resistant to
TCP-based Denial of Service attacks. Work on this feature was
- sponsored by DARPA and NAI Labs.
+ sponsored by DARPA and NAI Labs. &merged;
A bug in the TCP implementation, which could cause
connections to stall if a sender saw a zero-sized window, has
@@ -948,6 +948,15 @@
The virtual memory subsystem now backs UFS directory
memory requirements by default (this behavior is controlled via
the vfs.vmiodirenable sysctl variable. &merged;
+
+ A bug that prevented the root filesystem from being
+ mounted from a SCSI CDROM has been fixed (ATAPI CDROMs were
+ always supported). &merged;
+
+ A number of bugs in the filesystem code, discovered
+ through the use of a filesystem test tool, have been fixed.
+ Under certain circumstances (primarily related to use of NFS),
+ these bugs could cause data corruption or kernel panics.
@@ -1865,7 +1874,7 @@
by &man.newfs.8; are now 16384 and 2048 bytes, respectively (the
old defaults were 8192 and 1024 bytes). This change generally
provides increased performance, at the expense of some wasted disk
- space.
+ space. &merged;
&man.newsyslog.8; now has the ability to ability to compress
log files using &man.bzip2.1;. &merged;