aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-01-24 15:56:41 +0100
committerRaimo Niskanen <[email protected]>2018-01-24 15:56:41 +0100
commitb06e5e8c70f4447cbd410094254cc45f95ff241d (patch)
tree1435a894ed5b83284c9c628dae5110e98a077c56 /system/doc
parent11cd0f1d000be5849bba2466b3b54daa7727af22 (diff)
parentb171521e68262b9a830e8b8dd98467097d283753 (diff)
downloadotp-b06e5e8c70f4447cbd410094254cc45f95ff241d.tar.gz
otp-b06e5e8c70f4447cbd410094254cc45f95ff241d.tar.bz2
otp-b06e5e8c70f4447cbd410094254cc45f95ff241d.zip
Merge branch 'maint'
Conflicts: lib/stdlib/src/gen_statem.erl
Diffstat (limited to 'system/doc')
-rw-r--r--system/doc/design_principles/statem.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/doc/design_principles/statem.xml b/system/doc/design_principles/statem.xml
index a0611a46da..5be2981f62 100644
--- a/system/doc/design_principles/statem.xml
+++ b/system/doc/design_principles/statem.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2016</year><year>2017</year>
+ <year>2016</year><year>2018</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -1679,8 +1679,8 @@ handle_event(
{next_state, {open,LockButton}, Data,
[{reply,From,ok}]};
[Digit|Rest] -> % Incomplete
- {keep_state, Data#{remaining := Rest, 30000},
- [{reply,From,ok}]};
+ {keep_state, Data#{remaining := Rest},
+ [{reply,From,ok}, 30000]};
[_|_] -> % Wrong
{keep_state, Data#{remaining := Code},
[{reply,From,ok}]}