aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-07-15 11:59:59 +0200
committerRaimo Niskanen <[email protected]>2016-07-15 11:59:59 +0200
commitc803a4b37d3fead03ee728ff655d60949b873399 (patch)
tree5a38b16c3398a14475552f4e64ecab2c7c55f9b0
parent2a74dd3344db6b6d1ae897dae221401df358eba1 (diff)
parente5c646324cfd9d1f55a6bc44f59daebe215b1c84 (diff)
downloadotp-c803a4b37d3fead03ee728ff655d60949b873399.tar.gz
otp-c803a4b37d3fead03ee728ff655d60949b873399.tar.bz2
otp-c803a4b37d3fead03ee728ff655d60949b873399.zip
Merge branch 'maint'
-rw-r--r--system/doc/design_principles/statem.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/doc/design_principles/statem.xml b/system/doc/design_principles/statem.xml
index b63327291d..aea623851a 100644
--- a/system/doc/design_principles/statem.xml
+++ b/system/doc/design_principles/statem.xml
@@ -755,7 +755,7 @@ stop() ->
Suppose that we do not want a button to lock the door,
instead we want to ignore button events in the <c>open</c> state.
Then we start a timer when entering the <c>open</c> state
- and waits for it to expire while ignoring button events:
+ and wait for it to expire while ignoring button events:
</p>
<code type="erl"><![CDATA[
...