aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-09-28 10:11:03 +0200
committerIngela Anderton Andin <[email protected]>2011-09-28 10:11:03 +0200
commit814b77adcc273bb0ca4194fd423d05fa534e1a89 (patch)
tree8cd18604cb39f397495aa0050022db387d21fa44 /lib/ssl
parentcbb7313a14f83b3947c9d2067f5ebcabc0c0b3a0 (diff)
parent12014af687bc8555fce572493cadfd0cc872ed59 (diff)
downloadotp-814b77adcc273bb0ca4194fd423d05fa534e1a89.tar.gz
otp-814b77adcc273bb0ca4194fd423d05fa534e1a89.tar.bz2
otp-814b77adcc273bb0ca4194fd423d05fa534e1a89.zip
Merge branch 'ia/ssl/doc-fix' into dev
* ia/ssl/doc-fix: Corrected documentation bug
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/doc/src/ssl.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 0c4c8796be..47991ca477 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -649,10 +649,10 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
<p> Upgrades a gen_tcp, or
equivalent, socket to an ssl socket i.e. performs the
ssl server-side handshake.</p>
- <p><warning>Note that the listen socket should be in {active, false} mode
+ <warning><p>Note that the listen socket should be in {active, false} mode
before telling the client that the server is ready to upgrade
and calling this function, otherwise the upgrade may
- or may not succeed depending on timing.</warning></p>
+ or may not succeed depending on timing.</p></warning>
</desc>
</func>