aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-10-11 11:07:29 +0200
committerSiri Hansen <[email protected]>2012-10-11 11:07:29 +0200
commit102adf32f766dceee6f277c34111fbe9b8971647 (patch)
tree64ab1ab166f1e18043faa756cb86e89ddadcb25c /lib/stdlib
parentc2b6342cb57df5925acbacff0aea74358c9a5ffb (diff)
downloadotp-102adf32f766dceee6f277c34111fbe9b8971647.tar.gz
otp-102adf32f766dceee6f277c34111fbe9b8971647.tar.bz2
otp-102adf32f766dceee6f277c34111fbe9b8971647.zip
Fix documentation about how supervisor handles crash in child's start function
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/doc/src/supervisor.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 1a64b7a2af..9021d02ade 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -294,10 +294,10 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
is a term with information about the error, and the supervisor
terminates with reason <c>Term</c>.</p>
<p>If any child process start function fails or returns an error
- tuple or an erroneous value, the function returns
- <c>{error, {shutdown, Reason}}</c> and the supervisor terminates all
- started child processes and then itself with reason
- <c>shutdown</c>.</p>
+ tuple or an erroneous value, the supervisor will first terminate
+ all already started child processes with reason <c>shutdown</c>
+ and then terminate itself and return
+ <c>{error, {shutdown, Reason}}</c>.</p>
</desc>
</func>
<func>