aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-23 10:31:04 +0100
committerSiri Hansen <[email protected]>2012-03-23 10:31:04 +0100
commit8ee394f1b4fb3b07ef74361f0517a502c7321837 (patch)
tree901e042bd7bae848aca982816b32cb6aef766a4d /lib
parent5957a8338fe1f4e79a39277174094bbd9e978896 (diff)
parent973bc0094be5580055853d9ed0e40be2cc89970a (diff)
downloadotp-8ee394f1b4fb3b07ef74361f0517a502c7321837.tar.gz
otp-8ee394f1b4fb3b07ef74361f0517a502c7321837.tar.bz2
otp-8ee394f1b4fb3b07ef74361f0517a502c7321837.zip
Merge branch 'siri/kernel/doc-mod-default-in-app/OTP-10002' into maint
* siri/kernel/doc-mod-default-in-app/OTP-10002: Document correct default value for 'mod' parameter in .app
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/doc/src/app.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml
index ff8a12fe97..1914844b37 100644
--- a/lib/kernel/doc/src/app.xml
+++ b/lib/kernel/doc/src/app.xml
@@ -4,7 +4,7 @@
<fileref>
<header>
<copyright>
- <year>1997</year><year>2011</year>
+ <year>1997</year><year>2012</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -75,7 +75,7 @@ MaxT int() infinity
Names [Name] []
Apps [App] []
Env [{Par,Val}] []
-Start {Module,StartArgs} undefined
+Start {Module,StartArgs} []
Phases [{Phase,PhaseArgs}] undefined
Module = Name = App = Par = Phase = atom()
Val = StartArgs = PhaseArgs = term()</code>