aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/design_principles/des_princ.xml
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-04-25 17:04:35 +0200
committerRaimo Niskanen <[email protected]>2016-04-25 17:04:35 +0200
commitb6da7406d35f9decaaa7fa089f58ed03879dadfe (patch)
treea4f767bad05d024615b104053839e72023c72f23 /system/doc/design_principles/des_princ.xml
parentb842026cc5e86cf7f054da073f6da16adf02baa9 (diff)
parentf06f69068807168cf4cc731711ed82489cc5b99c (diff)
downloadotp-b6da7406d35f9decaaa7fa089f58ed03879dadfe.tar.gz
otp-b6da7406d35f9decaaa7fa089f58ed03879dadfe.tar.bz2
otp-b6da7406d35f9decaaa7fa089f58ed03879dadfe.zip
Merge branch 'raimo/new-gen-state-machine/OTP-13065'
* raimo/new-gen-state-machine/OTP-13065: (52 commits) Add section on state filtering Promote gen_statem over gen_fsm Modify code_change/4 to return CallbackMode Use ?NAME macro in examples Introduce Fred Herbert suggested additions Introduce corrections from Fred Hebert and Ingela Use .png pictures instead of .gif Write Design Principles chapter Fix missing short forms for event timeout Do more intricate Fred Hebert doc changes Change Caller -> From as suggested by Fred Hebert Do documentation improvements from Fred Hebert Fix broken documenation reference Rename state_timeout -> event_timeout Fix most of the system docs and emacs mode Change code_change/4 to {ok,State,Data} Fixup sharpened test suite Sharpen test suite Remove the remove_event action and all alike Relax caller() type check and cleanup ... Conflicts: lib/stdlib/src/gen.erl lib/stdlib/src/gen_event.erl lib/stdlib/src/gen_fsm.erl lib/stdlib/src/gen_server.erl lib/stdlib/test/error_logger_forwarder.erl
Diffstat (limited to 'system/doc/design_principles/des_princ.xml')
-rw-r--r--system/doc/design_principles/des_princ.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/system/doc/design_principles/des_princ.xml b/system/doc/design_principles/des_princ.xml
index 0cf9f28bdc..8ab8661c2d 100644
--- a/system/doc/design_principles/des_princ.xml
+++ b/system/doc/design_principles/des_princ.xml
@@ -226,7 +226,9 @@ free(Ch, {Alloc, Free} = Channels) ->
<item><p><seealso marker="gen_server_concepts">gen_server</seealso></p>
<p>For implementing the server of a client-server relation</p></item>
<item><p><seealso marker="fsm">gen_fsm</seealso></p>
- <p>For implementing finite-state machines</p></item>
+ <p>For implementing finite-state machines (Old)</p></item>
+ <item><p><seealso marker="statem">gen_statem</seealso></p>
+ <p>For implementing state machines (New)</p></item>
<item><p><seealso marker="events">gen_event</seealso></p>
<p>For implementing event handling functionality</p></item>
<item><p><seealso marker="sup_princ">supervisor</seealso></p>