aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2017-05-19 11:52:35 +0200
committerRaimo Niskanen <[email protected]>2017-05-22 14:57:35 +0200
commit51c44f09553b13194ee8346266b0930d1a135590 (patch)
treef580f59b16d43a8f7f03b4ae117e08d8f0a639a0
parenteff1ee5ebf1d767d610cd6bc059e5f4dea57d2af (diff)
downloadotp-51c44f09553b13194ee8346266b0930d1a135590.tar.gz
otp-51c44f09553b13194ee8346266b0930d1a135590.tar.bz2
otp-51c44f09553b13194ee8346266b0930d1a135590.zip
Fix documentation details
-rw-r--r--lib/stdlib/doc/src/gen_statem.xml4
-rw-r--r--system/doc/design_principles/statem.xml12
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index bc86415d28..e71de1523b 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>2016-2017</year>
+ <year>2016</year><year>2017</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -344,7 +344,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 f01615fdcd..7febe31df3 100644
--- a/system/doc/design_principles/statem.xml
+++ b/system/doc/design_principles/statem.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2016-2017</year>
+ <year>2016</year><year>2017</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -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,