aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2013-03-12 16:58:13 +0100
committerBjörn-Egil Dahlberg <[email protected]>2013-03-12 16:58:13 +0100
commitae8521d9d3f0f129a102a75bb729fe96612f6735 (patch)
tree016f5b98e5fb49d0ab478607024d3bb8e76afd43 /lib/kernel/doc
parent003c9b55b987b3d0e650b84201bb08e729ed0a9a (diff)
parent4955bf98ead49b0c7122ab30e462f9b817bd5c6e (diff)
downloadotp-ae8521d9d3f0f129a102a75bb729fe96612f6735.tar.gz
otp-ae8521d9d3f0f129a102a75bb729fe96612f6735.tar.bz2
otp-ae8521d9d3f0f129a102a75bb729fe96612f6735.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/doc')
-rw-r--r--lib/kernel/doc/src/application.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 697de6681f..362c373c6c 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -253,6 +253,15 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
</warning>
</desc>
</func>
+ <func>
+ <name name="ensure_started" arity="1"/>
+ <name name="ensure_started" arity="2"/>
+ <fsummary>Load and start an application</fsummary>
+ <desc>
+ <p>Equivalent to <seealso marker="#start/2"><c>application:start/1,2</c></seealso> except
+ it returns <c>ok</c> for already started applications.</p>
+ </desc>
+ </func>
<func>
<name name="start" arity="1"/>
<name name="start" arity="2"/>