summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Smithurst <ben@FreeBSD.org>2000-07-19 16:05:37 +0000
committerBen Smithurst <ben@FreeBSD.org>2000-07-19 16:05:37 +0000
commitfb6c7713b81f0546da315464b8b944fb31fce185 (patch)
treeaa9030490516aca18617034b69a32a965503d474
parent07da1e52ec3b173cab6f24c07c2251d25059a0e4 (diff)
Notes
-rw-r--r--release/texts/alpha/RELNOTES.TXT2
-rw-r--r--release/texts/i386/RELNOTES.TXT2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 920023c1efeb..ff8e1c042051 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -85,7 +85,7 @@ DP83815 chipset, including the NetGear FA312-TX.
cdcontrol(1) now supports a "cdid" command, which calculates and
displays the CD serial number, using the same algorithm used by the CDDB
-database.
+database. [MERGED]
mtree(8) now includes support for a file listing pathnames to be excluded
when creating and verifying prototypes. This makes it easier to use
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index ffc191846002..11d795eff1bc 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -89,7 +89,7 @@ DP83815 chipset, including the NetGear FA312-TX.
cdcontrol(1) now supports a "cdid" command, which calculates and
displays the CD serial number, using the same algorithm used by the CDDB
-database.
+database. [MERGED]
mtree(8) now includes support for a file listing pathnames to be excluded
when creating and verifying prototypes. This makes it easier to use