2 files changed, 33 insertions, 2 deletions

diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index e84d6279839c..5c8a89f1e2e1 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -177,7 +177,7 @@ The cd(4) driver now has support for write operations.  This allows
 writing to DVD-RAM, PD and similar drives that probe as CD devices.
 Note that change affects only random-access writeable devices, not
 sequential-only writeable devices such as CD-R drives, which are
-supported by cdrecord.
+supported by cdrecord. [MERGED]
 
 Support for threads under Linux emulation has been added.
 
@@ -256,6 +256,9 @@ version.)
 
 The API UP1100 mainboard has been verified to work OK.
 
+bridge(4) and dummynet(4) have received some enhancements and bugfixes.
+
+
 1.2. SECURITY FIXES
 -------------------
 
@@ -679,6 +682,19 @@ been compressed using bzip2(1).
 
 libc is now thread-safe by default; libc_r contains only thread functions.
 
+find(1) now takes the -empty flag, which returns true if a directory
+is empty. [MERGED]
+
+tftpd(8) now takes the -c and -C options, which allow the server to
+chroot(2) based on the IP address of the connecting client.
+
+vidcontrol(1) now accepts a -g parameter to select custom text
+geometry in the VESA_800x600 raster text mode.
+
+ldconfig(8) now checks directory ownerships and permissions for
+greater security; these checks can be disabled with the -i
+flag. [MERGED]
+
 
 2. Supported Configurations
 ---------------------------
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index a7bf6cb6a165..eab16f4c18cf 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -242,7 +242,7 @@ The cd(4) driver now has support for write operations.  This allows
 writing to DVD-RAM, PD and similar drives that probe as CD devices.
 Note that change affects only random-access writeable devices, not
 sequential-only writeable devices such as CD-R drives, which are
-supported by cdrecord.
+supported by cdrecord. [MERGED]
 
 The an(4) driver for Cisco Aironet cards now supports Wired Equivalent
 Privacy (WEP) encryption, settable via ancontrol(8). [MERGED]
@@ -337,6 +337,8 @@ is no longer required, in some cases, for a "buildworld" to precede a
 major releases, across binutil upgrades and when config changes
 version.)
 
+bridge(4) and dummynet(4) have received some enhancements and bugfixes.
+
 
 1.2. SECURITY FIXES
 -------------------
@@ -779,6 +781,19 @@ been compressed using bzip2(1).
 
 libc is now thread-safe by default; libc_r contains only thread functions.
 
+find(1) now takes the -empty flag, which returns true if a directory
+is empty. [MERGED]
+
+tftpd(8) now takes the -c and -C options, which allow the server to
+chroot(2) based on the IP address of the connecting client.
+
+vidcontrol(1) now accepts a -g parameter to select custom text
+geometry in the VESA_800x600 raster text mode.
+
+ldconfig(8) now checks directory ownerships and permissions for
+greater security; these checks can be disabled with the -i
+flag. [MERGED]
+
 
 2. Supported Configurations
 ---------------------------