- Note that several features have been merged to 4.x.

- Add a note about supporting USB out of the box during installs and
  beyond.
- Add a note about the changes to the i386 bootstrap to work around the
  1024 cylinder problem.  Note that boot0 is now 2 sectors long.

Reminded by:	kkenn

1 files changed, 16 insertions, 4 deletions

diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 63e1b6c..47d9f35 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -69,7 +69,7 @@ capability data, and mandatory access control labels.
 
 Support for Intel's Wired for Management 2.0 (PXE) was added to
 the FreeBSD boot loader.  Due to API differences, the older PXE
-versions are not supported.  This allow network booting using DHCP.
+versions are not supported.  This allow network booting using DHCP. [MERGED]
 
 POSIX.1b Shared Memory Objects are now supported.  The implementation
 uses regular files, but automatically enables the MAP_NOSYNC flag
@@ -92,17 +92,29 @@ mtree as a part of an intrusion-detection system.  [MERGED]
 OpenSSL has been upgraded to 0.9.5a, which includes numerous bugfixes
 and enhancements.
 
-The OPIE one-time-password suite has been updated to 2.32.
+The OPIE one-time-password suite has been updated to 2.32. [MERGED]
 
 OpenSSH has been upgraded to 2.1.0, which provides support for the
 SSH2 protocol, including DSA keys.  Therefore, OpenSSH users in the US
 no longer need to rely on the restrictively-licensed RSAREF toolkit
 which is required to handle RSA keys.  OpenSSH 2.1 interoperates well
 with other SSH2 clients and servers, including the ssh2 port.  See
-http://www.openssh.com for more details.
+http://www.openssh.com for more details. [MERGED]
 
 OpenSSH can now authenticate using OPIE passwords in SSH1 mode.
-Support is not yet available in SSH2 mode.
+Support is not yet available in SSH2 mode. [MERGED]
+
+Support for USB devices was added to the GENERIC kernel and to the
+installation programs to support USB devices out of the box.  Note that
+an AT keyboard must still be used during the initial install, but it
+should work fine afterwards. [MERGED]
+
+The entire i386 bootstrap was revamped to support automatic detection and
+use of the Enhanced Disk Drive BIOS extensions to support booting beyond
+the 1023rd cylinder.  As part of this change, the FreeBSD boot manager
+(boot0) was increased from 1 sector in size (512 bytes), to 2 sectors in
+length (1024 bytes).  As a result, several userland changes were made to
+cope with MBR boot loaders of varying sizes. [MERGED]
 
 2. Supported Configurations
 ---------------------------