aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-08-06 14:57:27 +0200
committerLukas Larsson <[email protected]>2014-08-06 14:57:27 +0200
commitdcf09f26e33189f3a1ce8d5924d005a2cb7c42df (patch)
treeacc1ba254885c218c8122d19359b6c53915fcc2c /lib/kernel/doc
parent9372074ed6637c3b370457a6e38bc8cfa8aff7a8 (diff)
parentf3220cea004a277b477b0f53cc35ab8122a53792 (diff)
downloadotp-dcf09f26e33189f3a1ce8d5924d005a2cb7c42df.tar.gz
otp-dcf09f26e33189f3a1ce8d5924d005a2cb7c42df.tar.bz2
otp-dcf09f26e33189f3a1ce8d5924d005a2cb7c42df.zip
Merge branch 'maint'
* maint: erts: Fix tc and docs after {fd,FD} bind change
Diffstat (limited to 'lib/kernel/doc')
-rw-r--r--lib/kernel/doc/src/gen_udp.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 503725fe18..291d1b0da7 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -84,7 +84,12 @@
<item>
<p>If a socket has somehow been opened without using
<c>gen_udp</c>, use this option to pass the file
- descriptor for it.</p>
+ descriptor for it. If <c><anno>Port</anno></c> is not set to 0
+ and/or <c>{ip, ip_address()}</c> is combined with this option
+ the fd will be bound to the given interface and port after being
+ opened. If these options are not given it is assumed that the fd
+ is already bound appropriately.
+ </p>
</item>
<tag><c>inet6</c></tag>
<item>