diff options
| author | Hans Bolinder <[email protected]> | 2015-11-04 13:14:33 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2015-11-04 13:14:33 +0100 |
| commit | c4fd58a394f427edf54fae75288c3b9159f9cc1a (patch) | |
| tree | 1c7c1d89b8d292546f45a342022ae659069f1ba1 /erts/doc/src/erl_dist_protocol.xml | |
| parent | ce2c23ed1d6b6dc3d1a1c7109ceae255d1203f9f (diff) | |
| parent | 4ddb88db95442d18abe654ba1ff788e98eebe375 (diff) | |
| download | otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.gz otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.bz2 otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.zip | |
Merge branch 'maint'
* maint:
[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
Conflicts:
lib/stdlib/doc/src/erl_scan.xml
Diffstat (limited to 'erts/doc/src/erl_dist_protocol.xml')
| -rw-r--r-- | erts/doc/src/erl_dist_protocol.xml | 4 |
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 |