diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-04-27 19:13:51 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-04-27 19:13:51 +0200 |
| commit | 91a6dc5c75f23164a9b9100dbe96ebd2fee6860b (patch) | |
| tree | dbff2719a538ec8e9728f27fe647c2a1a6ac79cb /lib/kernel | |
| parent | c135bf3837bea0c3560a4808f5175c06c20d9bd4 (diff) | |
| parent | 57dffc2e9adffd5834a18f837b7d06edf8de8e92 (diff) | |
| download | otp-91a6dc5c75f23164a9b9100dbe96ebd2fee6860b.tar.gz otp-91a6dc5c75f23164a9b9100dbe96ebd2fee6860b.tar.bz2 otp-91a6dc5c75f23164a9b9100dbe96ebd2fee6860b.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/doc/src/gen_sctp.xml | 6 | ||||
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml index 7275c40e6a..e327a4f907 100644 --- a/lib/kernel/doc/src/gen_sctp.xml +++ b/lib/kernel/doc/src/gen_sctp.xml @@ -123,7 +123,7 @@ <p>Completely closes the socket and all associations on it. The unsent data is flushed as in <c>eof/2</c>. The <c>close/1</c> call is blocking or otherwise depending of the value of - the <seealso marker="#option-linger">linger</seealso> socket + the <seealso marker="inet#option-linger">linger</seealso> socket <seealso marker="#options">option</seealso>. If <c>close</c> does not linger or linger timeout expires, the call returns and the data is flushed in the background.</p> @@ -309,8 +309,8 @@ <seealso marker="#option-active">passive</seealso> mode, with <anno>SockType</anno> <c>seqpacket</c>, and with reasonably large - <seealso marker="#option-sndbuf">kernel</seealso> and driver - <seealso marker="#option-buffer">buffers.</seealso></p> + <seealso marker="inet#option-sndbuf">kernel</seealso> and driver + <seealso marker="inet#option-buffer">buffers.</seealso></p> </desc> </func> <func> diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index 2c63a3ffa7..32b4a429dd 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -449,6 +449,7 @@ fe80::204:acff:fe17:bf38 <tag><c>{broadcast, Boolean}</c>(UDP sockets)</tag> <item> <p>Enable/disable permission to send broadcasts.</p> + <marker id="option-buffer"></marker> </item> <tag><c>{buffer, Size}</c></tag> @@ -526,6 +527,7 @@ fe80::204:acff:fe17:bf38 the other end does not respond, the connection is considered broken and an error message will be sent to the controlling process. Default disabled.</p> + <marker id="option-linger"></marker> </item> <tag><c>{linger, {true|false, Seconds}}</c></tag> @@ -695,6 +697,7 @@ fe80::204:acff:fe17:bf38 returns <c>{error,timeout}</c>. The recommended setting is <c>true</c> which will automatically close the socket. Default is <c>false</c> due to backward compatibility.</p> + <marker id="option-sndbuf"></marker> </item> <tag><c>{sndbuf, Size}</c></tag> |