diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 385a52caeb4..90a34019b13 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -350,7 +350,7 @@
       modems, serial devices, and other programs that need to look
       like a tty.  The related &man.uplcom.4; and &man.uvscom.4; drivers provide specific
       support for the Prolific PL-2303 serial adapter and the SUNTAC
-      Slipper U VS-10U, respectively.</para>
+      Slipper U VS-10U, respectively. &merged;</para>
 
     <para>To increase security, the <literal>UCONSOLE</literal> kernel
       configuration option has been removed.</para>
@@ -365,7 +365,7 @@
       activated by default.</para>
 
     <para>The uvisor driver for connecting Handspring Visors via USB
-      has been added.</para>
+      has been added. &merged;</para>
 
     <para>A VESA S3 linear framebuffer driver has been added.</para>
 
@@ -948,12 +948,13 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para role="historic">&man.ipfw.4; now filters correctly in the presence of ECN
 	bits in TCP segments. &merged;</para>
 
-      <para>&man.ipfw.4 has been re-implemented.  It now uses
+      <para>&man.ipfw.4 has been re-implemented (the new version is
+        commonly referred to as <quote>IPFW2</quote>).  It now uses
         variable-sized representation of rules in the kernel, similar
         to &man.bpf.4; instructions.  Most of the externally-visible
         behavior (i.e. through &man.ipfw.8;) should be unchanged.,
         although &man.ipfw.8; now supports <literal>or</literal>
-        connectives between match fields.</para>
+        connectives between match fields. &merged;</para>
 
       <para role="historic">A new ng_eiface netgraph module has been added, which
 	appears as an Ethernet interface but delivers its Ethernet
@@ -1164,6 +1165,14 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	corruption problems on systems using the VIA 82C686B
 	Southbridge chip. &merged;</para>
 
+      <para>The &man.ata.4; driver (along with &man.burncd.8;) now
+        supports writing to media in DVD+RW drives.</para>
+
+      <para>The &man.ata.4; driver now supports accessing ATA devices
+        as SCSI devices via the CAM layer.  This feature requires
+        <literal>device atapicam</literal> in the kernel
+        configuration.</para>
+
       <para role="historic">The &man.cd.4; driver now has support for write
 	operations.  This allows writing to DVD-RAM, PD and similar
 	drives that probe as CD devices.  Note that change affects
@@ -3609,7 +3618,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	<application>xinetd</application>.</para>
 
       <para><application>texinfo</application> has been updated to
-	4.2.</para>
+	4.2. &merged;</para>
 
       <para><application>top</application> has been updated to version
 	3.5b12.</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 385a52caeb4..90a34019b13 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -350,7 +350,7 @@
       modems, serial devices, and other programs that need to look
       like a tty.  The related &man.uplcom.4; and &man.uvscom.4; drivers provide specific
       support for the Prolific PL-2303 serial adapter and the SUNTAC
-      Slipper U VS-10U, respectively.</para>
+      Slipper U VS-10U, respectively. &merged;</para>
 
     <para>To increase security, the <literal>UCONSOLE</literal> kernel
       configuration option has been removed.</para>
@@ -365,7 +365,7 @@
       activated by default.</para>
 
     <para>The uvisor driver for connecting Handspring Visors via USB
-      has been added.</para>
+      has been added. &merged;</para>
 
     <para>A VESA S3 linear framebuffer driver has been added.</para>
 
@@ -948,12 +948,13 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para role="historic">&man.ipfw.4; now filters correctly in the presence of ECN
 	bits in TCP segments. &merged;</para>
 
-      <para>&man.ipfw.4 has been re-implemented.  It now uses
+      <para>&man.ipfw.4 has been re-implemented (the new version is
+        commonly referred to as <quote>IPFW2</quote>).  It now uses
         variable-sized representation of rules in the kernel, similar
         to &man.bpf.4; instructions.  Most of the externally-visible
         behavior (i.e. through &man.ipfw.8;) should be unchanged.,
         although &man.ipfw.8; now supports <literal>or</literal>
-        connectives between match fields.</para>
+        connectives between match fields. &merged;</para>
 
       <para role="historic">A new ng_eiface netgraph module has been added, which
 	appears as an Ethernet interface but delivers its Ethernet
@@ -1164,6 +1165,14 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	corruption problems on systems using the VIA 82C686B
 	Southbridge chip. &merged;</para>
 
+      <para>The &man.ata.4; driver (along with &man.burncd.8;) now
+        supports writing to media in DVD+RW drives.</para>
+
+      <para>The &man.ata.4; driver now supports accessing ATA devices
+        as SCSI devices via the CAM layer.  This feature requires
+        <literal>device atapicam</literal> in the kernel
+        configuration.</para>
+
       <para role="historic">The &man.cd.4; driver now has support for write
 	operations.  This allows writing to DVD-RAM, PD and similar
 	drives that probe as CD devices.  Note that change affects
@@ -3609,7 +3618,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	<application>xinetd</application>.</para>
 
       <para><application>texinfo</application> has been updated to
-	4.2.</para>
+	4.2. &merged;</para>
 
       <para><application>top</application> has been updated to version
 	3.5b12.</para>