diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index b2c7aebb5b94..17ed31d22305 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;
- The &man.arp.8; utility now allows the
- option together with the and options
- to allow all entries for a given interface to be removed.
-
An experimental BPF Just-In-Time compiler
has been implemented. To enable this,
options BPF_JITTER kernel option is needed,
@@ -943,27 +939,6 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"
Initial (read-only) support for SGI's XFS filesystem has been
added.
-
-
- Contributed Software
-
- Intel ACPI-CA
- has been updated to 20051021.
-
- DRM has
- been updated to a snapshot from DRI CVS as of 20051202. &merged;
-
- TrustedBSD OpenBSM,
- 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 AUDIT kernel option,
- /var/audit directory, and
- audit group have been added.
-
@@ -976,6 +951,10 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"
&man.getaddrinfo.3; function on 64-bit architecture including
&os;/alpha, &os;/amd64, &os;/ia64, and &os;/sparc64.
+ The &man.arp.8; utility now allows the
+ option together with the and options
+ to allow all entries for a given interface to be removed.
+
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"
Contributed Software
+ Intel ACPI-CA
+ has been updated to 20051021.
+
BIND has been updated from 9.3.1
to 9.3.2. &merged;BSNMPD has been updated from
1.11 to 1.12.
+ DRM has
+ been updated to a snapshot from DRI CVS as of 20051202. &merged;
+
netcat has been updated from the
version in a 4 February 2005 OpenBSD snapshot to the version
included in OpenBSD 3.9.
@@ -1437,6 +1422,17 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"
tzdata2005l release to the
tzdata2006g release. &merged;
+ TrustedBSD OpenBSM,
+ 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 AUDIT kernel option,
+ /var/audit directory, and
+ audit group have been added.
+
WPA Supplicant
has been updated from version 0.3.9 to version 0.4.8.
&merged;
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 b2c7aebb5b94..17ed31d22305 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;
- The &man.arp.8; utility now allows the
- option together with the and options
- to allow all entries for a given interface to be removed.
-
An experimental BPF Just-In-Time compiler
has been implemented. To enable this,
options BPF_JITTER kernel option is needed,
@@ -943,27 +939,6 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"
Initial (read-only) support for SGI's XFS filesystem has been
added.
-
-
- Contributed Software
-
- Intel ACPI-CA
- has been updated to 20051021.
-
- DRM has
- been updated to a snapshot from DRI CVS as of 20051202. &merged;
-
- TrustedBSD OpenBSM,
- 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 AUDIT kernel option,
- /var/audit directory, and
- audit group have been added.
-
@@ -976,6 +951,10 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"
&man.getaddrinfo.3; function on 64-bit architecture including
&os;/alpha, &os;/amd64, &os;/ia64, and &os;/sparc64.
+ The &man.arp.8; utility now allows the
+ option together with the and options
+ to allow all entries for a given interface to be removed.
+
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"
Contributed Software
+ Intel ACPI-CA
+ has been updated to 20051021.
+
BIND has been updated from 9.3.1
to 9.3.2. &merged;BSNMPD has been updated from
1.11 to 1.12.
+ DRM has
+ been updated to a snapshot from DRI CVS as of 20051202. &merged;
+
netcat has been updated from the
version in a 4 February 2005 OpenBSD snapshot to the version
included in OpenBSD 3.9.
@@ -1437,6 +1422,17 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"
tzdata2005l release to the
tzdata2006g release. &merged;
+ TrustedBSD OpenBSM,
+ 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 AUDIT kernel option,
+ /var/audit directory, and
+ audit group have been added.
+
WPA Supplicant
has been updated from version 0.3.9 to version 0.4.8.
&merged;