summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordd <dd@FreeBSD.org>2001-07-25 11:58:49 +0000
committerdd <dd@FreeBSD.org>2001-07-25 11:58:49 +0000
commit728ae8e8e4ad921526bb2e6df67d6c9cc1f165e9 (patch)
treeab8f18fd6feee0acf02f04d42c7ae4c83c918111
parent87a6c1715dec8fc9c822f8bc1cae83fdef14ce5b (diff)
downloadFreeBSD-src-728ae8e8e4ad921526bb2e6df67d6c9cc1f165e9.zip
FreeBSD-src-728ae8e8e4ad921526bb2e6df67d6c9cc1f165e9.tar.gz
Note MFC of {d,h}watch DDB commands.
-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 1bc8b48..ad31d89 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -216,7 +216,7 @@
<command>dhwatch</command>, have been introduced. Analogous to
<command>watch</command> and <command>dwatch</command>, they install
hardware watchpoints (as opposed to software watchpoints) if supported
- by the architecture.</para>
+ by the architecture. &merged;</para>
<para arch="i386">Support for Streaming <acronym>SIMD</acronym>
Extensions (<acronym>SSE</acronym>) has been introduced. The
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 1bc8b48..ad31d89 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -216,7 +216,7 @@
<command>dhwatch</command>, have been introduced. Analogous to
<command>watch</command> and <command>dwatch</command>, they install
hardware watchpoints (as opposed to software watchpoints) if supported
- by the architecture.</para>
+ by the architecture. &merged;</para>
<para arch="i386">Support for Streaming <acronym>SIMD</acronym>
Extensions (<acronym>SSE</acronym>) has been introduced. The
OpenPOWER on IntegriCloud