aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erl_dist_protocol.xml
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-11-04 13:04:49 +0100
committerHans Bolinder <[email protected]>2015-11-04 13:04:49 +0100
commit4ddb88db95442d18abe654ba1ff788e98eebe375 (patch)
tree001b76ff15e5686da1527a65aefa43874399c782 /erts/doc/src/erl_dist_protocol.xml
parent4f085471fc4e1886bd7549cf135e7038a87e6a8e (diff)
parent15770ab1b5587e890b7e4f557a4803291a37d2f8 (diff)
downloadotp-4ddb88db95442d18abe654ba1ff788e98eebe375.tar.gz
otp-4ddb88db95442d18abe654ba1ff788e98eebe375.tar.bz2
otp-4ddb88db95442d18abe654ba1ff788e98eebe375.zip
Merge branch 'hb/correct_doc_tags' into maint
* hb/correct_doc_tags: [erl_docgen] Correct documentation [dialyzer] Correct documentation [hipe] Correct documentation [test_server] Correct documentation [tools] Correct documentation [erts] Correct documentation [stdlib] Correct documentation [kernel] Correct documentation
Diffstat (limited to 'erts/doc/src/erl_dist_protocol.xml')
-rw-r--r--erts/doc/src/erl_dist_protocol.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml
index e1a58856f3..b435d5c9b4 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>2013</year>
+ <year>2015</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -549,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