aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-11-20 10:52:30 +0100
committerLukas Larsson <[email protected]>2017-11-20 10:52:30 +0100
commitf91898fc08c28195dd2e9cbfb15bfd91a5584550 (patch)
tree8a500e9a3f7e1a53e55b9cbc3cd4c053d187631c /lib/kernel/doc
parent3b5fced77873fa6ee87a81a6162acf9d9f43c6de (diff)
parentc4606d0ce55eac7c383520de765cffba2c235ace (diff)
downloadotp-f91898fc08c28195dd2e9cbfb15bfd91a5584550.tar.gz
otp-f91898fc08c28195dd2e9cbfb15bfd91a5584550.tar.bz2
otp-f91898fc08c28195dd2e9cbfb15bfd91a5584550.zip
Merge branch 'lukas/system/improve_profile_docs/OTP-14633' into maint
* lukas/system/improve_profile_docs/OTP-14633: erts: Add term2bin note about encoding guarantee Fix broken link in INSTALL howto system: Add info to profiling effeciency guide Update message queue and pinfo binary docs kernel: Clarify gen_tcp:listen documentation system: Add External OSS tools section to profiling guilde
Diffstat (limited to 'lib/kernel/doc')
-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