From 1f145f8a444121fac1f15dfe4af54f2148419ac1 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 4 May 2016 14:36:35 +0200
Subject: Fix documentation

---
 lib/stdlib/doc/src/gen_statem.xml            |   6 +++---
 lib/stdlib/src/gen_statem.erl                |   6 +++---
 system/doc/design_principles/code_lock.dia   | Bin 2955 -> 2932 bytes
 system/doc/design_principles/code_lock.png   | Bin 58823 -> 59160 bytes
 system/doc/design_principles/code_lock_2.dia | Bin 2646 -> 2621 bytes
 system/doc/design_principles/code_lock_2.png | Bin 51848 -> 48927 bytes
 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
index bed6d8ee86..8e6ff8a898 100644
Binary files a/system/doc/design_principles/code_lock.dia and b/system/doc/design_principles/code_lock.dia differ
diff --git a/system/doc/design_principles/code_lock.png b/system/doc/design_principles/code_lock.png
index e40f0320aa..745fd91920 100644
Binary files a/system/doc/design_principles/code_lock.png and b/system/doc/design_principles/code_lock.png differ
diff --git a/system/doc/design_principles/code_lock_2.dia b/system/doc/design_principles/code_lock_2.dia
index 4e82a9e1d6..142909a2f5 100644
Binary files a/system/doc/design_principles/code_lock_2.dia and b/system/doc/design_principles/code_lock_2.dia differ
diff --git a/system/doc/design_principles/code_lock_2.png b/system/doc/design_principles/code_lock_2.png
index 138fbdef6c..ecf7b0d799 100644
Binary files a/system/doc/design_principles/code_lock_2.png and b/system/doc/design_principles/code_lock_2.png differ
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
-- 
cgit v1.2.3