diff options
| author | Lukas Larsson <[email protected]> | 2013-12-02 11:21:21 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-12-02 11:21:21 +0100 |
| commit | 22f1c2d08701038b52099dc09b52e5b94a6f8fba (patch) | |
| tree | 762ab42e81894a05b2050aa81f9ab177151c3844 /erts/preloaded | |
| parent | c3d9d667e028284d6f96f8e260d094f1775182ea (diff) | |
| parent | 301a7c2de81559fce4ab504afe5db68744a7c6d7 (diff) | |
| download | otp-22f1c2d08701038b52099dc09b52e5b94a6f8fba.tar.gz otp-22f1c2d08701038b52099dc09b52e5b94a6f8fba.tar.bz2 otp-22f1c2d08701038b52099dc09b52e5b94a6f8fba.zip | |
Merge branch 'maint'
* maint:
erts: Fix naming in erlang:monitor spec
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 94272 -> 94264 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 425effe7cd..bc0690f97f 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index aae7048fce..aa50ae7f76 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1073,8 +1073,8 @@ module_loaded(_Module) -> %% monitor/2 -spec monitor(Type, Item) -> MonitorRef when Type :: process, - Item :: pid() | Module | {Module, Node}, - Module :: module(), + Item :: pid() | RegName | {RegName, Node}, + RegName :: module(), Node :: node(), MonitorRef :: reference(). monitor(_Type, _Item) -> |