diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:25:39 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:25:39 +0100 |
| commit | 68ba8d70deb1549dd37a8325eea686c9908f926b (patch) | |
| tree | 50fbabbf3cb2a52b10fc9a629195baf22b8d17ca /lib/kernel/doc | |
| parent | 662e3ffeed74d9121315d86af46430dd71e01709 (diff) | |
| parent | 65ba37d1371f36a1666a53c57ac42c73692b8096 (diff) | |
| download | otp-68ba8d70deb1549dd37a8325eea686c9908f926b.tar.gz otp-68ba8d70deb1549dd37a8325eea686c9908f926b.tar.bz2 otp-68ba8d70deb1549dd37a8325eea686c9908f926b.zip | |
Merge branch 'ph/fix-enfile/OTP-9990' into maint
* ph/fix-enfile/OTP-9990:
Update preloaded prim_inet.beam
gen_tcp: Use correct specs for accept and listen
prim_inet: Catch system_limit in open_port
Fix returned error from gen_tcp:accept/1,2 when running out of ports
Diffstat (limited to 'lib/kernel/doc')
| -rw-r--r-- | lib/kernel/doc/src/gen_tcp.xml | 4 | ||||
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml index 8a5d40bb16..9f362841ce 100644 --- a/lib/kernel/doc/src/gen_tcp.xml +++ b/lib/kernel/doc/src/gen_tcp.xml @@ -235,7 +235,9 @@ do_recv(Sock, Bs) -> <p>Returns <c>{ok, <anno>Socket</anno>}</c> if a connection is established, or <c>{error, closed}</c> if <c><anno>ListenSocket</anno></c> is closed, or <c>{error, timeout}</c> if no connection is established - within the specified time. May also return a POSIX error + within the specified time, + or <c>{error, system_limit}</c> if all available ports in the + Erlang emulator are in use. May also return a POSIX error value if something else goes wrong, see inet(3) for possible error values.</p> <p>Packets can be sent to the returned socket <c><anno>Socket</anno></c> diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index 1a05b4ba99..86950b3ecc 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -149,7 +149,7 @@ fe80::204:acff:fe17:bf38 <fsummary>Return a descriptive string for an error reason</fsummary> <desc> <p>Returns a diagnostic error string. See the section below - for possible <c><anno>Posix</anno></c> values and the corresponding + for possible Posix values and the corresponding strings.</p> </desc> </func> |