diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-03-01 14:11:28 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-03-01 14:11:28 +0100 |
| commit | aa74dd15c39d6b859456aafd78d435763436725d (patch) | |
| tree | 201b5c338e4e4afb1181ccff52735073fec6153e /erts/doc | |
| parent | 532efc24803e19f47ce19124f4be16a42ac94a75 (diff) | |
| parent | 75bc5bebc070a59535b8f6b7b9085c210b4723b5 (diff) | |
| download | otp-aa74dd15c39d6b859456aafd78d435763436725d.tar.gz otp-aa74dd15c39d6b859456aafd78d435763436725d.tar.bz2 otp-aa74dd15c39d6b859456aafd78d435763436725d.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/epmd.xml | 2 | ||||
| -rw-r--r-- | erts/doc/src/erl.xml | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml index 28fcc8f7af..7f61804bea 100644 --- a/erts/doc/src/epmd.xml +++ b/erts/doc/src/epmd.xml @@ -37,7 +37,7 @@ <comsummary> <p>Erlang Port Mapper Daemon</p> <taglist> - <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-port No] [-daemon] [-relaxed_command_check]]]></c></tag> + <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-address Addresses] [-port No] [-daemon] [-relaxed_command_check]]]></c></tag> <item> <p>Starts the port mapper daemon</p> </item> diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 1c4a0056a7..096af096dc 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -387,6 +387,28 @@ <p>Replaces the path specified in the boot script. See <seealso marker="sasl:script">script(4)</seealso>.</p> </item> + <tag><c><![CDATA[-proto_dist Proto]]></c></tag> + <item> + <p>Specify a protocol for Erlang distribution.</p> + <taglist> + <tag><c>inet_tcp</c></tag> + <item> + <p>TCP over IPv4 (the default)</p> + </item> + <tag><c>inet_tls</c></tag> + <item> + <p>distribution over TLS/SSL</p> + </item> + <tag><c>inet6_tcp</c></tag> + <item> + <p>TCP over IPv6</p> + </item> + </taglist> + <p>For example, to start up IPv6 distributed nodes:</p> +<pre> +% <input>erl -name [email protected] -proto_dist inet6_tcp</input> +</pre> + </item> <tag><c><![CDATA[-remsh Node]]></c></tag> <item> <p>Starts Erlang with a remote shell connected to <c><![CDATA[Node]]></c>.</p> |