2 files changed, 49 insertions, 4 deletions

diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 4d155e521690..81201318b6d1 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -240,6 +240,10 @@ O_EXCL|O_CREAT opens was fixed.  [MERGED]
 The bug that made certain CDROM drives fail to attach when connected
 to a SCSI card driven by 'isp' has been fixed. [MERGED]
 
+Condition variables have now been implemented in the FreeBSD kernel.
+See condvar(9) for more details.
+
+
 1.2. SECURITY FIXES
 -------------------
 
@@ -594,7 +598,8 @@ gcc now uses a unified libgcc rather than a separate one fro threaded
 and non-threaded programs.  This provides threaded programs with the
 needed exception frame symbols. [MERGED]
 
-syslogd(8) now supports a "LOG_CONSOLE" facility. [MERGED]
+syslogd(8) now supports a "LOG_CONSOLE" facility (disabled by
+default), which can be used to log /dev/console output. [MERGED]
 
 rpcgen now uses /usr/bin/cpp (as on NetBSD), not /usr/libexec/cpp.
 
@@ -609,6 +614,24 @@ used as a filename for stdin.
 dmesg(8) now has a -a option to show the entire message buffer,
 including syslog records and /dev/console output. [MERGED]
 
+In /etc/ssh/sshd_config, ConnectionsPerPeriod has been deprecated.
+
+Entropy from the random(4) device is now periodically saved to files 
+in /var/db/entropy.
+
+cdcontrol(1) now uses the CDROM environment variable to pick a default
+device. [MERGED]
+
+sysctl(8) now supports a -N option to print out variable names only.
+
+All packages and ports now contain an "origin" directive, which makes
+it easier for programs like pkg_version(1) to determine the directory
+from which a package was built. [MERGED]
+
+sysinstall(8) now lives in /usr/sbin, which simplifies the installation
+process.  The sysinstall(8) manpage is also installed in a more
+consistent fashion now.
+
 
 2. Supported Configurations
 ---------------------------
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index fda3d3689ba8..40a24b050792 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -291,10 +291,10 @@ The ray(4) driver, which supports the Webgear Aviator wireless network
 cards, has been committed.  The operation of ray(4) interfaces can be
 modified by raycontrol(8).  [MERGED]
 
-Linksys Fast Ethernet PCCARD cards supported by the ed driver now
+Linksys Fast Ethernet PCCARD cards supported by the ed(4) driver now
 require the addition of flag 0x80000 to their config line in
 pccard.conf(5).  This flag is not optional.  These Linksys cards will
-not be recognized without it.
+not be recognized without it. [MERGED]
 
 A new API has been added for sound cards with hardware volume
 control.
@@ -320,6 +320,9 @@ processor type checks.
 Custom kernels that will run on the 80386 can still be built by changing
 the cpu options in the kernel configuration file to only include I386_CPU.
 
+Condition variables have now been implemented in the FreeBSD kernel.
+See condvar(9) for more details.
+
 
 1.2. SECURITY FIXES
 -------------------
@@ -693,7 +696,8 @@ gcc now uses a unified libgcc rather than a separate one fro threaded
 and non-threaded programs.  This provides threaded programs with the
 needed exception frame symbols. [MERGED]
 
-syslogd(8) now supports a "LOG_CONSOLE" facility. [MERGED]
+syslogd(8) now supports a "LOG_CONSOLE" facility (disabled by
+default), which can be used to log /dev/console output. [MERGED]
 
 rpcgen now uses /usr/bin/cpp (as on NetBSD), not /usr/libexec/cpp.
 
@@ -708,6 +712,24 @@ used as a filename for stdin.
 dmesg(8) now has a -a option to show the entire message buffer,
 including syslog records and /dev/console output. [MERGED]
 
+In /etc/ssh/sshd_config, ConnectionsPerPeriod has been deprecated.
+
+Entropy from the random(4) device is now periodically saved to files 
+in /var/db/entropy.
+
+cdcontrol(1) now uses the CDROM environment variable to pick a default
+device. [MERGED]
+
+sysctl(8) now supports a -N option to print out variable names only.
+
+All packages and ports now contain an "origin" directive, which makes
+it easier for programs like pkg_version(1) to determine the directory
+from which a package was built. [MERGED]
+
+sysinstall(8) now lives in /usr/sbin, which simplifies the installation
+process.  The sysinstall(8) manpage is also installed in a more
+consistent fashion now.
+
 
 2. Supported Configurations
 ---------------------------