Updated release notes: ACPIA CA 20020815, Binutils 2.12.1

(fix snapshot date), XFree86 4.2.1.

MFCs noted:  linux_base 7.1.

2 files changed, 12 insertions, 12 deletions

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 29c173c..57cdb44 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1553,7 +1553,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	(ACPI), a multi-vendor standard for configuration and power
 	management, has been added.  This functionality has been
 	provided by the <application>Intel ACPI Component
-	Architecture</application> project, as of the ACPI CA 20020725
+	Architecture</application> project, as of the ACPI CA 20020815
 	snapshot.  Some backward compatability for applications using
 	the older APM standard has been provided.</para>
 
@@ -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). &merged;</para>
+	2.12.1 (specifically, a post-release snapshot from 20 July 2002). &merged;</para>
 
       <para role="historic"><application>bzip2</application> 1.0.2 has been imported;
 	this brings the &man.bzip2.1; program and the
@@ -4136,20 +4136,20 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	programs such as &man.pkg.version.1; to determine the
 	directory from which a package was built. &merged;</para>
 
-      <para role="historic">The Ports Collection infrastructure now uses
-        <application>XFree86</application> 4.2.0 as the default version
+      <para>The Ports Collection infrastructure now uses
+        <application>XFree86</application> 4.2.1 as the default version
         of the X Window System for the purposes of satisfying
         dependencies.  To return to using
         <application>XFree86</application> 3.3.6, add the following line
         to <filename>/etc/make.conf</filename>: &merged;</para>
 
-      <programlisting role="historic">XFREE86_VERSION=3</programlisting>
+      <programlisting>XFREE86_VERSION=3</programlisting>
 
       <para>The libraries installed by the <filename
 	role="package">emulators/linux_base</filename> port (required
 	for Linux emulation) have been updated; they now correspond to
 	those included with <application>Red Hat Linux</application>
-	7.1.</para>
+	7.1. &merged;</para>
 
       <para>By default, packages generated by the Ports Collection (as
 	well as the packages on the FTP sites) are now compressed
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 29c173c..57cdb44 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1553,7 +1553,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	(ACPI), a multi-vendor standard for configuration and power
 	management, has been added.  This functionality has been
 	provided by the <application>Intel ACPI Component
-	Architecture</application> project, as of the ACPI CA 20020725
+	Architecture</application> project, as of the ACPI CA 20020815
 	snapshot.  Some backward compatability for applications using
 	the older APM standard has been provided.</para>
 
@@ -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). &merged;</para>
+	2.12.1 (specifically, a post-release snapshot from 20 July 2002). &merged;</para>
 
       <para role="historic"><application>bzip2</application> 1.0.2 has been imported;
 	this brings the &man.bzip2.1; program and the
@@ -4136,20 +4136,20 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	programs such as &man.pkg.version.1; to determine the
 	directory from which a package was built. &merged;</para>
 
-      <para role="historic">The Ports Collection infrastructure now uses
-        <application>XFree86</application> 4.2.0 as the default version
+      <para>The Ports Collection infrastructure now uses
+        <application>XFree86</application> 4.2.1 as the default version
         of the X Window System for the purposes of satisfying
         dependencies.  To return to using
         <application>XFree86</application> 3.3.6, add the following line
         to <filename>/etc/make.conf</filename>: &merged;</para>
 
-      <programlisting role="historic">XFREE86_VERSION=3</programlisting>
+      <programlisting>XFREE86_VERSION=3</programlisting>
 
       <para>The libraries installed by the <filename
 	role="package">emulators/linux_base</filename> port (required
 	for Linux emulation) have been updated; they now correspond to
 	those included with <application>Red Hat Linux</application>
-	7.1.</para>
+	7.1. &merged;</para>
 
       <para>By default, packages generated by the Ports Collection (as
 	well as the packages on the FTP sites) are now compressed