2 files changed, 35 insertions, 12 deletions

diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 43ff99d0369c..a8045a4277a1 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -81,7 +81,7 @@ Due to a licensing change, softupdates have been integrated into the
 main portion of the kernel source tree.  As a consequence, softupdates   
 are now available with the GENERIC kernel. [MERGED]
 
-ipfilter has been updated to 3.4.13. 
+ipfilter has been updated to 3.4.16.
 
 The tap driver, a virtual Ethernet device driver for bridged 
 configurations, has been added.  [MERGED]
@@ -136,9 +136,13 @@ is still needed to support non-PCI cards. [MERGED]
 The ed(4) driver is now also supported on the Alpha.
 
 The pcm(4) driver now supports the ESS Solo 1, Maestro-1, Maestro-2,
-and Maestro-2e; Forte Media fm801, ESS Maestro-2e, and VIA Technologies
-VT82C686A sound card/chipsets, and has received some other updates.
-[MERGED]
+and Maestro-2e; Forte Media fm801, ESS Maestro-2e, and VIA
+Technologies VT82C686A sound card/chipsets, and has received some
+other updates.  [MERGED] A driver for the ESS Maestro-3/Allegro has
+been added, however due to the amount of GPL firmware included, it
+will only be built as a module.  Separate drivers for the SoundBlaster
+8 and Soundblaster 16 now replace an older, unified driver.  [MERGED]
+A driver for the CMedia CMI8338/CMI8738 sound chips has been added.
 
 Replace the PQ_*CACHE options with a single PQ_CACHESIZE option to be
 set to the cache size in kilobytes.  The old options are still
@@ -680,7 +684,13 @@ ensures that that 'make buildkernel' doesn't quitely ignore them and
 build a bogus kernel without a human to read the errors. [MERGED]
 
 pkg_create(1) and pkg_install(1) can now work with packages that have
-been compressed using bzip2(1).
+been compressed using bzip2(1). [MERGED]
+
+pkg_info(1) can now accept a -g flag for verifying an installed
+package against its recorded checksums (to see if it's been modified
+post-installation).  Naturally, this mechanism is only as secure as
+the contents of /var/db/pkg if it's to be used for auditing
+purposes. [MERGED]
 
 libc is now thread-safe by default; libc_r contains only thread functions.
 
@@ -688,7 +698,8 @@ 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.
+chroot(2) based on the IP address of the connecting client.  tftp(1)
+and tftpd(8) can now transfer files larger than 65535 blocks.
 
 vidcontrol(1) now accepts a -g parameter to select custom text
 geometry in the VESA_800x600 raster text mode.
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index e52b892510dc..89a7108896ad 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -87,7 +87,7 @@ are now available with the GENERIC kernel. [MERGED]
 
 A driver for AGP hardware has been added. [MERGED]
 
-ipfilter has been updated to 3.4.13.
+ipfilter has been updated to 3.4.16.
 
 Various fixes and improvements to the IPv6 code have been merged in
 from the KAME project, including significantly-improved IPSEC
@@ -159,9 +159,13 @@ for use on systems with neither a video console nor a serial
 port. [MERGED]
 
 The pcm(4) driver now supports the ESS Solo 1, Maestro-1, Maestro-2,
-and Maestro-2e; Forte Media fm801, ESS Maestro-2e, and VIA Technologies
-VT82C686A sound card/chipsets, and has received some other updates.
-[MERGED]
+and Maestro-2e; Forte Media fm801, ESS Maestro-2e, and VIA
+Technologies VT82C686A sound card/chipsets, and has received some
+other updates. [MERGED] A driver for the ESS Maestro-3/Allegro has
+been added, however due to the amount of GPL firmware included, it
+will only be built as a module.  Separate drivers for the SoundBlaster
+8 and Soundblaster 16 now replace an older, unified driver.  [MERGED]
+A driver for the CMedia CMI8338/CMI8738 sound chips has been added.
 
 Replace the PQ_*CACHE options with a single PQ_CACHESIZE option to be
 set to the cache size in kilobytes.  The old options are still
@@ -777,7 +781,13 @@ ensures that that 'make buildkernel' doesn't quitely ignore them and
 build a bogus kernel without a human to read the errors. [MERGED]
 
 pkg_create(1) and pkg_install(1) can now work with packages that have
-been compressed using bzip2(1).
+been compressed using bzip2(1). [MERGED]
+
+pkg_info(1) can now accept a -g flag for verifying an installed
+package against its recorded checksums (to see if it's been modified
+post-installation).  Naturally, this mechanism is only as secure as
+the contents of /var/db/pkg if it's to be used for auditing
+purposes. [MERGED]
 
 libc is now thread-safe by default; libc_r contains only thread functions.
 
@@ -785,7 +795,8 @@ 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.
+chroot(2) based on the IP address of the connecting client.  tftp(1)
+and tftpd(8) can now transfer files larger than 65535 blocks.
 
 vidcontrol(1) now accepts a -g parameter to select custom text
 geometry in the VESA_800x600 raster text mode.
@@ -1282,6 +1293,7 @@ Crystal Semiconductor CS461x/462x/428x
 ENSONIQ AudioPCI ES1370/1371
 ESS ES1868, ES1869, ES1879 and ES1888
 ESS Maestro-1, Maestro-2, and Maestro-2E
+ESS Maestro-3/Allegro
 ForteMedia fm801
 Gravis UltraSound MAX/PnP
 MSS/WSS Compatible DSPs