summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2007-07-11 13:19:20 +0000
committerdelphij <delphij@FreeBSD.org>2007-07-11 13:19:20 +0000
commita0e02f86c06ab807051f8c40db4f3045d0dac429 (patch)
tree1ecba2854078e25c5032b50e86c6a79db6fa1c73 /release
parent8ca75dd4fad125838a089e8a449cb90e595eeace (diff)
downloadFreeBSD-src-a0e02f86c06ab807051f8c40db4f3045d0dac429.zip
FreeBSD-src-a0e02f86c06ab807051f8c40db4f3045d0dac429.tar.gz
Mention that BZIP2 1.0.4 was MFC'ed.
Approved by: re (bmah)
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index c0a9129..317dcc5 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -2179,7 +2179,8 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
1.11 to 1.12.</para>
<para><application>BZIP2</application> has been updated from
- 1.0.3 to 1.0.4.</para>
+ 1.0.3 to 1.0.4.
+ &merged;</para>
<para>GNU <application>Diffutils</application> has been updated
from 2.7 to 2.8.7.</para>
OpenPOWER on IntegriCloud