aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/doc/src/systools.xml
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 /lib/sasl/doc/src/systools.xml
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 'lib/sasl/doc/src/systools.xml')
-rw-r--r--lib/sasl/doc/src/systools.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index 84fed0a25f..284047163e 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>1996</year>
- <year>2011</year>
+ <year>2013</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -139,7 +139,7 @@
<type>
<v>Name = string()</v>
<v>Opt = src_tests | {path,[Dir]} | local | {variables,[Var]} | exref |
- {exref,[App]}] | silent | {outdir,Dir} | no_warn_sasl |
+ {exref,[App]}] | silent | {outdir,Dir} | no_dot_erlang | no_warn_sasl |
warnings_as_errors</v>
<v>&nbsp;Dir = string()</v>
<v>&nbsp;Var = {VarName,Prefix}</v>
@@ -252,6 +252,8 @@
<c>Module:format_error(Error)</c>.</p>
<p>If the option <c>warnings_as_errors</c> is provided, warnings
are treated as errors.</p>
+ <p>If the option <c>no_dot_erlang</c> is provided, the instruction to
+ load the <c>.erlang</c> file during boot is <em>NOT</em> included.</p>
</desc>
</func>
<func>