aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src/inet.xml
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-04-18 11:56:19 +0200
committerPatrik Nyblom <[email protected]>2012-04-18 11:56:19 +0200
commitcff02d4925bfd6ed88d9d7b897f4b4416e4643ce (patch)
treeedb748eddafa80d084cf5ef271d68b042d8f0a80 /lib/kernel/doc/src/inet.xml
parent00668f8cbae565d482e9ad72a63f846cef8e8071 (diff)
parenta76628f8f0de895e318c11585a53983e476d692c (diff)
downloadotp-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/doc/src/inet.xml')
-rw-r--r--lib/kernel/doc/src/inet.xml4
1 files changed, 2 insertions, 2 deletions
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>