aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/design_principles/sup_princ.xml
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-11-16 12:16:36 +0100
committerSiri Hansen <[email protected]>2011-11-16 12:16:36 +0100
commit2c1ef7d09629bc4cf644c7c985989c60e22b3f64 (patch)
treebacf2e88bded59454aede930b345d15672936489 /system/doc/design_principles/sup_princ.xml
parentd0d13063fb27e185759c02e6b2e119f1c07035fd (diff)
parent978ccb1fc2de4abc2d0d6b89e664ea6d8da1c663 (diff)
downloadotp-2c1ef7d09629bc4cf644c7c985989c60e22b3f64.tar.gz
otp-2c1ef7d09629bc4cf644c7c985989c60e22b3f64.tar.bz2
otp-2c1ef7d09629bc4cf644c7c985989c60e22b3f64.zip
Merge branch 'siri/stdlib/improve-doc-restart-strategy/OTP-9381'
* siri/stdlib/improve-doc-restart-strategy/OTP-9381: Improve documentation on supervisor restart strategy
Diffstat (limited to 'system/doc/design_principles/sup_princ.xml')
-rw-r--r--system/doc/design_principles/sup_princ.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml
index a432f9458b..5b8fd604c8 100644
--- a/system/doc/design_principles/sup_princ.xml
+++ b/system/doc/design_principles/sup_princ.xml
@@ -160,10 +160,13 @@ init(...) ->
be restarted.</p>
<list type="bulleted">
<item>A <c>permanent</c> child process is always restarted.</item>
- <item>A <c>temporary</c> child process is never restarted.</item>
+ <item>A <c>temporary</c> child process is never restarted
+ (not 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).</item>
<item>A <c>transient</c> child process is restarted only if it
terminates abnormally, i.e. with another exit reason than
- <c>normal</c>.</item>
+ <c>normal</c>, <c>shutdown</c> or <c>{shutdown,Term}</c>.</item>
</list>
</item>
<item>