aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2015-03-02 15:08:52 +0100
committerRaimo Niskanen <[email protected]>2015-03-02 15:08:52 +0100
commit27f4f54b13159ef9d2c430e2107ce2803374cfc3 (patch)
tree255ff6fa832179d53fc73a34aa28153a6c5cf66f /lib/kernel/doc/src
parent5f08be20308db9680c9d7e1f01242cedd84a2b4e (diff)
parent14ddc5594d74979a15a256a41fba5f1297aeaa1a (diff)
downloadotp-27f4f54b13159ef9d2c430e2107ce2803374cfc3.tar.gz
otp-27f4f54b13159ef9d2c430e2107ce2803374cfc3.tar.bz2
otp-27f4f54b13159ef9d2c430e2107ce2803374cfc3.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/kernel_app.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 00c6bc33d6..96e3651140 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -4,7 +4,7 @@
<appref>
<header>
<copyright>
- <year>1996</year><year>2014</year>
+ <year>1996</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -188,6 +188,18 @@
<p>Define the <c>First..Last</c> port range for the listener
socket of a distributed Erlang node.</p>
</item>
+ <tag><c>{inet_dist_listen_options, Opts}</c></tag>
+ <item>
+ <p>Define a list of extra socket options to be used when opening the
+ listening socket for a distributed Erlang node.
+ See <seealso marker="gen_tcp#listen/2">gen_tcp:listen/2</seealso></p>
+ </item>
+ <tag><c>{inet_dist_connect_options, Opts}</c></tag>
+ <item>
+ <p>Define a list of extra socket options to be used when connecting to
+ other distributed Erlang nodes.
+ See <seealso marker="gen_tcp#connect/4">gen_tcp:connect/4</seealso></p>
+ </item>
<tag><c>inet_parse_error_log = silent</c></tag>
<item>
<p>If this configuration parameter is set, no