From f1be30c44044e7bb0167a34d234b6b2322328def Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Tue, 1 Dec 2015 13:14:43 +0100
Subject: Clarify limitation on halt/2 slogan string

---
 erts/doc/src/erlang.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'erts/doc')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 9287b32fec..1e251d33f3 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1802,6 +1802,8 @@ os_prompt% </pre>
 	  <tag>string()</tag>
 	  <item>An Erlang crash dump is produced with <c><anno>Status</anno></c>
 	  as slogan. Then the runtime system exits with status code <c>1</c>.
+	  Note that the string may not be longer than 200 characters and only
+	  code points in the range 0-255 may be used.
 	  </item>
 	  <tag><c>abort</c></tag>
 	  <item>
-- 
cgit v1.2.3


From be353901879b3cccda7cd01947936cf1550dea04 Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Tue, 1 Dec 2015 11:25:12 +0100
Subject: Check exit status in init:stop/1 and simplify documentation

---
 erts/doc/src/init.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'erts/doc')

diff --git a/erts/doc/src/init.xml b/erts/doc/src/init.xml
index 84a5aea335..3546099fad 100644
--- a/erts/doc/src/init.xml
+++ b/erts/doc/src/init.xml
@@ -178,14 +178,8 @@
       <name name="stop" arity="0"/>
       <fsummary>Take down an Erlang node smoothly</fsummary>
       <desc>
-        <p>All applications are taken down smoothly, all code is
-          unloaded, and all ports are closed before the system
-          terminates. If the <c>-heart</c> command line flag was given, 
-          the <c>heart</c> program is terminated before the Erlang node
-          terminates. Refer to <c>heart(3)</c> for more information.</p>
-        <p>To limit the shutdown time, the time <c>init</c> is allowed
-          to spend taking down applications, the <c>-shutdown_time</c>
-          command line flag should be used.</p>
+        <p>The same as
+	<seealso marker="#stop/1"><c>stop(0)</c></seealso>.</p>
       </desc>
     </func>
     <func>
-- 
cgit v1.2.3


From dcaa52d75e3bcbc808696597a34f2fca5677fff9 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 20 May 2016 15:56:56 +0200
Subject: erts: Make erlang:halt/2 truncate string arg

if too long.
---
 erts/doc/src/erlang.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts/doc')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 1e251d33f3..665429d290 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1802,8 +1802,8 @@ os_prompt% </pre>
 	  <tag>string()</tag>
 	  <item>An Erlang crash dump is produced with <c><anno>Status</anno></c>
 	  as slogan. Then the runtime system exits with status code <c>1</c>.
-	  Note that the string may not be longer than 200 characters and only
-	  code points in the range 0-255 may be used.
+	  Note that only code points in the range 0-255 may be used
+	  and the string will be truncated if longer than 200 characters.
 	  </item>
 	  <tag><c>abort</c></tag>
 	  <item>
-- 
cgit v1.2.3