diff options
| author | Bruce Yinhe <[email protected]> | 2014-10-22 16:33:49 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-10-22 16:33:49 +0200 |
| commit | 490922e4c294b764b5c928e18af51d5b88ae6cba (patch) | |
| tree | d135e56ddebb197b2c38f9f60aabda6ac77d6d02 | |
| parent | 833c5e944dc13d093d7b175e3e9842b78b02d478 (diff) | |
| parent | a57d366febdbf0f41580e5497044a810918fcec6 (diff) | |
| download | otp-490922e4c294b764b5c928e18af51d5b88ae6cba.tar.gz otp-490922e4c294b764b5c928e18af51d5b88ae6cba.tar.bz2 otp-490922e4c294b764b5c928e18af51d5b88ae6cba.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/doc/src/crash_dump.xml | 5 | ||||
| -rw-r--r-- | erts/doc/src/erl.xml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml index d3de29b876..2b5fc877c3 100644 --- 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 index f856b9ab86..e85519185f 100644 --- 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> |