From 0d567ca5092b684e3848b90d06cef52ebe2ef3b2 Mon Sep 17 00:00:00 2001
From: "Bruce A. Mah" <bmah@FreeBSD.org>
Date: Fri, 21 Dec 2001 18:17:32 +0000
Subject: [PATCH] MFCs noted:  route(8) -ifa/-ifp, NTP 4.1.0.

---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml    | 4 ++--
 release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 4 ++--
 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 7c3f073a829b..41b03f82c374 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 7c3f073a829b..41b03f82c374 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