summaryrefslogtreecommitdiffstats
path: root/release/texts
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2000-09-01 16:39:02 +0000
committerbmah <bmah@FreeBSD.org>2000-09-01 16:39:02 +0000
commitb28419aa878f729a57845c29a73cc69fc3531e28 (patch)
tree1d1f2d80b39543bbc3fa08bc34a333f6985a1db2 /release/texts
parentc183e5be0ac38273a7a544f6699e1932310139fe (diff)
downloadFreeBSD-src-b28419aa878f729a57845c29a73cc69fc3531e28.zip
FreeBSD-src-b28419aa878f729a57845c29a73cc69fc3531e28.tar.gz
Reflect the MFC of: Posix.1b shared memory objects, OpenSSL 0.9.5a,
routed 2.22.
Diffstat (limited to 'release/texts')
-rw-r--r--release/texts/alpha/RELNOTES.TXT6
-rw-r--r--release/texts/i386/RELNOTES.TXT6
2 files changed, 6 insertions, 6 deletions
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index a629153..6603746 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -71,7 +71,7 @@ capability data, and mandatory access control labels.
POSIX.1b Shared Memory Objects are now supported. The implementation
uses regular files, but automatically enables the MAP_NOSYNC flag
-when they are mmap(2)ed.
+when they are mmap(2)ed. [MERGED]
Added support for PCI ethernet adapters based on the National Semiconductor
DP83815 chipset, including the NetGear FA312-TX.
@@ -102,7 +102,7 @@ when creating and verifying prototypes. This makes it easier to use
mtree as a part of an intrusion-detection system. [MERGED]
OpenSSL has been upgraded to 0.9.5a, which includes numerous bugfixes
-and enhancements.
+and enhancements. [MERGED]
The OPIE one-time-password suite has been updated to 2.32. [MERGED]
@@ -139,7 +139,7 @@ trusted users; and the MSA port (587) is turned on by default. See
awk has been upgraded from gawk-3.0.4 to gawk-3.0.6. This fixes a number
of non-critical bugs and includes a few performance tweaks.
-routed(8) has been updated to version 2.22.
+routed(8) has been updated to version 2.22. [MERGED]
The truncate(1) utility, which truncates or extends the length
of files, has been added. [MERGED]
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index ab8a519..9bf1224 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -75,7 +75,7 @@ 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
-when they are mmap(2)ed.
+when they are mmap(2)ed. [MERGED]
Added support for PCI ethernet adapters based on the National Semiconductor
DP83815 chipset, including the NetGear FA312-TX.
@@ -120,7 +120,7 @@ when creating and verifying prototypes. This makes it easier to use
mtree as a part of an intrusion-detection system. [MERGED]
OpenSSL has been upgraded to 0.9.5a, which includes numerous bugfixes
-and enhancements.
+and enhancements. [MERGED]
The OPIE one-time-password suite has been updated to 2.32. [MERGED]
@@ -170,7 +170,7 @@ trusted users; and the MSA port (587) is turned on by default. See
awk has been upgraded from gawk-3.0.4 to gawk-3.0.6. This fixes a number
of non-critical bugs and includes a few performance tweaks.
-routed(8) has been updated to version 2.22.
+routed(8) has been updated to version 2.22. [MERGED]
The truncate(1) utility, which truncates or extends the length
of files, has been added. [MERGED]
OpenPOWER on IntegriCloud