aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2014-03-30 10:20:54 +0200
committerHans Bolinder <[email protected]>2014-03-30 10:20:54 +0200
commita99f94e7d940e8e9e881055a0a357a9ef8ac6d6e (patch)
tree7b71ae1afa4f98d17b19459de39c9d36d6cb691c /lib
parent4503158956b9f7357551c349f3e1095acdfb80f8 (diff)
parentf9a5947ed8daf3b673ed94089a03553f87c56743 (diff)
downloadotp-a99f94e7d940e8e9e881055a0a357a9ef8ac6d6e.tar.gz
otp-a99f94e7d940e8e9e881055a0a357a9ef8ac6d6e.tar.bz2
otp-a99f94e7d940e8e9e881055a0a357a9ef8ac6d6e.zip
Merge branch 'essen/kernel/export_app_start_type'
* essen/kernel/export_app_start_type: Fix reference to start_type() i application(3) Export type application:start_type()
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/doc/src/application.xml5
-rw-r--r--lib/kernel/src/application.erl5
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 016151891c..7664fda4db 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2013</year>
+ <year>1996</year><year>2014</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -459,8 +459,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
<name>Module:start(StartType, StartArgs) -> {ok, Pid} | {ok, Pid, State} | {error, Reason}</name>
<fsummary>Start an application</fsummary>
<type>
- <v>StartType = normal | {takeover,Node} | {failover,Node}</v>
- <v>&nbsp;Node = node()</v>
+ <v>StartType = <seealso marker="#type-start_type">start_type()</seealso></v>
<v>StartArgs = term()</v>
<v>Pid = pid()</v>
<v>State = term()</v>
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl
index 76a80553b0..c4bef5188a 100644
--- a/lib/kernel/src/application.erl
+++ b/lib/kernel/src/application.erl
@@ -30,6 +30,8 @@
-export([get_application/0, get_application/1, info/0]).
-export([start_type/0]).
+-export_type([start_type/0]).
+
%%%-----------------------------------------------------------------
-type start_type() :: 'normal'
@@ -58,8 +60,7 @@
%%------------------------------------------------------------------
--callback start(StartType :: normal | {takeover, node()} | {failover, node()},
- StartArgs :: term()) ->
+-callback start(StartType :: start_type(), StartArgs :: term()) ->
{'ok', pid()} | {'ok', pid(), State :: term()} | {'error', Reason :: term()}.
-callback stop(State :: term()) ->