Put several notes in the right place: Move an arp(8) note from kernel

to userland.  Move all of the items in the Kernel contrib section to
the top-level contrib section.

All of the moved items are unchanged with respect to their actual
contents.

2 files changed, 42 insertions, 50 deletions

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index b2c7aeb..17ed31d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -642,10 +642,6 @@
 	to suppress logging of attempts to modify
 	permanent ARP entries.  &merged;</para>
 
-      <para>The &man.arp.8; utility now allows the <option>-i</option>
-	option together with the <option>-d</option> and <option>-a</option> options
-	to allow all entries for a given interface to be removed.</para>
-
       <para arch="amd64,i386,pc98">An experimental BPF Just-In-Time compiler
 	has been implemented.  To enable this,
 	<literal>options BPF_JITTER</literal> kernel option is needed,
@@ -943,27 +939,6 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <para>Initial (read-only) support for SGI's XFS filesystem has been
 	added.</para>
     </sect3>
-
-    <sect3>
-      <title>Contributed Software</title>
-
-      <para><application>Intel ACPI-CA</application>
-	has been updated to 20051021.</para>
-
-      <para><application>DRM</application> has
-	been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
-
-      <para>TrustedBSD <application>OpenBSM</application>,
-	version 1.0 alpha 6, an implementation of the documented Sun Basic
-	Security Module (BSM) Audit API and file format, as well as local
-	extensions to support the Mac OS X and FreeBSD operating systems
-	has been added.  This also includes command line tools for audit
-	trail reduction and conversion to text, as well as documentation
-	of the commands, file format, and APIs.
-	For this functionality, the <literal>AUDIT</literal> kernel option,
-	<filename>/var/audit</filename> directory, and
-	<literal>audit</literal> group have been added.</para>
-    </sect3>
   </sect2>
 
   <sect2 id="userland">
@@ -976,6 +951,10 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       &man.getaddrinfo.3; function on 64-bit architecture including
       &os;/alpha, &os;/amd64, &os;/ia64, and &os;/sparc64.</para>
 
+    <para>The &man.arp.8; utility now allows the <option>-i</option>
+      option together with the <option>-d</option> and <option>-a</option> options
+      to allow all entries for a given interface to be removed.</para>
+
     <para>The OpenBSM userland tools, including &man.audit.8;,
       &man.auditd.8;,
       &man.auditreduce.1;, and
@@ -1400,12 +1379,18 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
   <sect2 id="contrib">
     <title>Contributed Software</title>
 
+    <para><application>Intel ACPI-CA</application>
+      has been updated to 20051021.</para>
+
     <para><application>BIND</application> has been updated from 9.3.1
       to 9.3.2. &merged;</para>
 
     <para><application>BSNMPD</application> has been updated from
       1.11 to 1.12.</para>
 
+    <para><application>DRM</application> has
+      been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
+
     <para><application>netcat</application> has been updated from the
       version in a 4 February 2005 OpenBSD snapshot to the version
       included in OpenBSD 3.9.</para>
@@ -1437,6 +1422,17 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <application>tzdata2005l</application> release to the
       <application>tzdata2006g</application> release. &merged;</para>
 
+    <para>TrustedBSD <application>OpenBSM</application>,
+      version 1.0 alpha 6, an implementation of the documented Sun Basic
+      Security Module (BSM) Audit API and file format, as well as local
+      extensions to support the Mac OS X and FreeBSD operating systems
+      has been added.  This also includes command line tools for audit
+      trail reduction and conversion to text, as well as documentation
+      of the commands, file format, and APIs.
+      For this functionality, the <literal>AUDIT</literal> kernel option,
+      <filename>/var/audit</filename> directory, and
+      <literal>audit</literal> group have been added.</para>
+
     <para><application>WPA Supplicant</application>
       has been updated from version 0.3.9 to version 0.4.8.
       &merged;</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 b2c7aeb..17ed31d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -642,10 +642,6 @@
 	to suppress logging of attempts to modify
 	permanent ARP entries.  &merged;</para>
 
-      <para>The &man.arp.8; utility now allows the <option>-i</option>
-	option together with the <option>-d</option> and <option>-a</option> options
-	to allow all entries for a given interface to be removed.</para>
-
       <para arch="amd64,i386,pc98">An experimental BPF Just-In-Time compiler
 	has been implemented.  To enable this,
 	<literal>options BPF_JITTER</literal> kernel option is needed,
@@ -943,27 +939,6 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <para>Initial (read-only) support for SGI's XFS filesystem has been
 	added.</para>
     </sect3>
-
-    <sect3>
-      <title>Contributed Software</title>
-
-      <para><application>Intel ACPI-CA</application>
-	has been updated to 20051021.</para>
-
-      <para><application>DRM</application> has
-	been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
-
-      <para>TrustedBSD <application>OpenBSM</application>,
-	version 1.0 alpha 6, an implementation of the documented Sun Basic
-	Security Module (BSM) Audit API and file format, as well as local
-	extensions to support the Mac OS X and FreeBSD operating systems
-	has been added.  This also includes command line tools for audit
-	trail reduction and conversion to text, as well as documentation
-	of the commands, file format, and APIs.
-	For this functionality, the <literal>AUDIT</literal> kernel option,
-	<filename>/var/audit</filename> directory, and
-	<literal>audit</literal> group have been added.</para>
-    </sect3>
   </sect2>
 
   <sect2 id="userland">
@@ -976,6 +951,10 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       &man.getaddrinfo.3; function on 64-bit architecture including
       &os;/alpha, &os;/amd64, &os;/ia64, and &os;/sparc64.</para>
 
+    <para>The &man.arp.8; utility now allows the <option>-i</option>
+      option together with the <option>-d</option> and <option>-a</option> options
+      to allow all entries for a given interface to be removed.</para>
+
     <para>The OpenBSM userland tools, including &man.audit.8;,
       &man.auditd.8;,
       &man.auditreduce.1;, and
@@ -1400,12 +1379,18 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
   <sect2 id="contrib">
     <title>Contributed Software</title>
 
+    <para><application>Intel ACPI-CA</application>
+      has been updated to 20051021.</para>
+
     <para><application>BIND</application> has been updated from 9.3.1
       to 9.3.2. &merged;</para>
 
     <para><application>BSNMPD</application> has been updated from
       1.11 to 1.12.</para>
 
+    <para><application>DRM</application> has
+      been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
+
     <para><application>netcat</application> has been updated from the
       version in a 4 February 2005 OpenBSD snapshot to the version
       included in OpenBSD 3.9.</para>
@@ -1437,6 +1422,17 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <application>tzdata2005l</application> release to the
       <application>tzdata2006g</application> release. &merged;</para>
 
+    <para>TrustedBSD <application>OpenBSM</application>,
+      version 1.0 alpha 6, an implementation of the documented Sun Basic
+      Security Module (BSM) Audit API and file format, as well as local
+      extensions to support the Mac OS X and FreeBSD operating systems
+      has been added.  This also includes command line tools for audit
+      trail reduction and conversion to text, as well as documentation
+      of the commands, file format, and APIs.
+      For this functionality, the <literal>AUDIT</literal> kernel option,
+      <filename>/var/audit</filename> directory, and
+      <literal>audit</literal> group have been added.</para>
+
     <para><application>WPA Supplicant</application>
       has been updated from version 0.3.9 to version 0.4.8.
       &merged;</para>