summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce A. Mah <bmah@FreeBSD.org>2001-12-20 19:45:14 +0000
committerBruce A. Mah <bmah@FreeBSD.org>2001-12-20 19:45:14 +0000
commit8ff661ddc93093c67499dc89285dae1069add6b9 (patch)
tree1340f9a27df44b2dfc8a11deb6f033f07d834fad
parent94722e99e5b87d6ef94bf15ba5521fb39f71718b (diff)
Notes
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml3
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml3
2 files changed, 0 insertions, 6 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index b3dcb12123b0..51e34ae7470d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1864,9 +1864,6 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
&man.mount.8; that mimics the command line option set of the
deprecated &man.mount.mfs.8;.</para>
- <para>&man.mergemaster.8; has gained some new features, has been
- cleaned up somewhat, and is now more cross-platform friendly.</para>
-
<para>&man.mergemaster.8; now sources an
<filename>/etc/mergemaster.rc</filename> file and also prompts the
user to run recommended commands (such as
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index b3dcb12123b0..51e34ae7470d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1864,9 +1864,6 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
&man.mount.8; that mimics the command line option set of the
deprecated &man.mount.mfs.8;.</para>
- <para>&man.mergemaster.8; has gained some new features, has been
- cleaned up somewhat, and is now more cross-platform friendly.</para>
-
<para>&man.mergemaster.8; now sources an
<filename>/etc/mergemaster.rc</filename> file and also prompts the
user to run recommended commands (such as