8 files changed, 99 insertions, 5 deletions

diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index 5235214efd03..a98b3ecee220 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -895,6 +895,26 @@
       </itemizedlist>
     </para>
 
+    <para>National Semiconductor DP83820 and DP83821 Gigabit Ethernet
+    NICs (&man.nge.4 driver)
+      <itemizedlist>
+        <listitem>
+	  <para>Addtron AEG320T</para>
+        </listitem>
+        <listitem>
+	  <para>Asante FriendlyNet GigaNIC 1000TA and 1000TPC</para>
+        </listitem>
+        <listitem>
+	  <para>D-Link DGE-500T</para>
+        </listitem>
+        <listitem>
+	  <para>SMC EZ Card 1000 (SMC9462TX)</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
+    
+
     <para>Sundance Technologies ST201 PCI Fast Ethernet NICs
     (&man.ste.4; driver)
       <itemizedlist>
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 5235214efd03..a98b3ecee220 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -895,6 +895,26 @@
       </itemizedlist>
     </para>
 
+    <para>National Semiconductor DP83820 and DP83821 Gigabit Ethernet
+    NICs (&man.nge.4 driver)
+      <itemizedlist>
+        <listitem>
+	  <para>Addtron AEG320T</para>
+        </listitem>
+        <listitem>
+	  <para>Asante FriendlyNet GigaNIC 1000TA and 1000TPC</para>
+        </listitem>
+        <listitem>
+	  <para>D-Link DGE-500T</para>
+        </listitem>
+        <listitem>
+	  <para>SMC EZ Card 1000 (SMC9462TX)</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
+    
+
     <para>Sundance Technologies ST201 PCI Fast Ethernet NICs
     (&man.ste.4; driver)
       <itemizedlist>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index d658063430e3..e74e91d05b1b 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -286,6 +286,13 @@
       <para>The &man.wx.4; driver now supports the Intel PRO1000-F and
       PRO1000-T (10/100/1000) adapters. &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
+      D-Link DGE-500T, SMC EZ Card 1000 (SMC9462TX), Asante
+      FriendlyNet GigaNIC 1000TA and 1000TPC and Addtron
+      AEG320T.</para>
+
     </sect3>
 
     <sect3>
@@ -797,7 +804,7 @@
     of an interface. &merged;</para>
 
     <para>&man.ifconfig.8; can now accept addresses in slash/CIDR
-    notation.</para>
+    notation. &merged;</para>
 
     <para>&man.setproctitle.3; has been moved from
     <filename>libutil</filename> to
@@ -1217,6 +1224,9 @@
     <para>Ukranian language support has been added to the &os;
     console.</para>
 
+    <para>The performance of the ELF dynamic linker &man.rtld.1; has
+    been improved. &merged;</para>
+
     <sect3>
       <title>Contributed Software</title>
 
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 d658063430e3..e74e91d05b1b 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -286,6 +286,13 @@
       <para>The &man.wx.4; driver now supports the Intel PRO1000-F and
       PRO1000-T (10/100/1000) adapters. &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
+      D-Link DGE-500T, SMC EZ Card 1000 (SMC9462TX), Asante
+      FriendlyNet GigaNIC 1000TA and 1000TPC and Addtron
+      AEG320T.</para>
+
     </sect3>
 
     <sect3>
@@ -797,7 +804,7 @@
     of an interface. &merged;</para>
 
     <para>&man.ifconfig.8; can now accept addresses in slash/CIDR
-    notation.</para>
+    notation. &merged;</para>
 
     <para>&man.setproctitle.3; has been moved from
     <filename>libutil</filename> to
@@ -1217,6 +1224,9 @@
     <para>Ukranian language support has been added to the &os;
     console.</para>
 
+    <para>The performance of the ELF dynamic linker &man.rtld.1; has
+    been improved. &merged;</para>
+
     <sect3>
       <title>Contributed Software</title>
 
diff --git a/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml
index 5235214efd03..a98b3ecee220 100644
--- a/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml
@@ -895,6 +895,26 @@
       </itemizedlist>
     </para>
 
+    <para>National Semiconductor DP83820 and DP83821 Gigabit Ethernet
+    NICs (&man.nge.4 driver)
+      <itemizedlist>
+        <listitem>
+	  <para>Addtron AEG320T</para>
+        </listitem>
+        <listitem>
+	  <para>Asante FriendlyNet GigaNIC 1000TA and 1000TPC</para>
+        </listitem>
+        <listitem>
+	  <para>D-Link DGE-500T</para>
+        </listitem>
+        <listitem>
+	  <para>SMC EZ Card 1000 (SMC9462TX)</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
+    
+
     <para>Sundance Technologies ST201 PCI Fast Ethernet NICs
     (&man.ste.4; driver)
       <itemizedlist>
diff --git a/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
index d658063430e3..e74e91d05b1b 100644
--- a/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
@@ -286,6 +286,13 @@
       <para>The &man.wx.4; driver now supports the Intel PRO1000-F and
       PRO1000-T (10/100/1000) adapters. &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
+      D-Link DGE-500T, SMC EZ Card 1000 (SMC9462TX), Asante
+      FriendlyNet GigaNIC 1000TA and 1000TPC and Addtron
+      AEG320T.</para>
+
     </sect3>
 
     <sect3>
@@ -797,7 +804,7 @@
     of an interface. &merged;</para>
 
     <para>&man.ifconfig.8; can now accept addresses in slash/CIDR
-    notation.</para>
+    notation. &merged;</para>
 
     <para>&man.setproctitle.3; has been moved from
     <filename>libutil</filename> to
@@ -1217,6 +1224,9 @@
     <para>Ukranian language support has been added to the &os;
     console.</para>
 
+    <para>The performance of the ELF dynamic linker &man.rtld.1; has
+    been improved. &merged;</para>
+
     <sect3>
       <title>Contributed Software</title>
 
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index c59edacbeeb5..264a81f7149b 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -659,7 +659,7 @@ libreadline has been upgraded to 4.2.
 The ifconfig(8) command can set the link-layer address of an interface.
 [MERGED]
 
-ifconfig(8) can now accept addresses in slash/CIDR notation.
+ifconfig(8) can now accept addresses in slash/CIDR notation. [MERGED]
 
 setproctitle(3) has been moved from libutil to libc. [MERGED]
 
@@ -1102,6 +1102,8 @@ fixes.
 
 Ukranian language support has been added to the FreeBSD console.
 
+The performance of the ELF dynamic linker has been improved. [MERGED]
+
 
 2. Supported Configurations
 ---------------------------
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 0b247a9a7892..b590bdfe7b92 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -759,7 +759,7 @@ libreadline has been upgraded to 4.2.
 The ifconfig(8) command can set the link-layer address of an interface.
 [MERGED]
 
-ifconfig(8) can now accept addresses in slash/CIDR notation.
+ifconfig(8) can now accept addresses in slash/CIDR notation. [MERGED]
 
 setproctitle(3) has been moved from libutil to libc. [MERGED]
 
@@ -1197,6 +1197,8 @@ fixes.
 
 Ukranian language support has been added to the FreeBSD console.
 
+The performance of the ELF dynamic linker has been improved. [MERGED]
+
 
 2. Supported Configurations
 ---------------------------