diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-04-27 19:13:15 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-04-27 19:13:15 +0200 |
| commit | 57dffc2e9adffd5834a18f837b7d06edf8de8e92 (patch) | |
| tree | bba3769ccaef5b763d2c68ea915cc569ee25f634 /lib/kernel | |
| parent | f73c09acbb61425e26093c44889ebce3582c0280 (diff) | |
| parent | 806798d6beda18ddec29b7f4ed09b3ea6d75c532 (diff) | |
| download | otp-57dffc2e9adffd5834a18f837b7d06edf8de8e92.tar.gz otp-57dffc2e9adffd5834a18f837b7d06edf8de8e92.tar.bz2 otp-57dffc2e9adffd5834a18f837b7d06edf8de8e92.zip | |
Merge branch 'egil/fix-compiler-warnings' into maint
* egil/fix-compiler-warnings:
erl_docgen: Do not overflow images for pdf doc gen
kernel: Fix missing documentation link anchors
megaco: Fix parallel make for behaviours
inets: Fix parallel make for behaviours
ssh: Fix parallel make for behaviours
eunit: Fix parallel make for behaviours
ssl: Fix parallel make for behaviours
wx: configure.in needs AC_LANG_SOURCE
gs: Suppress ignored result warning
erts: Remove unused variable
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 901b4f5c34..096ddfd847 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -459,6 +459,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> @@ -536,6 +537,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> @@ -705,6 +707,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> |