diff options
author | Henrik Nord <[email protected]> | 2011-03-25 14:55:50 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-03-25 14:55:50 +0100 |
commit | 21a514ba7842380973fd4c4006d6cf71403d021e (patch) | |
tree | ce4332309bdb5e53706d7782ac954a8eaee85724 /lib/kernel | |
parent | ad99d0e01d9c61dfad5e8a32dc587b61e2409edb (diff) | |
parent | 179de7d370b9e0398500d7d0e5ae34dd2ad6c619 (diff) | |
download | otp-21a514ba7842380973fd4c4006d6cf71403d021e.tar.gz otp-21a514ba7842380973fd4c4006d6cf71403d021e.tar.bz2 otp-21a514ba7842380973fd4c4006d6cf71403d021e.zip |
Merge branch 'ta/doc-fixes' into dev
* ta/doc-fixes:
Fix two typos in erlsrv log messages
Fix typo in epmd help
Fix typo in binary:part/2 example
Fix typos in efficiency guide
erts: Fix doc typos, duplication and readability
Fix inet:port/1 doc to match implementation/spec
Fix typos in zip manpage
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/doc/src/inet.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index a22c0a8346..f05a224f33 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -432,7 +432,7 @@ fe80::204:acff:fe17:bf38 </desc> </func> <func> - <name>port(Socket) -> {ok, Port}</name> + <name>port(Socket) -> {ok, Port} | {error, any()}</name> <fsummary>Return the local port number for a socket</fsummary> <type> <v>Socket = socket()</v> |