aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-11-29 09:50:42 +0100
committerDan Gudmundsson <[email protected]>2013-11-29 09:50:42 +0100
commitd299987d7e22d1236f14a4e097e8ee805a1b72ea (patch)
tree377b3ffd0c088580b1713f51d238c46e24da9fd2 /system/doc
parentac7902caa784d4f4c73eb7291ab4736a75ad13a4 (diff)
parenta9340a1692b0ae4d3b3c0328d007ac4a7db5cc75 (diff)
downloadotp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.tar.gz
otp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.tar.bz2
otp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.zip
Merge branch 'dgud/sasl/no_dot_erlang_boot/OTP-8479' into maint
* dgud/sasl/no_dot_erlang_boot/OTP-8479: sasl: Add no_dot_erlang documentation and tests sasl: Add no_dot_erlang start script
Diffstat (limited to 'system/doc')
-rw-r--r--system/doc/system_principles/system_principles.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/system/doc/system_principles/system_principles.xml b/system/doc/system_principles/system_principles.xml
index 27512a1660..42db8ede03 100644
--- a/system/doc/system_principles/system_principles.xml
+++ b/system/doc/system_principles/system_principles.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1996</year><year>2009</year>
+ <year>1996</year><year>2013</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -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