aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-11-20 10:52:42 +0100
committerLukas Larsson <[email protected]>2017-11-20 10:52:42 +0100
commit8aeb2efdb04aefd03a22ee7a9bdb9cc0af333db4 (patch)
tree1b83e4c8e8b2b475c8c4d9ff775c0db95b5498ed /lib/kernel
parenta90b3712dcec20c96eeeecbabc2672ec67c7d89a (diff)
parentf91898fc08c28195dd2e9cbfb15bfd91a5584550 (diff)
downloadotp-8aeb2efdb04aefd03a22ee7a9bdb9cc0af333db4.tar.gz
otp-8aeb2efdb04aefd03a22ee7a9bdb9cc0af333db4.tar.bz2
otp-8aeb2efdb04aefd03a22ee7a9bdb9cc0af333db4.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/gen_tcp.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 070782e1f3..e6104b0c76 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -51,6 +51,7 @@ server() ->
{ok, Sock} = gen_tcp:accept(LSock),
{ok, Bin} = do_recv(Sock, []),
ok = gen_tcp:close(Sock),
+ ok = gen_tcp:close(LSock),
Bin.
do_recv(Sock, Bs) ->
@@ -309,9 +310,9 @@ do_recv(Sock, Bs) ->
<seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>.
</p></item>
</taglist>
- <p>The returned socket <c><anno>ListenSocket</anno></c> can only be
- used in calls to
- <seealso marker="#accept/1"><c>accept/1,2</c></seealso>.</p>
+ <p>The returned socket <c><anno>ListenSocket</anno></c> should be used
+ in calls to <seealso marker="#accept/1"><c>accept/1,2</c></seealso> to
+ accept incoming connection requests.</p>
<note>
<p>The default values for options specified to <c>listen</c> can
be affected by the Kernel configuration parameter