From 3ac08f9b668613a4292436979eacc61863c2ab94 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Wed, 16 Sep 2015 15:02:50 +0200
Subject: Fragmented young heap generation and off_heap_message_queue option

* The youngest generation of the heap can now consist of multiple
  blocks. Heap fragments and message fragments are added to the
  youngest generation when needed without triggering a GC. After
  a GC the youngest generation is contained in one single block.
* The off_heap_message_queue process flag has been added. When
  enabled all message data in the queue is kept off heap. When
  a message is selected from the queue, the message fragment (or
  heap fragment) containing the actual message is attached to the
  youngest generation. Messages stored off heap is not part of GC.
---
 erts/doc/src/erl.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'erts/doc/src/erl.xml')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index b0322b7d43..8c1be4dff5 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -1335,6 +1335,21 @@
           <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="+xohmq"><c>+xohmq true|false</c></marker></tag>
+          <item><p>
+	    Sets the default value for the process flag
+	    <c>off_heap_message_queue</c>. If <c>+xohmq</c> is not
+	    passed, <c>false</c> will be the default. For more information,
+	    see the documentation of
+            <seealso marker="erlang#process_flag_off_heap_message_queue"><c>process_flag(off_heap_message_queue,
+	    OHMQ)</c></seealso>.
+	  </p></item>
+	</taglist>
+      </item>
       <tag><c><![CDATA[+zFlag Value]]></c></tag>
       <item>
         <p>Miscellaneous flags.</p>
-- 
cgit v1.2.3


From 19c4689eea86f26c5af9b8f712c227ce4f62310b Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 24 Nov 2015 15:57:55 +0100
Subject: Replace off_heap_message_queue option with message_queue_data option

The message_queue_data option can have the values
 - off_heap
 - on_heap
 - mixed
---
 erts/doc/src/erl.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'erts/doc/src/erl.xml')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index c4eb0e16ec..b6fa4c254c 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -1338,14 +1338,14 @@
       <item>
         <p>Default process flag settings.</p>
         <taglist>
-          <tag><marker id="+xohmq"><c>+xohmq true|false</c></marker></tag>
+          <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>off_heap_message_queue</c>. If <c>+xohmq</c> is not
-	    passed, <c>false</c> will be the default. For more information,
+	    <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_off_heap_message_queue"><c>process_flag(off_heap_message_queue,
-	    OHMQ)</c></seealso>.
+            <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data,
+	    MQD)</c></seealso>.
 	  </p></item>
 	</taglist>
       </item>
-- 
cgit v1.2.3


From f5c9dd660f3f098ba1e2a4110be594013a6dff11 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 14 Jan 2016 12:07:39 +0100
Subject: Add documentation of '-path' flag to 'erl'

This flag replaces the path specified in the boot script. It has
always existed, but was earlier only documented in SASL (script).
---
 erts/doc/src/erl.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'erts/doc/src/erl.xml')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index ec4a0dee05..e8621fecc3 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -382,6 +382,11 @@
           similar to <c><![CDATA[code:add_pathsz/1]]></c>. See
           <seealso marker="kernel:code">code(3)</seealso>.</p>
       </item>
+      <tag><c><![CDATA[-path Dir1 Dir2 ...]]></c></tag>
+      <item>
+        <p>Replaces the path specified in the boot script. See
+          <seealso marker="sasl:script">script(4)</seealso>.</p>
+      </item>
       <tag><c><![CDATA[-remsh Node]]></c></tag>
       <item>
         <p>Starts Erlang with a remote shell connected to <c><![CDATA[Node]]></c>.</p>
-- 
cgit v1.2.3