diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-04-17 20:45:34 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-04-17 20:45:34 +0200 |
| commit | a76628f8f0de895e318c11585a53983e476d692c (patch) | |
| tree | efadffe897f57a1493c3e207cc6394af60a1a75e /lib/kernel | |
| parent | b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce (diff) | |
| parent | 08403af8535261fb2f1eae1c97894d1007b0adcc (diff) | |
| download | otp-a76628f8f0de895e318c11585a53983e476d692c.tar.gz otp-a76628f8f0de895e318c11585a53983e476d692c.tar.bz2 otp-a76628f8f0de895e318c11585a53983e476d692c.zip | |
Merge branch 'egil/inet-fix-doc-typos' into maint
* egil/inet-fix-doc-typos:
doc: Add 'is' to explanation of callback modules
doc: Fix typo in inet
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 522a27dcfa..901b4f5c34 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -523,8 +523,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> |