aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2014-03-05 15:25:37 +0100
committerHans Bolinder <[email protected]>2014-03-05 15:25:37 +0100
commit4a28c972a710461568f4e610dffc09de221aaa44 (patch)
tree1b1439959f0b1173cfe268d8d1bbb9b73be75358 /lib/stdlib/src
parente081f968edbf54e5b056c850efc6f5ca26b75db6 (diff)
parentaab8156f22f62c11bbd0cf83d40be385c6411b3d (diff)
downloadotp-4a28c972a710461568f4e610dffc09de221aaa44.tar.gz
otp-4a28c972a710461568f4e610dffc09de221aaa44.tar.bz2
otp-4a28c972a710461568f4e610dffc09de221aaa44.zip
Merge branch 'hb/stdlib/spec_fixes/OTP-11399'
* hb/stdlib/spec_fixes/OTP-11399: stdlib: Improve the doc of the supervisor's via reference
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/gen.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stdlib/src/gen.erl b/lib/stdlib/src/gen.erl
index 7281549ea7..63116fa16e 100644
--- a/lib/stdlib/src/gen.erl
+++ b/lib/stdlib/src/gen.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -37,7 +37,9 @@
%%-----------------------------------------------------------------
-type linkage() :: 'link' | 'nolink'.
--type emgr_name() :: {'local', atom()} | {'global', term()} | {via, atom(), term()}.
+-type emgr_name() :: {'local', atom()}
+ | {'global', term()}
+ | {'via', Module :: module(), Name :: term()}.
-type start_ret() :: {'ok', pid()} | 'ignore' | {'error', term()}.