d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up some SGML bogons caused by merge conflicts that somehow didn't

Browse Source 
get resolved correctly.
This commit is contained in:
bmah 2002-06-13 20:30:50 +00:00
parent b09018014a
commit a72d7bc299
2 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
release/doc/en_US.ISO8859-1/relnotes/article.sgml
View File

@ -14,7 +14,14 @@
<abstract>
<para>The release notes for &os; &release.current; contain a summary
of the changes made in the &os; base system since &release.prev;.
of
<![ %include.historic; [
the changes made in the &os; base system since &release.prev;.
]]>
<![ %no.include.historic; [
recent changes made to the &os; base system on the &release.branch;
development branch.
]]>
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.</para>
@ -26,8 +33,8 @@
<para>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;.</para>
<![ %release.type.snapshot [
@ -58,13 +65,27 @@
<sect1>
<title>What's New</title>
<para>This section describes the most user-visible new or changed
features in &os; since &release.prev;. Typical release note items
<para>This section describes
<![ %include.historic; [
the most user-visible new or changed features in &os;
since &release.prev;.
In general, changes described here are unique to the &release.branch;
branch unless specifically marked as &merged; features.
]]>
<![ %no.include.historic; [
many of the user-visible new or changed features in &os;
since &release.prev;. It includes items that are unique to the
&release.branch; branch, as well as some features that may have been
recently merged to
other branches (after &os; &release.prev.historic;). The later
items are marked as &merged;.
]]>
</para>
<para>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.</para>
major bugfixes, or contributed software upgrades. Applicable security
advisories issued after &release.prev; are also listed.</para>
<para>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</programlisting>
very large filesystems has been corrected. &merged;</para>
<para role="historic">The ISO-9660 filesystem now has a hook that supports a
<para>The ISO-9660 filesystem now has a hook that supports a
loadable character conversion routine. The
<filename role="package">sysutils/cd9660_unicode</filename>
port contains a set of common conversions. &merged;</para>
@ -2220,8 +2240,6 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para role="historic">&man.ispppcontrol.8; has been deleted, and its functionality
has been folded into &man.spppcontrol.8;. &merged;</para>
<para role="historic">&man.kenv.1;, a command to dump the kernel environment, has
<para role="historic">&man.k5su.8; is no longer installed SUID
<username>root</username> 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</programlisting>
<filename>/etc/make.conf</filename> before a source
upgrade. &merged;</para>
<para>&man.kenv.1;, a command to dump the kernel environment, has
<para role="historic">&man.kenv.1;, a command to dump the kernel environment, has
been added. &merged;</para>
<para>&man.kenv.1; now has the ability to set or delete kernel

44
release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
View File

@ -14,7 +14,14 @@
<abstract>
<para>The release notes for &os; &release.current; contain a summary
of the changes made in the &os; base system since &release.prev;.
of
<![ %include.historic; [
the changes made in the &os; base system since &release.prev;.
]]>
<![ %no.include.historic; [
recent changes made to the &os; base system on the &release.branch;
development branch.
]]>
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.</para>
@ -26,8 +33,8 @@
<para>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;.</para>
<![ %release.type.snapshot [
@ -58,13 +65,27 @@
<sect1>
<title>What's New</title>
<para>This section describes the most user-visible new or changed
features in &os; since &release.prev;. Typical release note items
<para>This section describes
<![ %include.historic; [
the most user-visible new or changed features in &os;
since &release.prev;.
In general, changes described here are unique to the &release.branch;
branch unless specifically marked as &merged; features.
]]>
<![ %no.include.historic; [
many of the user-visible new or changed features in &os;
since &release.prev;. It includes items that are unique to the
&release.branch; branch, as well as some features that may have been
recently merged to
other branches (after &os; &release.prev.historic;). The later
items are marked as &merged;.
]]>
</para>
<para>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.</para>
major bugfixes, or contributed software upgrades. Applicable security
advisories issued after &release.prev; are also listed.</para>
<para>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</programlisting>
very large filesystems has been corrected. &merged;</para>
<para role="historic">The ISO-9660 filesystem now has a hook that supports a
<para>The ISO-9660 filesystem now has a hook that supports a
loadable character conversion routine. The
<filename role="package">sysutils/cd9660_unicode</filename>
port contains a set of common conversions. &merged;</para>
@ -2220,8 +2240,6 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para role="historic">&man.ispppcontrol.8; has been deleted, and its functionality
has been folded into &man.spppcontrol.8;. &merged;</para>
<para role="historic">&man.kenv.1;, a command to dump the kernel environment, has
<para role="historic">&man.k5su.8; is no longer installed SUID
<username>root</username> 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</programlisting>
<filename>/etc/make.conf</filename> before a source
upgrade. &merged;</para>
<para>&man.kenv.1;, a command to dump the kernel environment, has
<para role="historic">&man.kenv.1;, a command to dump the kernel environment, has
been added. &merged;</para>
<para>&man.kenv.1; now has the ability to set or delete kernel