From 30e97f13e85efdc2d68282996cc6f907fc1cf9d6 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 2 Dec 2013 18:21:16 +0100
Subject: Documentation fix

---
 erts/doc/src/erlang.xml     | 6 +++++-
 erts/doc/src/erts_alloc.xml | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'erts')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index bc38055b62..287346340c 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5316,7 +5316,11 @@ ok
 	       As of erts version 5.6.1 the return value is a list
 	       of <c>{instance, InstanceNo, InstanceInfo}</c> tuples
 	       where <c>InstanceInfo</c> contains information about
-	       a specific instance of the allocator.
+	       a specific instance of the allocator. As of erts version
+	       5.10.4 the returned list when calling
+	       <c>erlang:system_info({allocator, mseg_alloc})</c> also
+	       include an <c>{erts_mmap, _}</c> tuple as one element
+	       in the list.
 	       If <c><anno>Alloc</anno></c> is not a recognized allocator,
               <c>undefined</c> is returned. If <c><anno>Alloc</anno></c> is disabled,
               <c>false</c> is returned.</p>
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index a0ec89f398..49ee740a73 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -332,8 +332,11 @@
 	Set super carrier size (in MB). The super carrier size defaults to
 	zero; i.e, the super carrier is by default disabled. The super
 	carrier is a large continuous area in the virtual address space.
-	The system will always try to create new carriers in the super
-	carrier.
+	<c>mseg_alloc</c> will always try to create new carriers in the super
+	carrier if it exists. Note that the <c>alloc_util</c> framework may
+	create <c>sys_alloc</c> carriers. For more information on this, see the
+	documentation of the <seealso marker="#MMsco"><c>+MMsco</c></seealso>
+	flag.
 	<br/><br/>
 	<em>NOTE</em>: The super carrier cannot be enabled nor
 	disabled on halfword heap systems. This flag will be
-- 
cgit v1.2.3