aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-12-02 10:37:58 +0100
committerLukas Larsson <[email protected]>2013-12-02 11:11:27 +0100
commit301a7c2de81559fce4ab504afe5db68744a7c6d7 (patch)
treef1419a937118467630592398ea9ab90386a78ece
parent239ce1c4781fe4fc25c55795573654453887f507 (diff)
parent1a6347e868d375bb4bd9cb4e6651c82ea57bc220 (diff)
downloadotp-301a7c2de81559fce4ab504afe5db68744a7c6d7.tar.gz
otp-301a7c2de81559fce4ab504afe5db68744a7c6d7.tar.bz2
otp-301a7c2de81559fce4ab504afe5db68744a7c6d7.zip
Merge branch 'lukas/r16b03/docfixes/OTP-11513' into maint
* lukas/r16b03/docfixes/OTP-11513: erts: Fix naming in erlang:monitor spec
-rw-r--r--erts/preloaded/ebin/erlang.beambin94244 -> 94248 bytes
-rw-r--r--erts/preloaded/src/erlang.erl4
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 5a9ffa89d1..c53f6407f0 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 2b6760c675..291926578e 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) ->