New release notes: vidcontrol(1) update (submitted by sobomax).

Modified release notes:  Note MFC of gcc-2.95.3, libreadline 4.2.

Clarify Maestro-3/Allegro driver loading issues (submitted by scottl).

3 files changed, 35 insertions, 14 deletions

diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index d61a8cc9ff13..25cd3b711fc9 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -1028,6 +1028,12 @@ Trident 4DWave DX/NX
 VIA Technologies VT82C686A
 Yamaha DS1 and DS1e
 
+NOTE: Due to licensing restrictions, the Maestro3/Allegro driver
+cannot be compiled into the kernel.  To use this driver, add the
+following line to /boot/loader.conf:
+
+	maestro3_load="YES"
+
 Matrox Meteor Video frame grabber
 Creative Labs Video Spigot frame grabber
 Cortex1 frame grabber
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 2e6b976130bd..ca66410a02bc 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -151,13 +151,17 @@ packets and BPF or bridging active has been fixed.
 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] 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. [MERGED] 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.  A driver for the CS4281 sound chip has been
-added. [MERGED]
+other updates.  [MERGED] 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.  A
+driver for the CS4281 sound chip has been added. [MERGED]
+
+A driver for the ESS Maestro-3/Allegro has been added, however due to
+licensing restrictions, it cannot be compiled into the kernel.
+[MERGED] To use this driver, add the following line to
+/boot/loader.conf:
+
+	maestreo3_load="YES"
 
 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
@@ -614,7 +618,7 @@ perl has been updated to version 5.6.0.
 
 Binutils have been upgraded to 2.10.1. [MERGED]
 
-libreadline has been upgraded to 4.1. [MERGED]
+libreadline has been upgraded to 4.2.
 
 The ifconfig(8) command can set the link-layer address of an interface.
 [MERGED]
@@ -754,7 +758,7 @@ dialog support functions.  [MERGED]
 The default root partition in sysinstall is now 100MB on the i386 and
 120MB on the alpha.
 
-gcc has been updated to 2.95.3.
+gcc has been updated to 2.95.3. [MERGED]
 
 Shortly after the receipt of a SIGINFO signal (normally control-T from
 the controlling tty), fsck_ffs will now output a line indicating the
@@ -1006,6 +1010,9 @@ GNATS has been updated to 3.113. [MERGED]
 BSDPAN, a collection of modules that provides tighter integration of
 Perl into the FreeBSD Ports Collection, has been added.
 
+vidcontrol(1) now allows the user to omit the font size specification
+when loading a font, and has some better error-handling.
+
 
 2. Supported Configurations
 ---------------------------
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index c6dfc8410b97..8940fb72d496 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -174,14 +174,19 @@ 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] 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. [MERGED] Separate drivers for the
+other updates. [MERGED] 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.  A driver for the CS4281 sound chip has been
 added. [MERGED]
 
+A driver for the ESS Maestro-3/Allegro has been added, however due to
+licensing restrictions, it cannot be compiled into the kernel.
+[MERGED] To use this driver, add the following line to
+/boot/loader.conf:
+
+	maestreo3_load="YES"
+
 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
 supported for backwards compatibility. [MERGED]
@@ -707,7 +712,7 @@ perl has been updated to version 5.6.0.
 
 Binutils have been upgraded to 2.10.1. [MERGED]
 
-libreadline has been upgraded to 4.1. [MERGED]
+libreadline has been upgraded to 4.2.
 
 The ifconfig(8) command can set the link-layer address of an interface.
 [MERGED]
@@ -847,7 +852,7 @@ dialog support functions.  [MERGED]
 The default root partition in sysinstall is now 100MB on the i386 and
 120MB on the alpha.
 
-gcc has been updated to 2.95.3.
+gcc has been updated to 2.95.3. [MERGED]
 
 Shortly after the receipt of a SIGINFO signal (normally control-T from
 the controlling tty), fsck_ffs will now output a line indicating the
@@ -1098,6 +1103,9 @@ GNATS has been updated to 3.113. [MERGED]
 BSDPAN, a collection of modules that provides tighter integration of
 Perl into the FreeBSD Ports Collection, has been added.
 
+vidcontrol(1) now allows the user to omit the font size specification
+when loading a font, and has some better error-handling.
+
 
 2. Supported Configurations
 ---------------------------