aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erl_dist_protocol.xml
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-02-23 00:46:42 +0100
committerRickard Green <[email protected]>2013-02-23 00:46:42 +0100
commite23e5d906dcb5168697270a50ea765e480248faf (patch)
tree22aa1a6b3b5edf1bb512de6751cf7de5a3a146f0 /erts/doc/src/erl_dist_protocol.xml
parent4326dac8464123a687af32c3fcbbd53c7e0a4bbc (diff)
parent4337604e325c7e912db40f145f5493106f3d6a85 (diff)
downloadotp-e23e5d906dcb5168697270a50ea765e480248faf.tar.gz
otp-e23e5d906dcb5168697270a50ea765e480248faf.tar.bz2
otp-e23e5d906dcb5168697270a50ea765e480248faf.zip
Merge branch 'rickard/epmd-prot-doc/OTP-10872'
* rickard/epmd-prot-doc/OTP-10872: Add info about UTF-8 encoding of nodename
Diffstat (limited to 'erts/doc/src/erl_dist_protocol.xml')
-rw-r--r--erts/doc/src/erl_dist_protocol.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml
index 4cff4956a2..84f4be208d 100644
--- a/erts/doc/src/erl_dist_protocol.xml
+++ b/erts/doc/src/erl_dist_protocol.xml
@@ -162,11 +162,12 @@ By default EPMD listens on port 4369.
</item>
<tag><c>Nlen</c></tag>
<item>
- The length of the <c>NodeName</c>.
+ The length (in bytes) of the <c>NodeName</c> field.
</item>
<tag><c>NodeName</c></tag>
<item>
- The NodeName as a string of length <c>Nlen</c>.
+ The NodeName as an UTF-8 encoded string of
+ <c>Nlen</c> bytes.
</item>
<tag><c>Elen</c></tag>
<item>
@@ -322,7 +323,7 @@ If Result > 0, the packet only consists of [119, Result].
NodeInfo is, as expressed in Erlang:
</p>
<code>
- io:format("name ~s at port ~p~n", [NodeName, Port]).
+ io:format("name ~ts at port ~p~n", [NodeName, Port]).
</code>
</section>
@@ -362,14 +363,14 @@ If Result > 0, the packet only consists of [119, Result].
NodeInfo is, as expressed in Erlang:
</p>
<code>
- io:format("active name ~s at port ~p, fd = ~p ~n",
+ io:format("active name ~ts at port ~p, fd = ~p ~n",
[NodeName, Port, Fd]).
</code>
<p>
or
</p>
<code>
- io:format("old/unused name ~s at port ~p, fd = ~p~n",
+ io:format("old/unused name ~ts at port ~p, fd = ~p~n",
[NodeName, Port, Fd]).
</code>
@@ -640,7 +641,7 @@ If Result > 0, the packet only consists of [119, Result].
<c>$ERL_TOP/lib/kernel/include/dist.hrl</c>.
(32 bit big endian)
Name0 ... NameN is the full nodename of A, as a string of bytes (the
- packet length denotes how long it is).
+ packet length denotes how long it is).
</p></item>
<tag>3) recv_status/send_status</tag>
<item><p>B sends a status message to A, which indicates