aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-29 17:00:27 +0200
committerHenrik Nord <[email protected]>2011-08-29 17:00:27 +0200
commitb9ef73203a1b7f1400dc6d302827d7d732bab3f4 (patch)
treea79609f9fb8f369cc8b414dadb91a8052cdd8176 /lib/stdlib
parentefc604ee01ce88ae2c18a640ef0adf90700848a4 (diff)
parentf94beb7788106a85a02bebcd6362a170248fa659 (diff)
downloadotp-b9ef73203a1b7f1400dc6d302827d7d732bab3f4.tar.gz
otp-b9ef73203a1b7f1400dc6d302827d7d732bab3f4.tar.bz2
otp-b9ef73203a1b7f1400dc6d302827d7d732bab3f4.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/doc/src/gen_fsm.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index 4900a8f0ef..e35b5adace 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -639,9 +639,9 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
<v>StateName = atom()</v>
<v>StateData = term()</v>
<v>Result = {next_state,NextStateName,NewStateData}</v>
- <v>&nbsp;>&nbsp;| {next_state,NextStateName,NewStateData,Timeout}</v>
- <v>&nbsp;>&nbsp;| {next_state,NextStateName,NewStateData,hibernate}</v>
- <v>&nbsp;>&nbsp;| {stop,Reason,NewStateData}</v>
+ <v>&nbsp;&nbsp;| {next_state,NextStateName,NewStateData,Timeout}</v>
+ <v>&nbsp;&nbsp;| {next_state,NextStateName,NewStateData,hibernate}</v>
+ <v>&nbsp;&nbsp;| {stop,Reason,NewStateData}</v>
<v>&nbsp;NextStateName = atom()</v>
<v>&nbsp;NewStateData = term()</v>
<v>&nbsp;Timeout = int()>0 | infinity</v>