From 6aae129123c4ce8988cc67b3545db9d1ec51324b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 22 Apr 2016 18:45:30 +0200
Subject: erts: Rename erl flag +xmqd to +hmqd

Flags that control the heap should all fall under the +h flag
---
 erts/doc/src/erl.xml    | 24 +++++++++---------------
 erts/doc/src/erlang.xml | 10 ++++++----
 2 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'erts/doc')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index e13470c83c..c499fc8081 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -632,6 +632,15 @@
         <p>Sets the initial process dictionary size of processes to the size
           <c><![CDATA[Size]]></c>.</p>
       </item>
+      <tag><marker id="+hmqd"><c>+hmqd off_heap|on_heap|mixed</c></marker></tag>
+      <item><p>
+	Sets the default value for the process flag
+	<c>message_queue_data</c>. If <c>+hmqd</c> is not
+	passed, <c>mixed</c> will be the default. For more information,
+	see the documentation of
+        <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data,
+	MQD)</c></seealso>.
+      </p></item>
       <tag><c><![CDATA[+K true | false]]></c></tag>
       <item>
         <p>Enables or disables the kernel poll functionality if
@@ -1361,21 +1370,6 @@
           <seealso marker="kernel:error_logger#warning_map/0">error_logger(3)</seealso>
           for further information.</p>
       </item>
-      <tag><c><![CDATA[+xFlag Value]]></c></tag>
-      <item>
-        <p>Default process flag settings.</p>
-        <taglist>
-          <tag><marker id="+xmqd"><c>+xmqd off_heap|on_heap|mixed</c></marker></tag>
-          <item><p>
-	    Sets the default value for the process flag
-	    <c>message_queue_data</c>. If <c>+xmqd</c> is not
-	    passed, <c>mixed</c> will be the default. For more information,
-	    see the documentation of
-            <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data,
-	    MQD)</c></seealso>.
-	  </p></item>
-	</taglist>
-      </item>
       <tag><c><![CDATA[+zFlag Value]]></c></tag>
       <item>
         <p>Miscellaneous flags.</p>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 423ccdf98f..b2baf5133c 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4371,7 +4371,7 @@ os_prompt% </pre>
         </taglist>
 	<p>
 	  The default <c>message_queue_data</c> process flag is determined
-	  by the <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso>
+	  by the <seealso marker="erl#+hmqd"><c>+hmqd</c></seealso>
 	  <c>erl</c> command line argument.
 	</p>
 	<p>
@@ -4878,7 +4878,9 @@ os_prompt% </pre>
           <tag><c>{total_heap_size, <anno>Size</anno>}</c></tag>
           <item>
             <p><c><anno>Size</anno></c> is the total size, in words, of all heap
-	    fragments of the process. This includes the process stack.</p>
+	    fragments of the process. This includes the process stack and
+            any unreceived messages that are considered to be part of the
+            heap. </p>
           </item>
           <tag><c>{trace, <anno>InternalTraceFlags</anno>}</c></tag>
           <item>
@@ -5709,7 +5711,7 @@ true</pre>
 	    flag. <c><anno>MQD</anno></c> should be either <c>off_heap</c>,
 	    <c>on_heap</c>, or <c>mixed</c>. The default
 	    <c>message_queue_data</c> process flag is determined by the
-	    <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso> <c>erl</c>
+	    <seealso marker="erl#+hmqd"><c>+hmqd</c></seealso> <c>erl</c>
 	    command line argument. For more information, see the
 	    documentation of
             <seealso marker="#process_flag_message_queue_data"><c>process_flag(message_queue_data,
@@ -7388,7 +7390,7 @@ ok
             <p>Returns the default value of the <c>message_queue_data</c>
 	    process flag which is either <c>off_heap</c>, <c>on_heap</c>, or <c>mixed</c>.
 	    This default is set by the <c>erl</c> command line argument
-	    <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso>. For more information on the
+	    <seealso marker="erl#+hmqd"><c>+hmqd</c></seealso>. For more information on the
 	    <c>message_queue_data</c> process flag, see documentation of
             <seealso marker="#process_flag_message_queue_data"><c>process_flag(message_queue_data,
 	    MQD)</c></seealso>.</p>
-- 
cgit v1.2.3