From 6bb5aa6eaf6fa88a91a2d811fe133d4e0672a117 Mon Sep 17 00:00:00 2001
From: bmah <bmah@FreeBSD.org>
Date: Tue, 3 Sep 2002 01:07:32 +0000
Subject: Modified release notes:  Remote note about enabling rnNG (it's now on
 by default), cvs 1.11.2.

MFCs noted:  Binutils 2.12.1 20020622 snapshot.
---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml    | 16 ++++------------
 release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 16 ++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 7214d81..29c173c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -3535,7 +3535,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	8.3.3. &merged;</para>
 
       <para><application>Binutils</application> has been updated to
-	2.12.1 (specifically, a post-release snapshot from 22 June 2002).</para>
+	2.12.1 (specifically, a post-release snapshot from 22 June 2002). &merged;</para>
 
       <para role="historic"><application>bzip2</application> 1.0.2 has been imported;
 	this brings the &man.bzip2.1; program and the
@@ -3677,15 +3677,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
         imported.  It breaks down the system startup functionality
         into a number of small, <quote>task-oriented</quote> scripts
         in <filename>/etc/rc.d</filename>, with dynamic-determined
-        ordering of startup scripts performed at boot-time.
-
-	<note>
-	  <para>This feature is currently disabled by default.  It can
-	    be enabled by setting <literal>rc_ng="YES"</literal> in
-	    <filename>/etc/rc.conf</filename>.</para>
-	</note>
-
-	</para>
+        ordering of startup scripts performed at boot-time.</para>
 
       <para role="historic">&man.routed.8; has been updated to version
 	2.22. &merged;</para>
@@ -3739,8 +3731,8 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <sect4>
 	<title>CVS</title>
 
-	<para role="historic"><application>cvs</application> has been updated to
-	  1.11.1p1. &merged;</para>
+	<para><application>cvs</application> has been updated to
+	  1.11.2.</para>
 
 	<para role="historic">The default value for &man.cvs.1;'s
 	  <envar>CVS_RSH</envar> variable is now
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 7214d81..29c173c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -3535,7 +3535,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	8.3.3. &merged;</para>
 
       <para><application>Binutils</application> has been updated to
-	2.12.1 (specifically, a post-release snapshot from 22 June 2002).</para>
+	2.12.1 (specifically, a post-release snapshot from 22 June 2002). &merged;</para>
 
       <para role="historic"><application>bzip2</application> 1.0.2 has been imported;
 	this brings the &man.bzip2.1; program and the
@@ -3677,15 +3677,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
         imported.  It breaks down the system startup functionality
         into a number of small, <quote>task-oriented</quote> scripts
         in <filename>/etc/rc.d</filename>, with dynamic-determined
-        ordering of startup scripts performed at boot-time.
-
-	<note>
-	  <para>This feature is currently disabled by default.  It can
-	    be enabled by setting <literal>rc_ng="YES"</literal> in
-	    <filename>/etc/rc.conf</filename>.</para>
-	</note>
-
-	</para>
+        ordering of startup scripts performed at boot-time.</para>
 
       <para role="historic">&man.routed.8; has been updated to version
 	2.22. &merged;</para>
@@ -3739,8 +3731,8 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <sect4>
 	<title>CVS</title>
 
-	<para role="historic"><application>cvs</application> has been updated to
-	  1.11.1p1. &merged;</para>
+	<para><application>cvs</application> has been updated to
+	  1.11.2.</para>
 
 	<para role="historic">The default value for &man.cvs.1;'s
 	  <envar>CVS_RSH</envar> variable is now
-- 
cgit v1.1