aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-17 12:30:20 +0100
committerFredrik Gustafsson <[email protected]>2013-01-17 12:30:20 +0100
commit60cabff61c07f5d5cb9dde1eb6b8e73897a0f928 (patch)
tree098c829a13ea565e5152221527defa0b9bce6a36 /lib/kernel/doc
parentcc7e26049cae8cb95793cf9af98424907a2ce644 (diff)
parent37654ca0993d24753d6596f7a5e4e784030092c4 (diff)
downloadotp-60cabff61c07f5d5cb9dde1eb6b8e73897a0f928.tar.gz
otp-60cabff61c07f5d5cb9dde1eb6b8e73897a0f928.tar.bz2
otp-60cabff61c07f5d5cb9dde1eb6b8e73897a0f928.zip
Merge branch 'sal/get_env/OTP-10694'
* sal/get_env/OTP-10694: Moved documentation in a separate entry Removed obsolete ?line macro Add application:get_key/3
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 51a3311ec2..9f19efc793 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -121,6 +121,15 @@
</desc>
</func>
<func>
+ <name name="get_env" arity="3"/>
+ <fsummary>Get the value of a configuration parameter using a default</fsummary>
+ <desc>
+ <p>Works like <seealso marker="#get_env/2">get_env/2</seealso> but returns
+ <c><anno>Def</anno></c> value when configuration parameter
+ <c><anno>Par</anno></c> does not exist.</p>
+ </desc>
+ </func>
+ <func>
<name name="get_key" arity="1"/>
<name name="get_key" arity="2"/>
<fsummary>Get the value of an application specification key</fsummary>