aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2005-02-23 18:30:57 +0000
committerHiroki Sato <hrs@FreeBSD.org>2005-02-23 18:30:57 +0000
commit261ec94a87b521bb8be7cddbc0ee96a3a0e888f8 (patch)
tree463b98011f70d78a8af169c38582b383856d50fc
parent469f8a6aca445140f6f32a30071f484558570a52 (diff)
Notes
-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 57e844532eeb..34497b4b81ee 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -127,8 +127,8 @@
been removed. Users running this class of CPU should use &os;
5.<replaceable>X</replaceable> or earlier.</para>
- <para>The loader tunable <varname>debug.mpsafevm</varname> has been
- has been enabled by default.</para>
+ <para arch="alpha,amd64,i386">The loader tunable <varname>debug.mpsafevm</varname>
+ has been enabled by default. &merged;</para>
<para>&man.memguard.9;, a kernel memory allocator designed to help detect
<quote>tamper-after-free</quote> scenarios, has been added.
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 57e844532eeb..34497b4b81ee 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -127,8 +127,8 @@
been removed. Users running this class of CPU should use &os;
5.<replaceable>X</replaceable> or earlier.</para>
- <para>The loader tunable <varname>debug.mpsafevm</varname> has been
- has been enabled by default.</para>
+ <para arch="alpha,amd64,i386">The loader tunable <varname>debug.mpsafevm</varname>
+ has been enabled by default. &merged;</para>
<para>&man.memguard.9;, a kernel memory allocator designed to help detect
<quote>tamper-after-free</quote> scenarios, has been added.