summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2002-07-18 16:06:46 +0000
committerbmah <bmah@FreeBSD.org>2002-07-18 16:06:46 +0000
commitc147de1e61eb54990ffe00853ecb6d5032576e2b (patch)
tree7e0d85764228d787c0e05ef6b274d3b126279818 /release
parentc5b0a0ebfee6c5ca7d4e75866b9a9bc8faf04c79 (diff)
downloadFreeBSD-src-c147de1e61eb54990ffe00853ecb6d5032576e2b.zip
FreeBSD-src-c147de1e61eb54990ffe00853ecb6d5032576e2b.tar.gz
MFCs noted: OPIE 2.4, OpenBSD m4 20020426, GNU tar 1.3.25.
Diffstat (limited to 'release')
-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 06255e1..af9888a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -3390,7 +3390,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
available as &man.lukemftpd.8;. &merged;</para>
<para>&man.m4.1; has been imported from OpenBSD, as of 26 April
- 2002.</para>
+ 2002. &merged;</para>
<para><application>ncurses</application> has been updated to
5.2-20020615.</para>
@@ -3406,7 +3406,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>The <application>OPIE</application> one-time-password
suite has been updated to 2.4. It has completely
replaced the functionality of
- <application>S/Key</application>.</para>
+ <application>S/Key</application>. &merged;</para>
<para><application>Perl</application> has been removed from the
&os; base system. It can still be installed from the &os;
@@ -3464,7 +3464,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
5 June 2002 has, been imported.</para>
<para><application>GNU tar</application> has been updated to
- 1.13.25.</para>
+ 1.13.25. &merged;</para>
<para><application>tcpdump</application> has been updated to
3.7.1. &merged;</para>
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 06255e1..af9888a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -3390,7 +3390,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
available as &man.lukemftpd.8;. &merged;</para>
<para>&man.m4.1; has been imported from OpenBSD, as of 26 April
- 2002.</para>
+ 2002. &merged;</para>
<para><application>ncurses</application> has been updated to
5.2-20020615.</para>
@@ -3406,7 +3406,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>The <application>OPIE</application> one-time-password
suite has been updated to 2.4. It has completely
replaced the functionality of
- <application>S/Key</application>.</para>
+ <application>S/Key</application>. &merged;</para>
<para><application>Perl</application> has been removed from the
&os; base system. It can still be installed from the &os;
@@ -3464,7 +3464,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
5 June 2002 has, been imported.</para>
<para><application>GNU tar</application> has been updated to
- 1.13.25.</para>
+ 1.13.25. &merged;</para>
<para><application>tcpdump</application> has been updated to
3.7.1. &merged;</para>
OpenPOWER on IntegriCloud