2 files changed, 28 insertions, 6 deletions

diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index f1f9bb1fb6a9e..4a1a9962f3dc2 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -431,6 +431,11 @@ To prevent some forms of DOS attacks, glob(3) allows specification of
 a limit on the number of pathname matches it will return.  ftpd(8) now
 uses this feature. [MERGED]
 
+A security hole in FreeBSD's FFS and EXT2FS implementations, which
+allowed a race condition that could cause users to have unauthorized
+access to data, has been fixed (see security advisory
+FreeBSD-SA-01:30). [MERGED]
+
 
 1.3. USERLAND CHANGES
 ---------------------
@@ -646,6 +651,15 @@ libisc. [MERGED]
 The "in use" percentage metric displayed by netstat(1) now really
 reflects the percentage of network mbufs used. [MERGED]
 
+netstat(1) now has a -W flag that tells it not to truncate addresses,
+even if they're too long for the column they're printed in. [MERGED]
+
+netstat(1) now keeps track of input and output packets on a
+per-address basis for each interface. [MERGED]
+
+sockstat(1) now has -c and -l flags for listing connected and
+listening sockets, respectively. [MERGED]
+
 mergemaster(8) has gained some new features, has been cleaned up
 somewhat, and is now more cross-platform friendly.
 
@@ -905,9 +919,6 @@ split(1) now has the ability to split a file longer than 2GB. [MERGED]
 
 units(1) has received some updates and bugfixes. [MERGED]
 
-netstat(1) now keeps track of input and output packets on a
-per-address basis for each interface. [MERGED]
-
 As part of an ongoing process, many manual pages were improved, both
 in terms of their formatting markup and in their content. [MERGED]
 
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 7563409aa6b44..4688edb5e8b66 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -505,6 +505,11 @@ To prevent some forms of DOS attacks, glob(3) allows specification of
 a limit on the number of pathname matches it will return.  ftpd(8) now
 uses this feature.  [MERGED]
 
+A security hole in FreeBSD's FFS and EXT2FS implementations, which
+allowed a race condition that could cause users to have unauthorized
+access to data, has been fixed (see security advisory
+FreeBSD-SA-01:30). [MERGED]
+
 
 1.3. USERLAND CHANGES
 ---------------------
@@ -739,6 +744,15 @@ libisc. [MERGED]
 The "in use" percentage metric displayed by netstat(1) now really
 reflects the percentage of network mbufs used. [MERGED]
 
+netstat(1) now has a -W flag that tells it not to truncate addresses,
+even if they're too long for the column they're printed in. [MERGED]
+
+netstat(1) now keeps track of input and output packets on a
+per-address basis for each interface. [MERGED]
+
+sockstat(1) now has -c and -l flags for listing connected and
+listening sockets, respectively. [MERGED]
+
 mergemaster(8) has gained some new features, has been cleaned up
 somewhat, and is now more cross-platform friendly.
 
@@ -997,9 +1011,6 @@ split(1) now has the ability to split a file longer than 2GB. [MERGED]
 
 units(1) has received some updates and bugfixes. [MERGED]
 
-netstat(1) now keeps track of input and output packets on a
-per-address basis for each interface. [MERGED]
-
 As part of an ongoing process, many manual pages were improved, both
 in terms of their formatting markup and in their content. [MERGED]