diff options
Diffstat (limited to 'erts/doc/src/erl_dist_protocol.xml')
| -rw-r--r-- | erts/doc/src/erl_dist_protocol.xml | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml index 84f4be208d..25f601a235 100644 --- a/erts/doc/src/erl_dist_protocol.xml +++ b/erts/doc/src/erl_dist_protocol.xml @@ -1,24 +1,25 @@ -<?xml version="1.0" encoding="iso-8859-1" ?> +<?xml version="1.0" encoding="utf-8" ?> <!DOCTYPE chapter SYSTEM "chapter.dtd"> <chapter> <header> <copyright> <year>2007</year> - <year>2013</year> + <year>2015</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. </legalnotice> @@ -363,14 +364,14 @@ If Result > 0, the packet only consists of [119, Result]. NodeInfo is, as expressed in Erlang: </p> <code> - io:format("active name ~ts 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 ~ts at port ~p, fd = ~p~n", + io:format("old/unused name ~ts at port ~p, fd = ~p ~n", [NodeName, Port, Fd]). </code> @@ -548,10 +549,10 @@ If Result > 0, the packet only consists of [119, Result]. --> </section> - <marker id="distribution_handshake"/> <section> <title>Distribution Handshake</title> <p> + <marker id="distribution_handshake"/> This section describes the distribution handshake protocol introduced in the OTP-R6 release of Erlang/OTP. This description was previously located in @@ -929,11 +930,14 @@ DiB == gen_digest(ChA,ICA) ? <tag><c>SEND</c></tag> <item> <p> - <c>{2, Cookie, ToPid}</c> + <c>{2, Unused, ToPid}</c> </p> <p> <em>Note</em> followed by <c>Message</c> </p> + <p> + <c>Unused</c> is kept for backward compatibility + </p> </item> <tag><c>EXIT</c></tag> @@ -960,11 +964,14 @@ DiB == gen_digest(ChA,ICA) ? <tag><c>REG_SEND</c></tag> <item> <p> - <c>{6, FromPid, Cookie, ToName}</c> + <c>{6, FromPid, Unused, ToName}</c> </p> <p> <em>Note</em> followed by <c>Message</c> </p> + <p> + <c>Unused</c> is kept for backward compatibility + </p> </item> <tag><c>GROUP_LEADER</c></tag> @@ -990,11 +997,14 @@ DiB == gen_digest(ChA,ICA) ? <tag><c>SEND_TT</c></tag> <item> <p> - <c>{12, Cookie, ToPid, TraceToken}</c> + <c>{12, Unused, ToPid, TraceToken}</c> </p> <p> <em>Note</em> followed by <c>Message</c> </p> + <p> + <c>Unused</c> is kept for backward compatibility + </p> </item> <tag><c>EXIT_TT</c></tag> @@ -1007,11 +1017,14 @@ DiB == gen_digest(ChA,ICA) ? <tag><c>REG_SEND_TT</c></tag> <item> <p> - <c>{16, FromPid, Cookie, ToName, TraceToken}</c> + <c>{16, FromPid, Unused, ToName, TraceToken}</c> </p> <p> <em>Note</em> followed by <c>Message</c> </p> + <p> + <c>Unused</c> is kept for backward compatibility + </p> </item> <tag><c>EXIT2_TT</c></tag> |