aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-11-29 09:58:26 +0100
committerDan Gudmundsson <[email protected]>2013-11-29 09:58:26 +0100
commit423d37395076528866c4b689c0f1e9b72dae58e1 (patch)
treeb7e8a58df2c8c380d10e275102c07fa737d24908 /system
parenta4565bd7d6e8362b3ca1ff0caedf7407e81d67cb (diff)
parent0279799e4f3d2404f657863d04d8c1d6f6c08985 (diff)
downloadotp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.gz
otp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.bz2
otp-423d37395076528866c4b689c0f1e9b72dae58e1.zip
Merge branch 'maint'
Conflicts: erts/etc/win32/Install.c
Diffstat (limited to 'system')
-rw-r--r--system/doc/system_principles/system_principles.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/system/doc/system_principles/system_principles.xml b/system/doc/system_principles/system_principles.xml
index dc826916f8..4f2202fdd1 100644
--- a/system/doc/system_principles/system_principles.xml
+++ b/system/doc/system_principles/system_principles.xml
@@ -105,6 +105,14 @@ init:stop()</pre>
<p>Loads the code for and starts the applications Kernel,
STDLIB and SASL.</p>
</item>
+ <tag><c>no_dot_erlang.boot</c></tag>
+ <item>
+ <p>Loads the code for and starts the applications Kernel and
+ STDLIB, skips loading the <c>.erlang</c> file.
+ Useful for scripts and other tools that should be behave the
+ same irregardless of user preferences.
+ </p>
+ </item>
</taglist>
<p>Which of <c>start_clean</c> and <c>start_sasl</c> to use as
default is decided by the user when installing Erlang/OTP using