aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc/src/supervisor.xml
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-30 11:28:41 +0200
committerHenrik Nord <[email protected]>2011-08-30 11:28:41 +0200
commitdb333803584b17b6f281c974f8f78034be60e010 (patch)
tree380c5ebb0a684fbc7d6e6a9ffac5641428d250e3 /lib/stdlib/doc/src/supervisor.xml
parent1a2fbf178614f752f04fd5c7499bb659293adf10 (diff)
parent25543b7f0be1b87351d616143b5d149b1aed1cea (diff)
downloadotp-db333803584b17b6f281c974f8f78034be60e010.tar.gz
otp-db333803584b17b6f281c974f8f78034be60e010.tar.bz2
otp-db333803584b17b6f281c974f8f78034be60e010.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/stdlib/doc/src/supervisor.xml')
-rw-r--r--lib/stdlib/doc/src/supervisor.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 009aa60faa..edd119d37a 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -150,9 +150,12 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
<p><c>Restart</c> defines when a terminated child process
should be restarted. A <c>permanent</c> child process should
always be restarted, a <c>temporary</c> child process should
- never be restarted and a <c>transient</c> child process
- should be restarted only if it terminates abnormally, i.e.
- with another exit reason than <c>normal</c>.</p>
+ never be restarted (even when the supervisor's restart strategy
+ is <c>rest_for_one</c> or <c>one_for_all</c> and a sibling's
+ death causes the temporary process to be terminated) and a
+ <c>transient</c> child process should be restarted only if
+ it terminates abnormally, i.e. with another exit reason
+ than <c>normal</c>.</p>
</item>
<item>
<p><c>Shutdown</c> defines how a child process should be