aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-13 17:23:37 +0100
committerFredrik Gustafsson <[email protected]>2013-03-13 17:23:37 +0100
commite5df75bfc94662ffe9c36e0b1643cef0104586e0 (patch)
tree4ada60df496b15bc701bba8778b5d3605a3d6f30
parent56207dab54862aee071db6f911ad3a447f1cab8f (diff)
parent74110b53f54b1c99ca5fdd0a8b67d5071fb39b3c (diff)
downloadotp-e5df75bfc94662ffe9c36e0b1643cef0104586e0.tar.gz
otp-e5df75bfc94662ffe9c36e0b1643cef0104586e0.tar.bz2
otp-e5df75bfc94662ffe9c36e0b1643cef0104586e0.zip
Merge branch 'mh/supervisor-doc/OTP-10938' into maint
* mh/supervisor-doc/OTP-10938: Delete obsolete note about simple-one-for-one supervisor
-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>