aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-11-25 12:56:21 +0100
committerBjörn Gustavsson <[email protected]>2016-11-25 12:56:21 +0100
commit0fccaf80ab2348bbb99b7d2d8c25a3de77eebdeb (patch)
treef1c7f42d288b0694bbc3bdaa5c01eabb74b0e412
parenta6e7f5fc7c895f43923fd858d30c2624ca1ee11c (diff)
parent9e0d9398d51afc7fc6fafbcbd0a6a8bdeeb3802f (diff)
downloadotp-0fccaf80ab2348bbb99b7d2d8c25a3de77eebdeb.tar.gz
otp-0fccaf80ab2348bbb99b7d2d8c25a3de77eebdeb.tar.bz2
otp-0fccaf80ab2348bbb99b7d2d8c25a3de77eebdeb.zip
Merge branch 'maint'
* maint: Remove duplicate docs for the priority inet option
-rw-r--r--lib/kernel/doc/src/inet.xml5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index d907cef7d3..4c4a5c39cb 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -987,11 +987,6 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp</code>
<p>Sets the line delimiting character for line-oriented protocols
(<c>line</c>). Defaults to <c>$\n</c>.</p>
</item>
- <tag><c>{priority, Priority}</c></tag>
- <item>
- <p>Sets the protocol-defined priority for all packets to be sent
- on this socket.</p>
- </item>
<tag><c>{raw, Protocol, OptionNum, ValueBin}</c></tag>
<item>
<p>See below.</p>