diff options
| author | Patrik Nyblom <[email protected]> | 2012-04-18 11:56:19 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-04-18 11:56:19 +0200 |
| commit | cff02d4925bfd6ed88d9d7b897f4b4416e4643ce (patch) | |
| tree | edb748eddafa80d084cf5ef271d68b042d8f0a80 /lib/kernel | |
| parent | 00668f8cbae565d482e9ad72a63f846cef8e8071 (diff) | |
| parent | a76628f8f0de895e318c11585a53983e476d692c (diff) | |
| download | otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.gz otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.bz2 otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.zip | |
Merge branch 'maint'
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/doc/src/gen_sctp.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/gen_tcp.xml | 4 | ||||
| -rw-r--r-- | lib/kernel/doc/src/gen_udp.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml index cf1cfb6ec9..7275c40e6a 100644 --- a/lib/kernel/doc/src/gen_sctp.xml +++ b/lib/kernel/doc/src/gen_sctp.xml @@ -574,7 +574,7 @@ <tag><c>{sctp_module, module()}</c></tag> <item> <p> - Override which callback module used. Defaults to + Override which callback module is used. Defaults to <c>inet_sctp</c> for IPv4 and <c>inet6_sctp</c> for IPv6. </p> </item> diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml index 869e305690..daf26a0b63 100644 --- a/lib/kernel/doc/src/gen_tcp.xml +++ b/lib/kernel/doc/src/gen_tcp.xml @@ -132,7 +132,7 @@ do_recv(Sock, Bs) -> <tag><c>{tcp_module, module()}</c></tag> <item> <p> - Override which callback module used. Defaults to + Override which callback module is used. Defaults to <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6. </p> </item> @@ -225,7 +225,7 @@ do_recv(Sock, Bs) -> <tag><c>{tcp_module, module()}</c></tag> <item> <p> - Override which callback module used. Defaults to + Override which callback module is used. Defaults to <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6. </p> </item> diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml index 77e6182884..6b83dfa030 100644 --- a/lib/kernel/doc/src/gen_udp.xml +++ b/lib/kernel/doc/src/gen_udp.xml @@ -97,7 +97,7 @@ <tag><c>{udp_module, module()}</c></tag> <item> <p> - Override which callback module used. Defaults to + Override which callback module is used. Defaults to <c>inet_udp</c> for IPv4 and <c>inet6_udp</c> for IPv6. </p> </item> diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index 3dc54e24b7..2c63a3ffa7 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -513,8 +513,8 @@ fe80::204:acff:fe17:bf38 <tag><c>{high_watermark, Size}</c></tag> <item> <p> - Sender is forced busy if sent and equeued data - readched the highwater mark. + Sender is forced busy if sent and enqueued data + reaches the highwater mark. <br /> Default: 8192 kB. </p> </item> |