aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-05-29 11:15:41 +0200
committerLukas Larsson <[email protected]>2019-05-29 11:15:41 +0200
commitb9c4587833e5c87f5bf9526f7bc0de3993d68bf8 (patch)
tree0cfc4811ccf284310ee842c33df147cef1007512 /system/doc
parent1550304a8857c9eca31dffdb27dcf459d8f11076 (diff)
parent5d1b87498986731c82d543b86c297956fa8c3abf (diff)
downloadotp-b9c4587833e5c87f5bf9526f7bc0de3993d68bf8.tar.gz
otp-b9c4587833e5c87f5bf9526f7bc0de3993d68bf8.tar.bz2
otp-b9c4587833e5c87f5bf9526f7bc0de3993d68bf8.zip
Merge branch 'kuroneer/multiple-mode-flags/OTP-15852' into maint
* kuroneer/multiple-mode-flags/OTP-15852: Update preloaded modules Add comment to doc regarding multiple -mode flags Extra -mode flags are ignored with a warning
Diffstat (limited to 'system/doc')
-rw-r--r--system/doc/system_principles/system_principles.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/doc/system_principles/system_principles.xml b/system/doc/system_principles/system_principles.xml
index 500522d778..6986d93ed9 100644
--- a/system/doc/system_principles/system_principles.xml
+++ b/system/doc/system_principles/system_principles.xml
@@ -156,7 +156,8 @@ init:stop()</pre>
command-line flag <c>-mode</c>.</p>
<pre>
% <input>erl -mode embedded</input></pre>
- <p>Default mode is <c>interactive</c>.</p>
+ <p>Default mode is <c>interactive</c> and extra <c>-mode</c> flags are
+ ignored.</p>
<p>The mode properties are as follows:</p>
<list type="bulleted">
<item>In embedded mode, all code is loaded during system startup