summaryrefslogtreecommitdiff
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang.org>2020-08-10 16:48:38 +0200
committerLukas Larsson <lukas@erlang.org>2020-08-10 16:48:38 +0200
commitaf86d259d7979f1fbe24d5a33cf05cb676acff88 (patch)
tree8a1fb55dd50aa3cb859c418ed9205e382e0d7475 /erts
parent6d42dfd5795f18c30640c47586cf9f382be2c9ad (diff)
parent3870d3679d076ae56c4207b4556e87d4acf53394 (diff)
downloaderlang-af86d259d7979f1fbe24d5a33cf05cb676acff88.tar.gz
Merge branch 'lukas/kernel/remsh/OTP-16783/OTP-16784/OTP-16785/OTP-16786' into maint
* lukas/kernel/remsh/OTP-16783/OTP-16784/OTP-16785/OTP-16786: port_please/2 and port_please/3 can return closed ei: Fix erl_call -R -address host:port kernel: Fix -erl_epmd_port to work properly kernel: Allow '-remsh nodename' without the hostname
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erl_cmd.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/doc/src/erl_cmd.xml b/erts/doc/src/erl_cmd.xml
index 1ca81a4798..8bed457487 100644
--- a/erts/doc/src/erl_cmd.xml
+++ b/erts/doc/src/erl_cmd.xml
@@ -492,8 +492,7 @@
<item>
<p>Starts Erlang with a remote shell connected to <c><![CDATA[Node]]></c>.</p>
<p>If no <c><![CDATA[-name]]></c> or <c><![CDATA[-sname]]></c> is given
- the node will be started using <c>-sname undefined</c>. If <c>Node</c>
- is using long names then you should give <c>-name undefined</c>.
+ the node will be started using <c>-sname undefined</c>.
If <c><![CDATA[Node]]></c> does not contain a hostname, one is automatically
taken from <c><![CDATA[-name]]></c> or <c><![CDATA[-sname]]></c>
</p>