Arrgh. Back out rev. 1.366. This did fix problems but picked up

some other local changes I didn't want to commit yet.

2 files changed, 26 insertions, 62 deletions

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index adad49c..988a59d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -14,14 +14,7 @@
 
   <abstract>
     <para>The release notes for &os; &release.current; contain a summary
-      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.
-]]>
+      of the changes made in the &os; base system since &release.prev;.
       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>
@@ -33,8 +26,8 @@
 
   <para>This document contains the release notes for &os;
     &release.current; on the &arch.print; hardware platform.  It
-    describes recently added, changed, or deleted features of &os;.
-    It also provides some notes on upgrading
+    describes new features of &os; that have been added (or changed)
+    since &release.prev;.  It also provides some notes on upgrading
     from previous versions of &os;.</para>
 
 <![ %release.type.snapshot [
@@ -65,27 +58,13 @@
 <sect1>
   <title>What's New</title>
 
-  <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
+  <para>This section describes the most user-visible new or changed
+    features in &os; since &release.prev;.  Typical release note items
     document new drivers or hardware support, new commands or options,
-    major bugfixes, or contributed software upgrades.  Applicable security
-    advisories issued after &release.prev; are also listed.</para>
+    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>
 
   <para>Many additional changes were made to &os; that are not listed
     here for lack of space.  For example, documentation was corrected
@@ -1196,6 +1175,7 @@ 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>
@@ -2240,6 +2220,8 @@ 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
@@ -2248,7 +2230,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <filename>/etc/make.conf</filename> before a source
       upgrade. &merged;</para>
 
-    <para role="historic">&man.kenv.1;, a command to dump the kernel environment, has
+    <para>&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
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 adad49c..988a59d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -14,14 +14,7 @@
 
   <abstract>
     <para>The release notes for &os; &release.current; contain a summary
-      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.
-]]>
+      of the changes made in the &os; base system since &release.prev;.
       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>
@@ -33,8 +26,8 @@
 
   <para>This document contains the release notes for &os;
     &release.current; on the &arch.print; hardware platform.  It
-    describes recently added, changed, or deleted features of &os;.
-    It also provides some notes on upgrading
+    describes new features of &os; that have been added (or changed)
+    since &release.prev;.  It also provides some notes on upgrading
     from previous versions of &os;.</para>
 
 <![ %release.type.snapshot [
@@ -65,27 +58,13 @@
 <sect1>
   <title>What's New</title>
 
-  <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
+  <para>This section describes the most user-visible new or changed
+    features in &os; since &release.prev;.  Typical release note items
     document new drivers or hardware support, new commands or options,
-    major bugfixes, or contributed software upgrades.  Applicable security
-    advisories issued after &release.prev; are also listed.</para>
+    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>
 
   <para>Many additional changes were made to &os; that are not listed
     here for lack of space.  For example, documentation was corrected
@@ -1196,6 +1175,7 @@ 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>
@@ -2240,6 +2220,8 @@ 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
@@ -2248,7 +2230,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <filename>/etc/make.conf</filename> before a source
       upgrade. &merged;</para>
 
-    <para role="historic">&man.kenv.1;, a command to dump the kernel environment, has
+    <para>&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