summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2006-07-25 21:48:28 +0000
committerbmah <bmah@FreeBSD.org>2006-07-25 21:48:28 +0000
commitac9fb55e4032e6fd5eec0e0a72543cfa27615e80 (patch)
tree30902237e37b083ad57960d7807b68ba98423697 /release
parente18f13876305128e9119c1ac056d0f522e2aa310 (diff)
downloadFreeBSD-src-ac9fb55e4032e6fd5eec0e0a72543cfa27615e80.zip
FreeBSD-src-ac9fb55e4032e6fd5eec0e0a72543cfa27615e80.tar.gz
MFC noted: minidumps.
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 23fc6a1..ed8c586 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -289,7 +289,7 @@
memory in a kernel crash dump, the kernel now defaults to dumping only pages that are
actively mapped into kernel virtual memory. A new
<varname>debug.minidump</varname> sysctl variable
- can be used to turn off this behavior when set to zero.</para>
+ can be used to turn off this behavior when set to zero. &merged;</para>
<para>A new sysctl variable <varname>kern.malloc_stats</varname>
has been added. This allows exporting of kernel malloc
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 23fc6a1..ed8c586 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -289,7 +289,7 @@
memory in a kernel crash dump, the kernel now defaults to dumping only pages that are
actively mapped into kernel virtual memory. A new
<varname>debug.minidump</varname> sysctl variable
- can be used to turn off this behavior when set to zero.</para>
+ can be used to turn off this behavior when set to zero. &merged;</para>
<para>A new sysctl variable <varname>kern.malloc_stats</varname>
has been added. This allows exporting of kernel malloc
OpenPOWER on IntegriCloud