summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2001-12-21 18:17:32 +0000
committerbmah <bmah@FreeBSD.org>2001-12-21 18:17:32 +0000
commit8110e66501f0c1aa3945049b43f2d9cb51fd02da (patch)
treecfe0e7dd9b543cf97b907aad3867edec3e5a4aba /release
parent5e8b04ff7fcdddd956aa14d066f0528583cdde6e (diff)
downloadFreeBSD-src-8110e66501f0c1aa3945049b43f2d9cb51fd02da.zip
FreeBSD-src-8110e66501f0c1aa3945049b43f2d9cb51fd02da.tar.gz
MFCs noted: route(8) -ifa/-ifp, NTP 4.1.0.
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml4
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml4
2 files changed, 4 insertions, 4 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 7c3f073..41b03f8 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -2029,7 +2029,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>The &man.route.8; <option>add</option> command now supports
the <option>-ifp</option> and <option>-ifa</option>
- modifiers.</para>
+ modifiers. &merged;</para>
<para>&man.rpcbind.8; has replaced &man.portmap.8;.</para>
@@ -2392,7 +2392,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
5.2-20010512.</para>
<para>The <application>NTP</application> suite of programs has been
- updated to 4.1.0.</para>
+ updated to 4.1.0. &merged;</para>
<para>The <application>OPIE</application> one-time-password suite
has been updated to 2.32. &merged; It has completely replaced
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 7c3f073..41b03f8 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -2029,7 +2029,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>The &man.route.8; <option>add</option> command now supports
the <option>-ifp</option> and <option>-ifa</option>
- modifiers.</para>
+ modifiers. &merged;</para>
<para>&man.rpcbind.8; has replaced &man.portmap.8;.</para>
@@ -2392,7 +2392,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
5.2-20010512.</para>
<para>The <application>NTP</application> suite of programs has been
- updated to 4.1.0.</para>
+ updated to 4.1.0. &merged;</para>
<para>The <application>OPIE</application> one-time-password suite
has been updated to 2.32. &merged; It has completely replaced
OpenPOWER on IntegriCloud