From 2358c3892d4fba4b7f5e803dce493419bf2469f5 Mon Sep 17 00:00:00 2001
From: bmah <bmah@FreeBSD.org>
Date: Sun, 18 Aug 2002 04:00:06 +0000
Subject: MFCs noted:  tcsh-6.12, top 3.5b12, OpenSSL-0.9.6g.

---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml    | 6 +++---
 release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'release/doc')

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 14cc72f..0554a23 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -3605,7 +3605,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para>The &man.csh.1; shell has been replaced by &man.tcsh.1;,
 	although it can still be run as <command>csh</command>.
 	<application>tcsh</application> has been updated to version
-	6.12.</para>
+	6.12. &merged;</para>
 
       <para>The contributed version of
 	<application>tcp_wrappers</application> now includes the
@@ -3619,7 +3619,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	4.2. &merged;</para>
 
       <para><application>top</application> has been updated to version
-	3.5b12.</para>
+	3.5b12. &merged;</para>
 
       <para><application>traceroute</application> has been updated to
         LBL version 1.4a12.</para>
@@ -3818,7 +3818,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	<title>OpenSSL</title>
 
 	<para><application>OpenSSL</application> has been updated to
-	  0.9.6g.</para>
+	  0.9.6g. &merged;</para>
 
 	<para role="historic"><application>OpenSSL</application> now has support for
 	  machine-dependent ASM optimizations, activated by the new
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 14cc72f..0554a23 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -3605,7 +3605,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
       <para>The &man.csh.1; shell has been replaced by &man.tcsh.1;,
 	although it can still be run as <command>csh</command>.
 	<application>tcsh</application> has been updated to version
-	6.12.</para>
+	6.12. &merged;</para>
 
       <para>The contributed version of
 	<application>tcp_wrappers</application> now includes the
@@ -3619,7 +3619,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	4.2. &merged;</para>
 
       <para><application>top</application> has been updated to version
-	3.5b12.</para>
+	3.5b12. &merged;</para>
 
       <para><application>traceroute</application> has been updated to
         LBL version 1.4a12.</para>
@@ -3818,7 +3818,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
 	<title>OpenSSL</title>
 
 	<para><application>OpenSSL</application> has been updated to
-	  0.9.6g.</para>
+	  0.9.6g. &merged;</para>
 
 	<para role="historic"><application>OpenSSL</application> now has support for
 	  machine-dependent ASM optimizations, activated by the new
-- 
cgit v1.1