diff options
| author | Henrik Nord <[email protected]> | 2014-06-11 11:00:43 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-06-11 11:00:43 +0200 |
| commit | 5f2b70f205bc64be545b75db5419111aac11291d (patch) | |
| tree | f2d95ed66dc08d20be84880a86ece9b36af63a5a /lib/stdlib | |
| parent | 18615c8555c38b98486d5e29257178f06c810a09 (diff) | |
| parent | eeec3b6df919b95752052b605732be0541f018ca (diff) | |
| download | otp-5f2b70f205bc64be545b75db5419111aac11291d.tar.gz otp-5f2b70f205bc64be545b75db5419111aac11291d.tar.bz2 otp-5f2b70f205bc64be545b75db5419111aac11291d.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/doc/src/gen_fsm.xml | 4 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/gen_server.xml | 2 |
2 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 1713367bd8..848d57f3e6 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -115,7 +115,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 If <c>FsmName={global,GlobalName}</c>, the gen_fsm is registered globally as <c>GlobalName</c> using <c>global:register_name/2</c>. - If <c>EventMgrName={via,Module,ViaName}</c>, the event manager will + If <c>FsmName={via,Module,ViaName}</c>, the gen_fsm will register with the registry represented by <c>Module</c>. The <c>Module</c> callback should export the functions <c>register_name/2</c>, <c>unregister_name/1</c>, @@ -210,7 +210,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 registered at another node, or</item> <item><c>{global,GlobalName}</c>, if the gen_fsm is globally registered.</item> - <item><c>{via,Module,ViaName}</c>, if the event manager is registered + <item><c>{via,Module,ViaName}</c>, if the gen_fsm is registered through an alternative process registry.</item> </list> <p><c>Event</c> is an arbitrary term which is passed as one of diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index 4c83fde237..62c0394479 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -113,7 +113,7 @@ gen_server:abcast -----> Module:handle_cast/2 registered globally as <c>GlobalName</c> using <c>global:register_name/2</c>. If no name is provided, the gen_server is not registered. - If <c>EventMgrName={via,Module,ViaName}</c>, the event manager will + If <c>ServerName={via,Module,ViaName}</c>, the gen_server will register with the registry represented by <c>Module</c>. The <c>Module</c> callback should export the functions <c>register_name/2</c>, <c>unregister_name/1</c>, |