summaryrefslogtreecommitdiffstats
path: root/release/doc
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2002-08-18 04:00:06 +0000
committerbmah <bmah@FreeBSD.org>2002-08-18 04:00:06 +0000
commit2358c3892d4fba4b7f5e803dce493419bf2469f5 (patch)
treef0baddd14a95356325b8b2726db966f6d56d978d /release/doc
parentcbad7da0ab2b419ec22ba8825928782e9d755bda (diff)
downloadFreeBSD-src-2358c3892d4fba4b7f5e803dce493419bf2469f5.zip
FreeBSD-src-2358c3892d4fba4b7f5e803dce493419bf2469f5.tar.gz
MFCs noted: tcsh-6.12, top 3.5b12, OpenSSL-0.9.6g.
Diffstat (limited to 'release/doc')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml6
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml6
2 files changed, 6 insertions, 6 deletions
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
OpenPOWER on IntegriCloud