aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/doc
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 /lib/sasl/doc
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 'lib/sasl/doc')
-rw-r--r--lib/sasl/doc/src/systools.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index 6d88b228fd..e8076c6752 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -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>