diff options
| author | Raimo Niskanen <[email protected]> | 2016-05-04 14:36:35 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-05-04 14:36:35 +0200 |
| commit | 1f145f8a444121fac1f15dfe4af54f2148419ac1 (patch) | |
| tree | d75a9795cd2df4adede671775389ae17574fd2c9 | |
| parent | 2cb8dae90b0d2725b27147684a602cf2fa61f12e (diff) | |
| download | otp-1f145f8a444121fac1f15dfe4af54f2148419ac1.tar.gz otp-1f145f8a444121fac1f15dfe4af54f2148419ac1.tar.bz2 otp-1f145f8a444121fac1f15dfe4af54f2148419ac1.zip | |
Fix documentation
| -rw-r--r-- | lib/stdlib/doc/src/gen_statem.xml | 6 | ||||
| -rw-r--r-- | lib/stdlib/src/gen_statem.erl | 6 | ||||
| -rw-r--r-- | system/doc/design_principles/code_lock.dia | bin | 2955 -> 2932 bytes | |||
| -rw-r--r-- | system/doc/design_principles/code_lock.png | bin | 58823 -> 59160 bytes | |||
| -rw-r--r-- | system/doc/design_principles/code_lock_2.dia | bin | 2646 -> 2621 bytes | |||
| -rw-r--r-- | system/doc/design_principles/code_lock_2.png | bin | 51848 -> 48927 bytes | |||
| -rw-r--r-- | system/doc/design_principles/fsm.xml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index ec7f267c64..d83e17b177 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -396,17 +396,17 @@ handle_event(_, _, State, Data) -> <tag><c>pid()</c><br /> <c>LocalName</c></tag> <item>The <c>gen_statem</c> is locally registered.</item> - <tag><c>Name, Node</c></tag> + <tag><c>{Name,Node}</c></tag> <item> The <c>gen_statem</c> is locally registered on another node. </item> - <tag><c>GlobalName</c></tag> + <tag><c>{global,GlobalName}</c></tag> <item> The <c>gen_statem</c> is globally registered in <seealso marker="kernel:global"><c>global</c></seealso>. </item> - <tag><c>RegMod, ViaName</c></tag> + <tag><c>{via,RegMod,ViaName}</c></tag> <item> The <c>gen_statem</c> is registered through an alternative process registry. diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl index 23a1c9b31d..23bddafeed 100644 --- a/lib/stdlib/src/gen_statem.erl +++ b/lib/stdlib/src/gen_statem.erl @@ -290,11 +290,11 @@ event_type(Type) -> | {'via', RegMod :: module(), Name :: term()} | {'local', atom()}. -type server_ref() :: - {'global', GlobalName :: term()} - | {'via', RegMod :: module(), ViaName :: term()} + pid() | (LocalName :: atom()) | {Name :: atom(), Node :: atom()} - | pid(). + | {'global', GlobalName :: term()} + | {'via', RegMod :: module(), ViaName :: term()}. -type debug_opt() :: {'debug', Dbgs :: diff --git a/system/doc/design_principles/code_lock.dia b/system/doc/design_principles/code_lock.dia Binary files differindex bed6d8ee86..8e6ff8a898 100644 --- a/system/doc/design_principles/code_lock.dia +++ b/system/doc/design_principles/code_lock.dia diff --git a/system/doc/design_principles/code_lock.png b/system/doc/design_principles/code_lock.png Binary files differindex e40f0320aa..745fd91920 100644 --- a/system/doc/design_principles/code_lock.png +++ b/system/doc/design_principles/code_lock.png diff --git a/system/doc/design_principles/code_lock_2.dia b/system/doc/design_principles/code_lock_2.dia Binary files differindex 4e82a9e1d6..142909a2f5 100644 --- a/system/doc/design_principles/code_lock_2.dia +++ b/system/doc/design_principles/code_lock_2.dia diff --git a/system/doc/design_principles/code_lock_2.png b/system/doc/design_principles/code_lock_2.png Binary files differindex 138fbdef6c..ecf7b0d799 100644 --- a/system/doc/design_principles/code_lock_2.png +++ b/system/doc/design_principles/code_lock_2.png diff --git a/system/doc/design_principles/fsm.xml b/system/doc/design_principles/fsm.xml index 3468f93ae0..4f2b75e6e8 100644 --- a/system/doc/design_principles/fsm.xml +++ b/system/doc/design_principles/fsm.xml @@ -33,7 +33,7 @@ <note> <p> There is a new behaviour - <seealso marker="gen_statem"><c>gen_statem</c></seealso> + <seealso marker="statem"><c>gen_statem</c></seealso> that is intended to replace <c>gen_fsm</c> for new code. It has the same features and add some really useful. This module will not be removed for the foreseeable future |
