summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml9
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml9
2 files changed, 8 insertions, 10 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index e1dfecf..0c86522 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1601,7 +1601,7 @@
<option>-D</option> (debugging) flag has been withdrawn.
&man.install.1; now issues a warning if <option>-d</option>
(create directories) and <option>-C</option> (copy changed files
- only) are used together.</para>
+ only) are used together. &merged;</para>
<para>&man.whois.1; now directs queries for IP addresses to
ARIN. &merged; If a query to ARIN references APNIC or RIPE, the
@@ -1700,7 +1700,7 @@
<para><application>bzip2</application> 1.0.1 has been imported; this
brings the &man.bzip2.1; program and the <filename>libbz2</filename>
- library to the base system.</para>
+ library to the base system. &merged;</para>
<para><application>cvs</application> has been updated to
1.11. &merged;</para>
@@ -1708,8 +1708,7 @@
<para>The &man.ee.1; <application>Easy Editor</application> has
been updated to 1.4.2. &merged;</para>
- <para>&man.file.1; has been contribify-ed, and updated to version
- 3.35.</para>
+ <para><application>file</application> has been updated to 3.36.</para>
<para>&man.awk.1;, in the form of
<application>gawk</application>, has been upgraded from 3.0.4 to 3.0.6.
@@ -1753,7 +1752,7 @@
been imported at 3.5.8. &merged;</para>
<para><application>libpcap</application> has been updated to
- 0.6.2.</para>
+ 0.6.2. &merged;</para>
<para><application>libreadline</application> has been upgraded to
4.2.</para>
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 e1dfecf..0c86522 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1601,7 +1601,7 @@
<option>-D</option> (debugging) flag has been withdrawn.
&man.install.1; now issues a warning if <option>-d</option>
(create directories) and <option>-C</option> (copy changed files
- only) are used together.</para>
+ only) are used together. &merged;</para>
<para>&man.whois.1; now directs queries for IP addresses to
ARIN. &merged; If a query to ARIN references APNIC or RIPE, the
@@ -1700,7 +1700,7 @@
<para><application>bzip2</application> 1.0.1 has been imported; this
brings the &man.bzip2.1; program and the <filename>libbz2</filename>
- library to the base system.</para>
+ library to the base system. &merged;</para>
<para><application>cvs</application> has been updated to
1.11. &merged;</para>
@@ -1708,8 +1708,7 @@
<para>The &man.ee.1; <application>Easy Editor</application> has
been updated to 1.4.2. &merged;</para>
- <para>&man.file.1; has been contribify-ed, and updated to version
- 3.35.</para>
+ <para><application>file</application> has been updated to 3.36.</para>
<para>&man.awk.1;, in the form of
<application>gawk</application>, has been upgraded from 3.0.4 to 3.0.6.
@@ -1753,7 +1752,7 @@
been imported at 3.5.8. &merged;</para>
<para><application>libpcap</application> has been updated to
- 0.6.2.</para>
+ 0.6.2. &merged;</para>
<para><application>libreadline</application> has been upgraded to
4.2.</para>
OpenPOWER on IntegriCloud