Merge branch 'maint'

bjorng · Oct 22, 2014 · 490922e · 490922e
2 parents 833c5e9 + a57d366
commit 490922e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml
@@ -115,8 +115,9 @@
          sockets/pipes can be used simultaneously by Erlang (due to
          limitations in the Unix <c><![CDATA[select]]></c> call).  The number of
          open regular files is not affected by this.</item>
-        <item>"Received SIGUSR1" - The SIGUSR1 signal was sent to the
-         Erlang machine (Unix only).</item>
+        <item>"Received SIGUSR1" - Sending the SIGUSR1 signal to a
+         Erlang machine (Unix only) forces a crash dump. This slogan reflects
+         that the Erlang machine crash-dumped due to receiving that signal.</item>
         <item>"Kernel pid terminated (<em>Who</em>)
          (<em>Exit-reason</em>)" - The kernel supervisor has detected
          a failure, usually that the <c><![CDATA[application_controller]]></c>

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
@@ -525,7 +525,8 @@
 	core dump and no crash dump if an internal error is detected.</p>
 
 	<p>Calling <c>erlang:halt/1</c> with a string argument will still
-	produce a crash dump.</p>
+	produce a crash dump. On Unix systems, sending an emulator process
+	a SIGUSR1 signal will also force a crash dump.</p>
       </item>
       <tag><marker id="+e"><c><![CDATA[+e Number]]></c></marker></tag>
       <item>