aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-23 10:55:18 +0100
committerSiri Hansen <[email protected]>2012-03-23 10:55:18 +0100
commit13dbd2e55a746ba92a580a9521e55e338276e8c4 (patch)
treefad77bc1cf3990d710ec76fb6ab74ac9f994d20c /lib/kernel
parent8a886bda04b7656f9f6ced9be14a98d6b6df0a0a (diff)
parentfd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff)
downloadotp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.gz
otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.bz2
otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
-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>