aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-07-30 16:43:36 +0200
committerMicael Karlberg <[email protected]>2019-07-30 16:43:36 +0200
commitd065c9b0a4ca53f73b9b586b40f6b5a4d2909a99 (patch)
treeb7c14e86e317b104089a4b3eac1081787aa4016a /erts/doc
parent478488a2e75e8e73b8dfc7b6f22fd1f0bfbc04eb (diff)
parentd48d2e6b914582df5fb589113fc4201c64806591 (diff)
downloadotp-d065c9b0a4ca53f73b9b586b40f6b5a4d2909a99.tar.gz
otp-d065c9b0a4ca53f73b9b586b40f6b5a4d2909a99.tar.bz2
otp-d065c9b0a4ca53f73b9b586b40f6b5a4d2909a99.zip
Merge branch 'bmk/erts/esock/20190717/socket_options/OTP-15904' into maint
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/socket_usage.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/doc/src/socket_usage.xml b/erts/doc/src/socket_usage.xml
index 3d6a961417..dd54e51813 100644
--- a/erts/doc/src/socket_usage.xml
+++ b/erts/doc/src/socket_usage.xml
@@ -199,7 +199,7 @@
<cell><em>Other Requirements and comments</em></cell>
</row>
<row>
- <cell>acceptcon</cell>
+ <cell>acceptconn</cell>
<cell>boolean()</cell>
<cell>no</cell>
<cell>yes</cell>
@@ -210,7 +210,9 @@
<cell>string()</cell>
<cell>yes</cell>
<cell>yes</cell>
- <cell>none</cell>
+ <cell>Before Linux 3.8, this socket option could be set, but not get.
+ Only works for some socket types (e.g. <c>inet</c>).
+ If empty value is set, the binding is removed.</cell>
</row>
<row>
<cell>broadcast</cell>