From 8e51375a7144d39759424c52bfcfd1f06f26db2c Mon Sep 17 00:00:00 2001
From: "Bruce A. Mah" <bmah@FreeBSD.org>
Date: Fri, 17 May 2002 16:11:36 +0000
Subject: [PATCH] MFC noted:  cdcontrol(1) speed.

Minor wording tweaks in ports infrastructure section.
---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml    | 8 ++++----
 release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 0e03d594f3d..8209cfe3516 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1849,7 +1849,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 
     <para>On ATAPI CDROM drives, &man.cdcontrol.1; now supports a
       <literal>speed</literal> command to set the maximum speed to be
-      used by the drive.</para>
+      used by the drive. &merged;</para>
 
     <para>&man.chflags.1; has moved from <filename>/usr/bin</filename>
       to <filename>/bin</filename>.</para>
@@ -3482,7 +3482,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
     </sect3>
 
     <sect3>
-      <title>Ports/Packages Collection</title>
+      <title>Ports/Packages Collection Infrastructure</title>
 
       <para><application>BSDPAN</application>, a collection of modules
 	that provides tighter integration of
@@ -3573,10 +3573,10 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	directory from which a package was built. &merged;</para>
 
       <para>The Ports Collection infrastructure now uses
-        <application>XFree86</application> 4.X as the default version
+        <application>XFree86</application> 4.2.0 as the default version
         of the X Window System for the purposes of satisfying
         dependencies.  To return to using
-        <application>XFree86</application> 3.X, add the following line
+        <application>XFree86</application> 3.3.6, add the following line
         to <filename>/etc/make.conf</filename>: &merged;</para>
 
       <programlisting>XFREE86_VERSION=3</programlisting>
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 0e03d594f3d..8209cfe3516 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1849,7 +1849,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 
     <para>On ATAPI CDROM drives, &man.cdcontrol.1; now supports a
       <literal>speed</literal> command to set the maximum speed to be
-      used by the drive.</para>
+      used by the drive. &merged;</para>
 
     <para>&man.chflags.1; has moved from <filename>/usr/bin</filename>
       to <filename>/bin</filename>.</para>
@@ -3482,7 +3482,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
     </sect3>
 
     <sect3>
-      <title>Ports/Packages Collection</title>
+      <title>Ports/Packages Collection Infrastructure</title>
 
       <para><application>BSDPAN</application>, a collection of modules
 	that provides tighter integration of
@@ -3573,10 +3573,10 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	directory from which a package was built. &merged;</para>
 
       <para>The Ports Collection infrastructure now uses
-        <application>XFree86</application> 4.X as the default version
+        <application>XFree86</application> 4.2.0 as the default version
         of the X Window System for the purposes of satisfying
         dependencies.  To return to using
-        <application>XFree86</application> 3.X, add the following line
+        <application>XFree86</application> 3.3.6, add the following line
         to <filename>/etc/make.conf</filename>: &merged;</para>
 
       <programlisting>XFREE86_VERSION=3</programlisting>