aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-08 15:49:38 +0200
committerHenrik Nord <[email protected]>2011-08-08 15:49:38 +0200
commit02aa5cc28c5b0698e910ad4dfa0f59a11c13e21b (patch)
treee30fc637139f4dcf7ebb16a436ccdcf290796ec7
parentb2e16f2a2c1f139c96f928ca644a753c7c3a28b7 (diff)
parentb33142d1da7322f621e175a3dfb7e1d185902192 (diff)
downloadotp-02aa5cc28c5b0698e910ad4dfa0f59a11c13e21b.tar.gz
otp-02aa5cc28c5b0698e910ad4dfa0f59a11c13e21b.tar.bz2
otp-02aa5cc28c5b0698e910ad4dfa0f59a11c13e21b.zip
Merge branch 'dev' into major
-rw-r--r--lib/stdlib/doc/src/gen_fsm.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index d15383c621..4900a8f0ef 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -438,7 +438,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
<fsummary>Initialize process and internal state name and state data.</fsummary>
<type>
<v>Args = term()</v>
- <v>Return = {ok,StateName,StateData} | {ok,StateName,StateData,Timeout}</v>
+ <v>Result = {ok,StateName,StateData} | {ok,StateName,StateData,Timeout}</v>
<v>&nbsp;&nbsp;| {ok,StateName,StateData,hibernate}</v>
<v>&nbsp;&nbsp;| {stop,Reason} | ignore</v>
<v>&nbsp;StateName = atom()</v>