aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/doc
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-07 14:55:11 +0100
committerMicael Karlberg <[email protected]>2011-03-07 14:55:11 +0100
commitc959a0cd5392d356e8bda8d7eb9d0e71a88360b3 (patch)
tree44857e835210e771185bdf64ac8e4a42ad003d0a /lib/sasl/doc
parentdb29f9ede14ff5b8d747230fcad8ffa1b157f1e1 (diff)
parentf85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff)
downloadotp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.tar.gz
otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.tar.bz2
otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.zip
Merge branch 'dev' into bmk/inets/httpc/support_upload_body_streaming/OTP-OTP-9094
Diffstat (limited to 'lib/sasl/doc')
-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()