summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authordd <dd@FreeBSD.org>2001-05-05 02:37:46 +0000
committerdd <dd@FreeBSD.org>2001-05-05 02:37:46 +0000
commitec21be31c5920d1de98a76a3bd9b4c4c92e960b2 (patch)
tree24982fc4d3f97b5f7b4bb0dd8c0d3184da30a12c /release
parente190db98b6211866c45f7ca4325ce15dcb6f0c32 (diff)
downloadFreeBSD-src-ec21be31c5920d1de98a76a3bd9b4c4c92e960b2.zip
FreeBSD-src-ec21be31c5920d1de98a76a3bd9b4c4c92e960b2.tar.gz
Use &merged; entity where appropriate.
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml2
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml2
-rw-r--r--release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml2
3 files changed, 3 insertions, 3 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 7127907..9bc1fb2 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -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>
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 7127907..9bc1fb2 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -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>
diff --git a/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
index 7127907..9bc1fb2 100644
--- a/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
@@ -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>
OpenPOWER on IntegriCloud