aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erl.xml
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-10-17 08:12:41 +0200
committerDan Gudmundsson <[email protected]>2017-10-17 08:12:41 +0200
commit11fcc4b2b4581da4e24b94128a4f38ae98a2f466 (patch)
treec1becd60ffb088d0d21b83e9f24854ec6447bef1 /erts/doc/src/erl.xml
parent34b3ee1079890f523062b5d5613187f413871538 (diff)
parentbaf53defc90c4aa8a4caa6b2c6ead6a1b58df199 (diff)
downloadotp-11fcc4b2b4581da4e24b94128a4f38ae98a2f466.tar.gz
otp-11fcc4b2b4581da4e24b94128a4f38ae98a2f466.tar.bz2
otp-11fcc4b2b4581da4e24b94128a4f38ae98a2f466.zip
Merge branch 'dgud/dot_erlang/OTP-14439'
* dgud/dot_erlang/OTP-14439: fixup! Do not load .erlang from current dir erlc: Do not load .erlang escript: Do not load .erlang dialyzer: Do not load .erlang reltool: Add no_dot_erlang bootfiles Enable usage of no_dot_erlang in bootstrap Do not load .erlang from current dir
Diffstat (limited to 'erts/doc/src/erl.xml')
-rw-r--r--erts/doc/src/erl.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 6f6eca2a0b..bd824b3405 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -1641,9 +1641,7 @@
<tag>The <c>.erlang</c> startup file</tag>
<item>
<p>When Erlang/OTP is started, the system searches for a file named
- <c>.erlang</c> in the directory where Erlang/OTP is started. If not
- found, the user's home directory is searched for an <c>.erlang</c>
- file.</p>
+ <c>.erlang</c> in the user's home directory.</p>
<p>If an <c>.erlang</c> file is found, it is assumed to contain valid
Erlang expressions. These expressions are evaluated as if they were
input to the shell.</p>