aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2017-05-19 15:27:46 +0200
committerGitHub <[email protected]>2017-05-19 15:27:46 +0200
commit52ace0d2c565a67e587159780114792c55244312 (patch)
tree1b21b16cc9c14cf78f4c9ed30f302bd8165a8736 /lib/inets
parent7ff352ef8a5393a017ce493ba1a1fc3be54be245 (diff)
parenta237426d43b73d931739d9acb86a17513b44ed3e (diff)
downloadotp-52ace0d2c565a67e587159780114792c55244312.tar.gz
otp-52ace0d2c565a67e587159780114792c55244312.tar.bz2
otp-52ace0d2c565a67e587159780114792c55244312.zip
Merge branch 'master' into jv-gen-server-exits
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/doc/src/httpc.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 4217b3c4fb..46484977c9 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -344,7 +344,7 @@
<tag><c><![CDATA[ssl]]></c></tag>
<item>
<p>This is the <c>SSL/TLS</c> connectin configuration option.</p>
- <p>Defaults to <c>[]</c>. See <seealso marker="ssl:ssl">ssl:connect/[2, 3,4]</seealso> for availble options.</p>
+ <p>Defaults to <c>[]</c>. See <seealso marker="ssl:ssl">ssl:connect/[2,3,4]</seealso> for available options.</p>
</item>
<tag><c><![CDATA[autoredirect]]></c></tag>