summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2002-03-22 05:38:50 +0000
committerbmah <bmah@FreeBSD.org>2002-03-22 05:38:50 +0000
commitf6e5ef2ebf22baf11b9b029d0318544fbf550bca (patch)
tree0fa26368b7234daf88b0269165832661642c9da7 /release
parentb8113dab24b8e87485eba5743693cddb77150da7 (diff)
downloadFreeBSD-src-f6e5ef2ebf22baf11b9b029d0318544fbf550bca.zip
FreeBSD-src-f6e5ef2ebf22baf11b9b029d0318544fbf550bca.tar.gz
MFCs noted: ata(4) RAID rebuild, atacontrol(8).
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml4
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml4
2 files changed, 4 insertions, 4 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index bfda6ea..d0095fa 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -989,7 +989,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>The &man.ata.4; driver now has support for rebuilding
failed drives in a RAID1 configuration, under control of
- &man.atacontrol.8;</para>
+ &man.atacontrol.8;. &merged;</para>
<para>The BurnProof(TM) feature, for applicable ATAPI CD-ROM
burners, is now supported. &merged;</para>
@@ -1686,7 +1686,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
those types.</para>
<para>&man.atacontrol.8; has been added to control various aspects
- of the &man.ata.4; driver.</para>
+ of the &man.ata.4; driver. &merged;</para>
<para arch="sparc64">The system &man.awk.1; refers to
<application>BWK awk</application> on the &arch; platform. It
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 bfda6ea..d0095fa 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -989,7 +989,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>The &man.ata.4; driver now has support for rebuilding
failed drives in a RAID1 configuration, under control of
- &man.atacontrol.8;</para>
+ &man.atacontrol.8;. &merged;</para>
<para>The BurnProof(TM) feature, for applicable ATAPI CD-ROM
burners, is now supported. &merged;</para>
@@ -1686,7 +1686,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
those types.</para>
<para>&man.atacontrol.8; has been added to control various aspects
- of the &man.ata.4; driver.</para>
+ of the &man.ata.4; driver. &merged;</para>
<para arch="sparc64">The system &man.awk.1; refers to
<application>BWK awk</application> on the &arch; platform. It
OpenPOWER on IntegriCloud