diff options
author | Ingela Anderton Andin <[email protected]> | 2017-04-27 11:14:45 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-04-27 11:14:45 +0200 |
commit | 7ea9972201ec83bafa2f9adb2aa2ae83067cf732 (patch) | |
tree | f500ca18f3986ab9068b3e49a9f938720cac0a99 /lib/stdlib/doc/src/supervisor.xml | |
parent | e6c1b7a5d40b07b0695315fd1fbd605ebfa0cf99 (diff) | |
parent | c6bdd67b33b70d862e2a2d0f582106f2e930d970 (diff) | |
download | otp-7ea9972201ec83bafa2f9adb2aa2ae83067cf732.tar.gz otp-7ea9972201ec83bafa2f9adb2aa2ae83067cf732.tar.bz2 otp-7ea9972201ec83bafa2f9adb2aa2ae83067cf732.zip |
Merge branch 'ingela/deprecate/gen_fsm/OTP-14183'
* ingela/deprecate/gen_fsm/OTP-14183:
stdlib: Deprecate gen_fsm
Conflicts:
lib/stdlib/doc/src/gen_fsm.xml
Diffstat (limited to 'lib/stdlib/doc/src/supervisor.xml')
-rw-r--r-- | lib/stdlib/doc/src/supervisor.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index bb06d3645e..a42cfdd567 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -36,7 +36,6 @@ process can either be another supervisor or a worker process. Worker processes are normally implemented using one of the <seealso marker="gen_event"><c>gen_event</c></seealso>, - <seealso marker="gen_fsm"><c>gen_fsm</c></seealso>, <seealso marker="gen_server"><c>gen_server</c></seealso>, or <seealso marker="gen_statem"><c>gen_statem</c></seealso> behaviors. A supervisor implemented using this module has @@ -237,8 +236,8 @@ child_spec() = #{id => child_id(), % mandatory <p><c>modules</c> is used by the release handler during code replacement to determine which processes are using a certain module. As a rule of thumb, if the child process is a - <c>supervisor</c>, <c>gen_server</c>, - <c>gen_statem</c>, or <c>gen_fsm</c>, + <c>supervisor</c>, <c>gen_server</c> or, + <c>gen_statem</c>, this is to be a list with one element <c>[Module]</c>, where <c>Module</c> is the callback module. If the child process is an event manager (<c>gen_event</c>) with a @@ -706,7 +705,6 @@ child_spec() = #{id => child_id(), % mandatory <section> <title>See Also</title> <p><seealso marker="gen_event"><c>gen_event(3)</c></seealso>, - <seealso marker="gen_fsm"><c>gen_fsm(3)</c></seealso>, <seealso marker="gen_statem"><c>gen_statem(3)</c></seealso>, <seealso marker="gen_server"><c>gen_server(3)</c></seealso>, <seealso marker="sys"><c>sys(3)</c></seealso></p> |