aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/doc/src/appup.xml
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-07 15:43:06 +0100
committerMicael Karlberg <[email protected]>2011-03-07 15:43:06 +0100
commit5c8338fcadd68589814a7098e001b036109c5ee7 (patch)
tree4a89c1feb52b8ec862cfa46c8b502ea3880217be /lib/sasl/doc/src/appup.xml
parentf39098ac6f487f7142e4597930ee3bb709362c4a (diff)
parentf85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff)
downloadotp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.gz
otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.bz2
otp-5c8338fcadd68589814a7098e001b036109c5ee7.zip
Merge branch 'dev' into bmk/inets/httpd/dont_send_empty_chunk/OTP-9091
Diffstat (limited to 'lib/sasl/doc/src/appup.xml')
-rw-r--r--lib/sasl/doc/src/appup.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/sasl/doc/src/appup.xml b/lib/sasl/doc/src/appup.xml
index 5182889710..48d7b69885 100644
--- a/lib/sasl/doc/src/appup.xml
+++ b/lib/sasl/doc/src/appup.xml
@@ -174,11 +174,19 @@
<c>remove</c> and <c>purge</c>.</p>
<pre>
{add_application, Application}
+{add_application, Application, Type}
Application = atom()
+ Type = permanent | transient | temporary | load | none
</pre>
<p>Adding an application means that the modules defined by
the <c>modules</c> key in the <c>.app</c> file are loaded using
- <c>add_module</c>, then the application is started.</p>
+ <c>add_module</c>.</p>
+ <p><c>Type</c> defaults to <c>permanent</c> and specifies the start type
+ of the application. If <c>Type = permanent | transient | temporary</c>,
+ the application will be loaded and started in the corresponding way,
+ see <c>application(3)</c>. If <c>Type = load</c>, the application will
+ only be loaded. If <c>Type = none</c>, the application will be neither
+ loaded nor started, although the code for its modules will be loaded.</p>
<pre>
{remove_application, Application}
Application = atom()