From f8c639ee65728e434630881cfc939fd466ea977f Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 22 Feb 2007 05:31:39 +0000
Subject: [PATCH] Mention that BSD gzip was MFC'ed

---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 624f2e2a9d55..d1465ff3219c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1759,7 +1759,8 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
       to 4.17.</para>
 
     <para>The GNU version of <application>gzip</application> has been
-      replaced with a version of gzip imported from NetBSD.</para>
+      replaced with a modified version of gzip ported from NetBSD.
+      &merged;</para>
 
     <para><application>netcat</application> has been updated from the
       version in a 4 February 2005 OpenBSD snapshot to the version