aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-05-16 17:41:19 +0200
committerRickard Green <[email protected]>2013-05-16 17:41:19 +0200
commit54e5d891203fee38eaa1dcf76d264fb7bac8ef0d (patch)
treea41c37be0c932b8594023c270da1fe525afece5e /lib/kernel/doc/src
parent80129f47df9b227c45b1298e64f3e62096d81bf2 (diff)
parent127f970059371d968238c8e461bc5c547b021899 (diff)
downloadotp-54e5d891203fee38eaa1dcf76d264fb7bac8ef0d.tar.gz
otp-54e5d891203fee38eaa1dcf76d264fb7bac8ef0d.tar.bz2
otp-54e5d891203fee38eaa1dcf76d264fb7bac8ef0d.zip
Merge branch 'rickard/inet_opts/OTP-11075' into maint
* rickard/inet_opts/OTP-11075: Make high_msgq_watermark and low_msgq_watermark generic inet options Conflicts: erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/inet.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 541500a300..7cd98914d1 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -559,7 +559,7 @@ fe80::204:acff:fe17:bf38
<c>[Byte1,Byte2|Binary]</c>.</p>
</item>
- <tag><c>{high_msgq_watermark, Size}</c> (TCP/IP sockets)</tag>
+ <tag><c>{high_msgq_watermark, Size}</c></tag>
<item>
<p>The socket message queue will be set into a busy
state when the amount of data queued on the message
@@ -674,7 +674,7 @@ fe80::204:acff:fe17:bf38
the flushing time-out in seconds.</p>
</item>
- <tag><c>{low_msgq_watermark, Size}</c> (TCP/IP sockets)</tag>
+ <tag><c>{low_msgq_watermark, Size}</c></tag>
<item>
<p>If the socket message queue is in a busy state, the
socket message queue will be set in a not busy state when