diff options
| author | Hans Bolinder <[email protected]> | 2016-09-02 08:39:12 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-09-02 08:39:12 +0200 |
| commit | db096ad15022ae4f9605fa42bf74780641dc6dac (patch) | |
| tree | 477e4ec79ce025e2af2ecef46536a6e80413b057 /erts/doc/src/erl_dist_protocol.xml | |
| parent | 068185ef518384c0141cc643820f3a2a103ff4c3 (diff) | |
| parent | ad6e765bcd4f35a282ef00e38ed9129f3a5c1d83 (diff) | |
| download | otp-db096ad15022ae4f9605fa42bf74780641dc6dac.tar.gz otp-db096ad15022ae4f9605fa42bf74780641dc6dac.tar.bz2 otp-db096ad15022ae4f9605fa42bf74780641dc6dac.zip | |
Merge branch 'hasse/doc/fix_editorial_changes' into maint
* hasse/doc/fix_editorial_changes:
doc: Correct errors introduced by Editorial changes
Diffstat (limited to 'erts/doc/src/erl_dist_protocol.xml')
| -rw-r--r-- | erts/doc/src/erl_dist_protocol.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml index a5949ce15f..ee74983730 100644 --- a/erts/doc/src/erl_dist_protocol.xml +++ b/erts/doc/src/erl_dist_protocol.xml @@ -5,7 +5,7 @@ <header> <copyright> <year>2007</year> - <year>2015</year> + <year>2016</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> @@ -48,7 +48,7 @@ </item> <item> <p>Authentication (done by <seealso marker="kernel:net_kernel"> - <c>kernel:net_kernel(3)</c></seealso>) (3)</p> + <c>net_kernel(3)</c></seealso>) (3)</p> </item> <item> <p>Connected (4)</p> @@ -573,7 +573,7 @@ io:format("old/unused name ~ts at port ~p, fd = ~p ~n", <p>Every message in the handshake starts with a 16-bit big-endian integer, which contains the message length (not counting the two initial bytes). In Erlang this corresponds to option <c>{packet, 2}</c> in - <seealso marker="kernel:gen_tcp"><c>kernel:gen_tcp(3)</c></seealso>. + <seealso marker="kernel:gen_tcp"><c>gen_tcp(3)</c></seealso>. Notice that after the handshake, the distribution switches to 4 byte packet headers.</p> </section> @@ -825,7 +825,7 @@ DiB == gen_digest(ChA, ICA)? <section> <marker id="connected_nodes"/> <title>Protocol between Connected Nodes</title> - <p>As from <c>ERTS</c> 5.7.2 the runtime system passes a distribution flag + <p>As from ERTS 5.7.2 the runtime system passes a distribution flag in the handshake stage that enables the use of a <seealso marker="erl_ext_dist#distribution_header">distribution header </seealso> on all messages passed. Messages passed between nodes have in @@ -869,7 +869,7 @@ DiB == gen_digest(ChA, ICA)? number is omitted from the terms that follow a distribution header </seealso>.</p> - <p>Nodes with an <c>ERTS</c> version earlier than 5.7.2 does not pass the + <p>Nodes with an ERTS version earlier than 5.7.2 does not pass the distribution flag that enables the distribution header. Messages passed between nodes have in this case the following format:</p> |