diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index ebd42922305..aa57229b43e 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -139,7 +139,9 @@
Hardware Support
-
+ Support for the PadLock Security Co-processor in VIA C3
+ processors has been added to the &man.crypto.9; subsystem.
+ &merged;
Multimedia Support
@@ -150,7 +152,22 @@
Network Interface Support
-
+ The &man.dc.4; driver has been marked MPSAFE. &merged;
+
+ The &man.de.4; driver has been converted to the &man.bus.dma.9;
+ API and marked MPSAFE.
+
+ The &man.ed.4; driver has been marked MPSAFE.
+
+ The &man.el.4; driver has been removed.
+
+ The &man.my.4; driver has been marked MPSAFE. &merged;
+
+ The &man.pcn.4; driver has been marked MPSAFE. &merged;
+
+ The &man.sf.4; driver has been marked MPSAFE. &merged;
+
+ The &man.ste.4; driver has been marked MPSAFE.
@@ -169,6 +186,11 @@
status reporting, and sysctl variables for volume
re-synchronization rate, volume member write cache status,
and volume transaction queue depth.
+
+ A new GEOM-based disk encryption facility, GEOM_ELI, has been
+ added. It uses the &man.crypto.9; framework for hardware acceleration
+ and supports different cryptographic algorithms. See &man.geli.8; for
+ more information. &merged;
@@ -197,7 +219,7 @@
in tracking kernel memory statistics. It provides an
abstracted interface to &man.uma.9; and &man.malloc.9;
statistics, wrapped around the binary stream sysctl variables
- for the allocators.
+ for the allocators. &merged;
/etc/rc.d Scripts
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 ebd42922305..aa57229b43e 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -139,7 +139,9 @@
Hardware Support
-
+ Support for the PadLock Security Co-processor in VIA C3
+ processors has been added to the &man.crypto.9; subsystem.
+ &merged;
Multimedia Support
@@ -150,7 +152,22 @@
Network Interface Support
-
+ The &man.dc.4; driver has been marked MPSAFE. &merged;
+
+ The &man.de.4; driver has been converted to the &man.bus.dma.9;
+ API and marked MPSAFE.
+
+ The &man.ed.4; driver has been marked MPSAFE.
+
+ The &man.el.4; driver has been removed.
+
+ The &man.my.4; driver has been marked MPSAFE. &merged;
+
+ The &man.pcn.4; driver has been marked MPSAFE. &merged;
+
+ The &man.sf.4; driver has been marked MPSAFE. &merged;
+
+ The &man.ste.4; driver has been marked MPSAFE.
@@ -169,6 +186,11 @@
status reporting, and sysctl variables for volume
re-synchronization rate, volume member write cache status,
and volume transaction queue depth.
+
+ A new GEOM-based disk encryption facility, GEOM_ELI, has been
+ added. It uses the &man.crypto.9; framework for hardware acceleration
+ and supports different cryptographic algorithms. See &man.geli.8; for
+ more information. &merged;
@@ -197,7 +219,7 @@
in tracking kernel memory statistics. It provides an
abstracted interface to &man.uma.9; and &man.malloc.9;
statistics, wrapped around the binary stream sysctl variables
- for the allocators.
+ for the allocators. &merged;
/etc/rc.d Scripts