5 files changed, 40 insertions, 26 deletions

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 22195f3295ec..493a1535f1e6 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -50,14 +50,6 @@
 
     <para arch="i386">A driver for AGP hardware has been added. &merged;</para>
 
-    <para>SMP support has been largely reworked, incorporating code
-    from BSD/OS 5.0.  One of the main features of SMPng (<quote>SMP Next
-    Generation</quote>) is to allow more processes to run in kernel, without
-    the need for spin locks that can dramatically reduce the
-    efficiency of multiple processors.  Interrupt handlers now have
-    contexts associated with them that allow them to be blocked, which
-    reduces the need to lock out interrupts.</para>
-
     <para>The kernel and modules have been moved to the directory
     <filename>/boot/kernel</filename>, so they can be easily
     manipulated together.  The boot loader has been updated to make
@@ -176,6 +168,15 @@
     <sect3>
       <title>Processor/Motherboard Support</title>
 
+      <para>SMP support has been largely reworked, incorporating code
+      from BSD/OS 5.0.  One of the main features of SMPng (<quote>SMP
+      Next Generation</quote>) is to allow more processes to run in
+      kernel, without the need for spin locks that can dramatically
+      reduce the efficiency of multiple processors.  Interrupt
+      handlers now have contexts associated with them that allow them
+      to be blocked, which reduces the need to lock out
+      interrupts.</para>
+
       <para arch="i386">Support for the 80386 processor has been
       removed from the <filename>GENERIC</filename> kernel, as this
       code seriously pessimizes performance on other ia32
@@ -213,6 +214,9 @@
       (EV4 and EV5) to emulate instructions of the newer Alpha CPU 
       generations. This enables the use of binary-only programs like Adobe
       Acrobat 4 on EV4 and EV5.</para>
+
+      <para arch="alpha">SMP support for the alpha is now operational.</para>
+
     </sect3>
 
     <sect3>
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 22195f3295ec..493a1535f1e6 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -50,14 +50,6 @@
 
     <para arch="i386">A driver for AGP hardware has been added. &merged;</para>
 
-    <para>SMP support has been largely reworked, incorporating code
-    from BSD/OS 5.0.  One of the main features of SMPng (<quote>SMP Next
-    Generation</quote>) is to allow more processes to run in kernel, without
-    the need for spin locks that can dramatically reduce the
-    efficiency of multiple processors.  Interrupt handlers now have
-    contexts associated with them that allow them to be blocked, which
-    reduces the need to lock out interrupts.</para>
-
     <para>The kernel and modules have been moved to the directory
     <filename>/boot/kernel</filename>, so they can be easily
     manipulated together.  The boot loader has been updated to make
@@ -176,6 +168,15 @@
     <sect3>
       <title>Processor/Motherboard Support</title>
 
+      <para>SMP support has been largely reworked, incorporating code
+      from BSD/OS 5.0.  One of the main features of SMPng (<quote>SMP
+      Next Generation</quote>) is to allow more processes to run in
+      kernel, without the need for spin locks that can dramatically
+      reduce the efficiency of multiple processors.  Interrupt
+      handlers now have contexts associated with them that allow them
+      to be blocked, which reduces the need to lock out
+      interrupts.</para>
+
       <para arch="i386">Support for the 80386 processor has been
       removed from the <filename>GENERIC</filename> kernel, as this
       code seriously pessimizes performance on other ia32
@@ -213,6 +214,9 @@
       (EV4 and EV5) to emulate instructions of the newer Alpha CPU 
       generations. This enables the use of binary-only programs like Adobe
       Acrobat 4 on EV4 and EV5.</para>
+
+      <para arch="alpha">SMP support for the alpha is now operational.</para>
+
     </sect3>
 
     <sect3>
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 22195f3295ec..493a1535f1e6 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
@@ -50,14 +50,6 @@
 
     <para arch="i386">A driver for AGP hardware has been added. &merged;</para>
 
-    <para>SMP support has been largely reworked, incorporating code
-    from BSD/OS 5.0.  One of the main features of SMPng (<quote>SMP Next
-    Generation</quote>) is to allow more processes to run in kernel, without
-    the need for spin locks that can dramatically reduce the
-    efficiency of multiple processors.  Interrupt handlers now have
-    contexts associated with them that allow them to be blocked, which
-    reduces the need to lock out interrupts.</para>
-
     <para>The kernel and modules have been moved to the directory
     <filename>/boot/kernel</filename>, so they can be easily
     manipulated together.  The boot loader has been updated to make
@@ -176,6 +168,15 @@
     <sect3>
       <title>Processor/Motherboard Support</title>
 
+      <para>SMP support has been largely reworked, incorporating code
+      from BSD/OS 5.0.  One of the main features of SMPng (<quote>SMP
+      Next Generation</quote>) is to allow more processes to run in
+      kernel, without the need for spin locks that can dramatically
+      reduce the efficiency of multiple processors.  Interrupt
+      handlers now have contexts associated with them that allow them
+      to be blocked, which reduces the need to lock out
+      interrupts.</para>
+
       <para arch="i386">Support for the 80386 processor has been
       removed from the <filename>GENERIC</filename> kernel, as this
       code seriously pessimizes performance on other ia32
@@ -213,6 +214,9 @@
       (EV4 and EV5) to emulate instructions of the newer Alpha CPU 
       generations. This enables the use of binary-only programs like Adobe
       Acrobat 4 on EV4 and EV5.</para>
+
+      <para arch="alpha">SMP support for the alpha is now operational.</para>
+
     </sect3>
 
     <sect3>
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 240c578bf02d..6b5b531d3b5b 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -119,6 +119,8 @@ that can dramatically reduce the efficiency of multiple processors.
 Interrupt handlers now have contexts associated with them that allow
 them to be blocked, which reduces the need to lock out interrupts.
 
+SMP support for the Alpha is now operational.
+
 The kernel and modules have been moved to the directory /boot/kernel,
 so they can be easily manipulated together.  The boot loader has been
 updated to make this change as seamless as possible.
@@ -347,7 +349,7 @@ The directory layout preference algorithm for FFS has been changed to
 improve its speed on large filesystems.
 
 The wx(4) driver now supports the Intel PRO1000-F and PRO1000-T
-(10/100/1000) adapters.
+(10/100/1000) adapters. [MERGED]
 
 The labpc(4) driver has been removed due to bitrot.
 
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index beff24c17d95..f9320097e643 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -424,7 +424,7 @@ The directory layout preference algorithm for FFS has been changed to
 improve its speed on large filesystems.
 
 The wx(4) driver now supports the Intel PRO1000-F and PRO1000-T
-(10/100/1000) adapters.
+(10/100/1000) adapters. [MERGED]
 
 The labpc(4) driver has been removed due to bitrot.