aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-04-16 15:04:05 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-04-16 15:04:05 +0200
commitf1a49c45e4b2ec746407fd777ba31fec6cab118e (patch)
treebe88926165f7067bc953bf5203791241b5554801 /lib/kernel/src
parent861454268770e05bd72312c1a46560ed29a42500 (diff)
parent57c50be011a5005639d2be38f1c9f538d9f00f75 (diff)
downloadotp-f1a49c45e4b2ec746407fd777ba31fec6cab118e.tar.gz
otp-f1a49c45e4b2ec746407fd777ba31fec6cab118e.tar.bz2
otp-f1a49c45e4b2ec746407fd777ba31fec6cab118e.zip
Merge branch 'egil/inet-document-options/OTP-10053' into maint
* egil/inet-document-options/OTP-10053: kernel: Document ifaddr option kernel: Document tcp-, udp- and sctp_module option kernel: Remove bit8 option in spec kernel: Document bit8 option in inet:setopts/2 kernel: Initial doc of forgotten inet options
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/gen_tcp.erl2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index ef6bfdf7f4..e6dfdadb03 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -31,7 +31,6 @@
-type option() ::
{active, true | false | once} |
- {bit8, clear | set | on | off} |
{buffer, non_neg_integer()} |
{delay_send, boolean()} |
{deliver, port | term} |
@@ -61,7 +60,6 @@
{tos, non_neg_integer()}.
-type option_name() ::
active |
- bit8 |
buffer |
delay_send |
deliver |