aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src/gen_udp.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/gen_udp.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/gen_udp.xml')
-rw-r--r--lib/kernel/doc/src/gen_udp.xml2
1 files changed, 1 insertions, 1 deletions
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>