From 0c70e00d001ba34a2608c2b21750c330782350bd Mon Sep 17 00:00:00 2001 From: bmah Date: Thu, 13 Jun 2002 20:52:02 +0000 Subject: [PATCH] Fix up merge bogons, hopefully correctly this time. --- release/doc/en_US.ISO8859-1/relnotes/article.sgml | 5 +---- release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index 988a59d511c..96233befd67 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -1175,7 +1175,6 @@ options HZ=1000 # not compulsory but strongly recommended very large filesystems has been corrected. &merged; The ISO-9660 filesystem now has a hook that supports a - The ISO-9660 filesystem now has a hook that supports a loadable character conversion routine. The sysutils/cd9660_unicode port contains a set of common conversions. &merged; @@ -2220,8 +2219,6 @@ options HZ=1000 # not compulsory but strongly recommended &man.ispppcontrol.8; has been deleted, and its functionality has been folded into &man.spppcontrol.8;. &merged; - &man.kenv.1;, a command to dump the kernel environment, has - &man.k5su.8; is no longer installed SUID root by default. Users requiring this feature can either manually change the permissions on the @@ -2230,7 +2227,7 @@ options HZ=1000 # not compulsory but strongly recommended /etc/make.conf before a source upgrade. &merged; - &man.kenv.1;, a command to dump the kernel environment, has + &man.kenv.1;, a command to dump the kernel environment, has been added. &merged; &man.kenv.1; now has the ability to set or delete kernel 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 988a59d511c..96233befd67 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -1175,7 +1175,6 @@ options HZ=1000 # not compulsory but strongly recommended very large filesystems has been corrected. &merged; The ISO-9660 filesystem now has a hook that supports a - The ISO-9660 filesystem now has a hook that supports a loadable character conversion routine. The sysutils/cd9660_unicode port contains a set of common conversions. &merged; @@ -2220,8 +2219,6 @@ options HZ=1000 # not compulsory but strongly recommended &man.ispppcontrol.8; has been deleted, and its functionality has been folded into &man.spppcontrol.8;. &merged; - &man.kenv.1;, a command to dump the kernel environment, has - &man.k5su.8; is no longer installed SUID root by default. Users requiring this feature can either manually change the permissions on the @@ -2230,7 +2227,7 @@ options HZ=1000 # not compulsory but strongly recommended /etc/make.conf before a source upgrade. &merged; - &man.kenv.1;, a command to dump the kernel environment, has + &man.kenv.1;, a command to dump the kernel environment, has been added. &merged; &man.kenv.1; now has the ability to set or delete kernel -- 2.45.2