diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index f0b433a6bc2b..c537f0e4e499 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -85,6 +85,12 @@
ServerWorks ROSB4 ATA33
+
+ SiS 530, 540, 620
+
+
+ SiS 630, 633, 635, 730, 733, 735
+
SiS 5591
@@ -1622,7 +1628,7 @@
Gigabit Ethernet NICs based on the Intel 82542 and 82543
- controller chips (&man.gx.4; driver)
+ controller chips (&man.gx.4; and &man.em.4; drivers)
Intel PRO/1000 Gigabit Ethernet
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index f0b433a6bc2b..c537f0e4e499 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -85,6 +85,12 @@
ServerWorks ROSB4 ATA33
+
+ SiS 530, 540, 620
+
+
+ SiS 630, 633, 635, 730, 733, 735
+
SiS 5591
@@ -1622,7 +1628,7 @@
Gigabit Ethernet NICs based on the Intel 82542 and 82543
- controller chips (&man.gx.4; driver)
+ controller chips (&man.gx.4; and &man.em.4; drivers)
Intel PRO/1000 Gigabit Ethernet
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 7f7c7254013a..163b3f4b601c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -471,6 +471,12 @@
The &man.el.4; driver can now be loaded as a
module.
+ The &man.em.4; driver has been added to
+ 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.
+
The &man.faith.4; device is now loadable, unloadable, and
clonable.
@@ -586,6 +592,18 @@
protocol or routing) can be performed on these devices. The
SIOCGIFCONF ioctl may be performed on the
special /dev/network node.
+
+ Selected network drivers now implement a
+ semi-polling mode, which makes systems much more resilient to
+ attacks and overloads. To enable polling, the following options
+ are required in a kernel configuration file:
+
+ options DEVICE_POLLING
+options HZ=1000 # not compulsory but strongly recommended
+
+ The kern.polling.enable sysctl variable will
+ then activate polling mode. The devices initially supporting
+ polling are &man.dc.4;, &man.fxp.4;, and &man.sis.4;. &merged;
@@ -768,6 +786,9 @@
pseudo
RAID controllers as the Promise Fasttrak and
HighPoint HPT370 controllers. &merged;
+ The &man.ata.4; driver now supports a wider variety of SiS
+ chipsets, as listed in the Hardware Notes.
+
The BurnProof(TM) feature, for applicable ATAPI CD-ROM burners, is now
supported. &merged;
@@ -1320,6 +1341,12 @@
A security hole in the form of a buffer overflow in the
&man.semop.2; system call has been closed. &merged;
+
+ A security hole in OpenSSH,
+ involving the UseLogin yes setting, has been
+ closed (note that the default for this setting is
+ UseLogin no). &merged;
+
Userland Changes
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 7f7c7254013a..163b3f4b601c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -471,6 +471,12 @@
The &man.el.4; driver can now be loaded as a
module.
+ The &man.em.4; driver has been added to
+ 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.
+
The &man.faith.4; device is now loadable, unloadable, and
clonable.
@@ -586,6 +592,18 @@
protocol or routing) can be performed on these devices. The
SIOCGIFCONF ioctl may be performed on the
special /dev/network node.
+
+ Selected network drivers now implement a
+ semi-polling mode, which makes systems much more resilient to
+ attacks and overloads. To enable polling, the following options
+ are required in a kernel configuration file:
+
+ options DEVICE_POLLING
+options HZ=1000 # not compulsory but strongly recommended
+
+ The kern.polling.enable sysctl variable will
+ then activate polling mode. The devices initially supporting
+ polling are &man.dc.4;, &man.fxp.4;, and &man.sis.4;. &merged;
@@ -768,6 +786,9 @@
pseudo
RAID controllers as the Promise Fasttrak and
HighPoint HPT370 controllers. &merged;
+ The &man.ata.4; driver now supports a wider variety of SiS
+ chipsets, as listed in the Hardware Notes.
+
The BurnProof(TM) feature, for applicable ATAPI CD-ROM burners, is now
supported. &merged;
@@ -1320,6 +1341,12 @@
A security hole in the form of a buffer overflow in the
&man.semop.2; system call has been closed. &merged;
+
+ A security hole in OpenSSH,
+ involving the UseLogin yes setting, has been
+ closed (note that the default for this setting is
+ UseLogin no). &merged;
+
Userland Changes