New release notes: my driver.

MFCs noted:  viapm(4), ng_etf(4) (fixed spelling), libstand splitfs.

4 files changed, 38 insertions, 8 deletions

diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index 3fa330f..4ffb0f4 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -1721,6 +1721,18 @@
 
     <para arch="sparc64">Sun GEM (Gigabit Ethernet) and ERI (Fast
     Ethernet) NICs (gem driver)</para>
+
+    <para arch="i386">Myson Ethernet NICs (my driver)
+      <itemizedlist>
+        <listitem>
+	  <para>Myson MTD80X Based Fast Ethernet Card</para>
+	</listitem>
+        <listitem>
+	  <para>Myson MTD89X Based Gigabit Ethernet Card</para>
+	</listitem>
+      </itemizedlist>
+    </para>
+
   </sect2>
 
   <sect2>
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 3fa330f..4ffb0f4 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -1721,6 +1721,18 @@
 
     <para arch="sparc64">Sun GEM (Gigabit Ethernet) and ERI (Fast
     Ethernet) NICs (gem driver)</para>
+
+    <para arch="i386">Myson Ethernet NICs (my driver)
+      <itemizedlist>
+        <listitem>
+	  <para>Myson MTD80X Based Fast Ethernet Card</para>
+	</listitem>
+        <listitem>
+	  <para>Myson MTD89X Based Gigabit Ethernet Card</para>
+	</listitem>
+      </itemizedlist>
+    </para>
+
   </sect2>
 
   <sect2>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index db60d5a..3a2c088 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -305,7 +305,7 @@
     <para>A VESA S3 linear framebuffer driver has been added.</para>
 
     <para arch="i386">The &man.viapm.4; driver for VIA SMBus
-      power management controllers has been added.</para>
+      power management controllers has been added. &merged;</para>
 
     <!-- Above this line, sort kernel changes by manpage/keyword-->
 
@@ -659,6 +659,9 @@
 	receive are supported, although hardware VLAN filtering is
 	not. &merged;</para>
 
+      <para>The my driver, which supports the Myson Fast Ethernet and
+	Gigabit Ethernet adapters, has been added. &merged;</para>
+
       <para>Added the &man.nge.4; driver, which supports PCI Gigabit
 	Ethernet adapters based on the National Semiconductor DP83820
 	and DP83821 Gigabit Ethernet controller chips, including the
@@ -825,9 +828,9 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para>&man.ipfw.4; now filters correctly in the presence of ECN
 	bits in TCP segments. &merged;</para>
 
-      <para>A new &man.ng.eth.4; netgraph node allows Ethernet type
+      <para>A new &man.ng.etf.4; netgraph node allows Ethernet type
 	packets to be filtered to different hooks depending on
-	ethertype.</para>
+	ethertype. &merged;</para>
 
       <para>The &man.ng.gif.4; and &man.ng.gif.demux.4; netgraph
 	nodes, for operating on &man.gif.4; devices, have been
@@ -2141,7 +2144,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 
     <para><filename>libstand</filename> now has support for loading
       large kernels and modules split across several physical
-      media.</para>
+      media. &merged;</para>
 
     <para>The default TCP port range used by
       <filename>libfetch</filename> for passive FTP retrievals has
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 db60d5a..3a2c088 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -305,7 +305,7 @@
     <para>A VESA S3 linear framebuffer driver has been added.</para>
 
     <para arch="i386">The &man.viapm.4; driver for VIA SMBus
-      power management controllers has been added.</para>
+      power management controllers has been added. &merged;</para>
 
     <!-- Above this line, sort kernel changes by manpage/keyword-->
 
@@ -659,6 +659,9 @@
 	receive are supported, although hardware VLAN filtering is
 	not. &merged;</para>
 
+      <para>The my driver, which supports the Myson Fast Ethernet and
+	Gigabit Ethernet adapters, has been added. &merged;</para>
+
       <para>Added the &man.nge.4; driver, which supports PCI Gigabit
 	Ethernet adapters based on the National Semiconductor DP83820
 	and DP83821 Gigabit Ethernet controller chips, including the
@@ -825,9 +828,9 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para>&man.ipfw.4; now filters correctly in the presence of ECN
 	bits in TCP segments. &merged;</para>
 
-      <para>A new &man.ng.eth.4; netgraph node allows Ethernet type
+      <para>A new &man.ng.etf.4; netgraph node allows Ethernet type
 	packets to be filtered to different hooks depending on
-	ethertype.</para>
+	ethertype. &merged;</para>
 
       <para>The &man.ng.gif.4; and &man.ng.gif.demux.4; netgraph
 	nodes, for operating on &man.gif.4; devices, have been
@@ -2141,7 +2144,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 
     <para><filename>libstand</filename> now has support for loading
       large kernels and modules split across several physical
-      media.</para>
+      media. &merged;</para>
 
     <para>The default TCP port range used by
       <filename>libfetch</filename> for passive FTP retrievals has