aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-13 17:23:50 +0100
committerFredrik Gustafsson <[email protected]>2013-03-13 17:23:50 +0100
commit59ab7fcb61da503f7a25d6d85fa555b4d9be5f8f (patch)
tree3907376652db8ed7d57e72dc20d8c68870e644c8 /lib
parent92d119aafd14d7f550727c400a522d5d4aa2b95e (diff)
parente5df75bfc94662ffe9c36e0b1643cef0104586e0 (diff)
downloadotp-59ab7fcb61da503f7a25d6d85fa555b4d9be5f8f.tar.gz
otp-59ab7fcb61da503f7a25d6d85fa555b4d9be5f8f.tar.bz2
otp-59ab7fcb61da503f7a25d6d85fa555b4d9be5f8f.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/doc/src/supervisor.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 9021d02ade..3f36c58d24 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -177,12 +177,6 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
child process, it must be implemented in a safe way and its cleanup
procedure must always return.</p>
</warning>
- <p><em>Important note on simple-one-for-one supervisors:</em>
- The dynamically created child processes of a
- simple-one-for-one supervisor are not explicitly killed,
- regardless of shutdown strategy, but are expected to terminate
- when the supervisor does (that is, when an exit signal from
- the parent process is received).</p>
<p>Note that all child processes implemented using the standard
OTP behavior modules automatically adhere to the shutdown
protocol.</p>