aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-10-21 16:09:13 +0200
committerFredrik Gustafsson <[email protected]>2013-10-21 16:09:13 +0200
commitc020cc9494fc364e2d2dca715585b791dc3184d5 (patch)
tree876bc6a167f3d268c5fee3a9217111e0040f0979 /lib/kernel
parent9676a78c5cdeeea311048a7d9630f333811747d1 (diff)
parent20363d9af0f0f9446d3a1dfb099f4aa1898dc231 (diff)
downloadotp-c020cc9494fc364e2d2dca715585b791dc3184d5.tar.gz
otp-c020cc9494fc364e2d2dca715585b791dc3184d5.tar.bz2
otp-c020cc9494fc364e2d2dca715585b791dc3184d5.zip
Merge branch 'mhssler/fix-doc-typos/OTP-11414' into maint
* mhssler/fix-doc-typos/OTP-11414: Fix ssh doc typos Fix gen_sctp doc typo Fix erts erlang.xml doc typo
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/gen_sctp.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 7ea58fffff..33f1c20608 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -322,7 +322,7 @@
<p>
Branch off an existing association <anno>Assoc</anno>
in a socket <anno>Socket</anno> of type <c>seqpacket</c>
- (one-to-may style) into
+ (one-to-many style) into
a new socket <anno>NewSocket</anno> of type <c>stream</c>
(one-to-one style).
</p>