From 0fc8c1e39fbd8c27c00432f78a0e0ee70dde876c Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Thu, 13 Jun 2002 20:30:50 +0000 Subject: [PATCH] Fix up some SGML bogons caused by merge conflicts that somehow didn't get resolved correctly. --- .../doc/en_US.ISO8859-1/relnotes/article.sgml | 44 +++++++++++++------ .../en_US.ISO8859-1/relnotes/common/new.sgml | 44 +++++++++++++------ 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index 988a59d511c3..adad49c5fd04 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -14,7 +14,14 @@ The release notes for &os; &release.current; contain a summary - of the changes made in the &os; base system since &release.prev;. + of + + Both changes for kernel and userland are listed, as well as applicable security advisories that were issued since the last release. Some brief remarks on upgrading are also presented. @@ -26,8 +33,8 @@ This document contains the release notes for &os; &release.current; on the &arch.print; hardware platform. It - describes new features of &os; that have been added (or changed) - since &release.prev;. It also provides some notes on upgrading + describes recently added, changed, or deleted features of &os;. + It also provides some notes on upgrading from previous versions of &os;. What's New - This section describes the most user-visible new or changed - features in &os; since &release.prev;. Typical release note items + This section describes + + + + + Typical release note items document new drivers or hardware support, new commands or options, - major bugfixes, or contributed software upgrades. Security - advisories issued after &release.prev; are also listed. In - general, changes described here are unique to the &release.branch; - branch unless specifically marked as &merged; features. + major bugfixes, or contributed software upgrades. Applicable security + advisories issued after &release.prev; are also listed. Many additional changes were made to &os; that are not listed here for lack of space. For example, documentation was corrected @@ -1175,7 +1196,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 +2240,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 +2248,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 988a59d511c3..adad49c5fd04 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -14,7 +14,14 @@ The release notes for &os; &release.current; contain a summary - of the changes made in the &os; base system since &release.prev;. + of + + Both changes for kernel and userland are listed, as well as applicable security advisories that were issued since the last release. Some brief remarks on upgrading are also presented. @@ -26,8 +33,8 @@ This document contains the release notes for &os; &release.current; on the &arch.print; hardware platform. It - describes new features of &os; that have been added (or changed) - since &release.prev;. It also provides some notes on upgrading + describes recently added, changed, or deleted features of &os;. + It also provides some notes on upgrading from previous versions of &os;. What's New - This section describes the most user-visible new or changed - features in &os; since &release.prev;. Typical release note items + This section describes + + + + + Typical release note items document new drivers or hardware support, new commands or options, - major bugfixes, or contributed software upgrades. Security - advisories issued after &release.prev; are also listed. In - general, changes described here are unique to the &release.branch; - branch unless specifically marked as &merged; features. + major bugfixes, or contributed software upgrades. Applicable security + advisories issued after &release.prev; are also listed. Many additional changes were made to &os; that are not listed here for lack of space. For example, documentation was corrected @@ -1175,7 +1196,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 +2240,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 +2248,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