From 7fe11aa8aded3612f1b6ba13a11b0cb80bf57bea Mon Sep 17 00:00:00 2001
From: Magnus Henoch <magnus.henoch@erlang-solutions.com>
Date: Tue, 27 Oct 2015 11:57:22 +0000
Subject: Remove mention of erlang:fault

erlang:fault no longer exists, so don't mention it in the reference manual.

Also fix minor markup issue in following paragraph.
---
 system/doc/reference_manual/processes.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/doc/reference_manual/processes.xml b/system/doc/reference_manual/processes.xml
index 6755bd8be6..f656d0318e 100644
--- a/system/doc/reference_manual/processes.xml
+++ b/system/doc/reference_manual/processes.xml
@@ -100,11 +100,9 @@ spawn(Module, Name, Args) -> pid()
       <item><c>exit(Reason)</c></item>
       <item><c>erlang:error(Reason)</c></item>
       <item><c>erlang:error(Reason, Args)</c></item>
-      <item><c>erlang:fault(Reason)</c></item>
-      <item><c>erlang:fault(Reason, Args)</c></item>
     </list>
     <p>The process then terminates with reason <c>Reason</c> for
-      <c>exit/1</c> or <c>{Reason,Stack} for the others</c>.</p>
+      <c>exit/1</c> or <c>{Reason,Stack}</c> for the others.</p>
     <p>A process can also be terminated if it receives an exit signal
       with another exit reason than <c>normal</c>, see
       <seealso marker="#errors">Error Handling</seealso>.</p>
-- 
cgit v1.2.3


From 575b67139d8b1c6dee64b5ee239e3e7b5402959b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20G=C3=B6m=C3=B6ri?= <gomoripeti@gmail.com>
Date: Thu, 8 Oct 2015 14:52:37 +0200
Subject: Fix typo in trace gc_start doc

Conflicts:
	erts/doc/src/erlang.xml
---
 erts/doc/src/erlang.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 70d000f763..0d0672de3e 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8228,7 +8228,7 @@ timestamp() ->
               <tag><c>bin_old_vheap_size</c></tag>
               <item>The total size of unique off-heap binaries referenced
                 from the process old heap.</item>
-              <tag><c>bin_vheap_block_size</c></tag>
+              <tag><c>bin_old_vheap_block_size</c></tag>
 	      <item>The total size of binaries allowed in the virtual
 	        old heap in the process before doing a garbage collection.</item>
             </taglist>
-- 
cgit v1.2.3


From cb62ace6eac881e2b42880c6f645afbc56295ee0 Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Wed, 4 Nov 2015 16:04:54 +0100
Subject: add missing time.h

---
 erts/epmd/src/epmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 132bda725c..63ec18d939 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -29,7 +29,7 @@
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
-
+#include <time.h>
 /* forward declarations */
 
 static void usage(EpmdVars *);
-- 
cgit v1.2.3