summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordd <dd@FreeBSD.org>2001-08-03 12:31:43 +0000
committerdd <dd@FreeBSD.org>2001-08-03 12:31:43 +0000
commit07a5285107df49947d1473ff86c0cddd6efceca2 (patch)
tree0f2211ad249c0f953f425488eb5c1420ef2eafb5
parent913af295fd2e1e1e57f2b9a705cf3df05c7dd9bc (diff)
downloadFreeBSD-src-07a5285107df49947d1473ff86c0cddd6efceca2.zip
FreeBSD-src-07a5285107df49947d1473ff86c0cddd6efceca2.tar.gz
Note MFC of file 3.36.
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml3
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml3
2 files changed, 4 insertions, 2 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index d357f8c..9912c1a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1708,7 +1708,8 @@
<para>The &man.ee.1; <application>Easy Editor</application> has
been updated to 1.4.2. &merged;</para>
- <para><application>file</application> has been updated to 3.36.</para>
+ <para><application>file</application> has been updated to 3.36.
+ &merged;</para>
<para>&man.awk.1;, in the form of
<application>gawk</application>, has been updated from 3.0.4 to 3.0.6.
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 d357f8c..9912c1a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1708,7 +1708,8 @@
<para>The &man.ee.1; <application>Easy Editor</application> has
been updated to 1.4.2. &merged;</para>
- <para><application>file</application> has been updated to 3.36.</para>
+ <para><application>file</application> has been updated to 3.36.
+ &merged;</para>
<para>&man.awk.1;, in the form of
<application>gawk</application>, has been updated from 3.0.4 to 3.0.6.
OpenPOWER on IntegriCloud