diff options
| author | bmah <bmah@FreeBSD.org> | 2001-12-20 19:45:14 +0000 |
|---|---|---|
| committer | bmah <bmah@FreeBSD.org> | 2001-12-20 19:45:14 +0000 |
| commit | 48ede370973b159d63fbd3142427255a1a528b6d (patch) | |
| tree | 1340f9a27df44b2dfc8a11deb6f033f07d834fad /release | |
| parent | ecc89e112ffe011a8fde95a3ebaf6a619ae3f449 (diff) | |
| download | FreeBSD-src-48ede370973b159d63fbd3142427255a1a528b6d.zip FreeBSD-src-48ede370973b159d63fbd3142427255a1a528b6d.tar.gz | |
Delete a release note regarding mergemaster(8) which, while true, was
too vague to be useful.
Diffstat (limited to 'release')
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 3 | ||||
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 3 |
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 b3dcb12..51e34ae 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 b3dcb12..51e34ae 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 |
