aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2017-05-22 14:58:50 +0200
committerRaimo Niskanen <[email protected]>2017-05-22 14:58:50 +0200
commit036534e03edded03c3392a30cda189bca8dfacf5 (patch)
tree5ccc1e681bd986fd1be0dffed36205dfdde427e2
parente577de4216f2dc180aac3e30949804db0b3e817d (diff)
parent51c44f09553b13194ee8346266b0930d1a135590 (diff)
downloadotp-036534e03edded03c3392a30cda189bca8dfacf5.tar.gz
otp-036534e03edded03c3392a30cda189bca8dfacf5.tar.bz2
otp-036534e03edded03c3392a30cda189bca8dfacf5.zip
Merge branch 'raimo/gen_statem-dev'
* raimo/gen_statem-dev: Fix documentation details
-rw-r--r--lib/stdlib/doc/src/gen_statem.xml2
-rw-r--r--system/doc/design_principles/statem.xml10
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 1aac88c308..ad7f2f2e95 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -346,7 +346,7 @@ ok
<p>
To compare styles, here follows the same example using
<seealso marker="#type-callback_mode"><em>callback mode</em></seealso>
- <c>state_functions</c>, or rather the code to replace
+ <c>handle_event_function</c>, or rather the code to replace
after function <c>init/1</c> of the <c>pushbutton.erl</c>
example file above:
</p>
diff --git a/system/doc/design_principles/statem.xml b/system/doc/design_principles/statem.xml
index 0667af7868..7febe31df3 100644
--- a/system/doc/design_principles/statem.xml
+++ b/system/doc/design_principles/statem.xml
@@ -1582,10 +1582,12 @@ format_status(Opt, [_PDict,State,Data]) ->
for example, a complex state term like a tuple.
</p>
<p>
- One reason to use this is when you have
- a state item that affects the event handling,
- in particular in combination with postponing events.
- We complicate the previous example
+ One reason to use this is when you have a state item
+ that when changed should cancel the
+ <seealso marker="#State Time-Outs">state time-out</seealso>,
+ or one that affects the event handling
+ in combination with postponing events.
+ We will complicate the previous example
by introducing a configurable lock button
(this is the state item in question),
which in the <c>open</c> state immediately locks the door,