Use &merged; entity where appropriate.

This commit is contained in:
Dima Dorfman 2001-05-05 02:37:46 +00:00
parent 7bf3e9d86b
commit 6e802e305e
3 changed files with 3 additions and 3 deletions

View File

@ -955,7 +955,7 @@
<para>Catching up with most other network utilities in the base
system, &man.lpr.1;, &man.lpd.8;, &man.syslogd.8;, and
&man.logger.1; are now all IPv6-capable. [MERGED]</para>
&man.logger.1; are now all IPv6-capable. &merged;</para>
<para arch="i386"><filename>libdisk</filename> can now do
install-time configuration of the &arch; <filename>boot0</filename>

View File

@ -955,7 +955,7 @@
<para>Catching up with most other network utilities in the base
system, &man.lpr.1;, &man.lpd.8;, &man.syslogd.8;, and
&man.logger.1; are now all IPv6-capable. [MERGED]</para>
&man.logger.1; are now all IPv6-capable. &merged;</para>
<para arch="i386"><filename>libdisk</filename> can now do
install-time configuration of the &arch; <filename>boot0</filename>

View File

@ -955,7 +955,7 @@
<para>Catching up with most other network utilities in the base
system, &man.lpr.1;, &man.lpd.8;, &man.syslogd.8;, and
&man.logger.1; are now all IPv6-capable. [MERGED]</para>
&man.logger.1; are now all IPv6-capable. &merged;</para>
<para arch="i386"><filename>libdisk</filename> can now do
install-time configuration of the &arch; <filename>boot0</filename>