summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2002-04-21 06:33:20 +0000
committerbmah <bmah@FreeBSD.org>2002-04-21 06:33:20 +0000
commit4e1d1a540034a980eab04b7f5bab38a2b20fa4ef (patch)
tree09e771f7c26869ecf3d3db16d9e040f8c0c0f8e3 /release
parenta39ea225ca53ef49011d1361452e1ca47bc9c49a (diff)
downloadFreeBSD-src-4e1d1a540034a980eab04b7f5bab38a2b20fa4ef.zip
FreeBSD-src-4e1d1a540034a980eab04b7f5bab38a2b20fa4ef.tar.gz
Un-do note of MFC of inetd change.
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
2 files changed, 2 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 60a42e2..5470de2 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -2049,7 +2049,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>By default, &man.inetd.8; is no longer run by &man.rc.8; at
boot-time, although &man.sysinstall.8; gives the option of
- enabling it during binary installations. &merged; &man.inetd.8; can also
+ enabling it during binary installations. &man.inetd.8; can also
be enabled by adding the following line to
<filename>/etc/rc.conf</filename>:</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 60a42e2..5470de2 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -2049,7 +2049,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>By default, &man.inetd.8; is no longer run by &man.rc.8; at
boot-time, although &man.sysinstall.8; gives the option of
- enabling it during binary installations. &merged; &man.inetd.8; can also
+ enabling it during binary installations. &man.inetd.8; can also
be enabled by adding the following line to
<filename>/etc/rc.conf</filename>:</para>
OpenPOWER on IntegriCloud