summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorSiri Hansen <siri@erlang.org>2011-11-14 15:39:45 +0100
committerSiri Hansen <siri@erlang.org>2011-11-16 12:15:30 +0100
commit978ccb1fc2de4abc2d0d6b89e664ea6d8da1c663 (patch)
tree92510e2ba07f4b52935a632c366328107e677d2d /system
parentc87b8781f82eb3b8b4c2e9651070391d82e6c0ec (diff)
downloaderlang-978ccb1fc2de4abc2d0d6b89e664ea6d8da1c663.tar.gz
Improve documentation on supervisor restart strategy
Diffstat (limited to 'system')
-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>