aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2011-09-28 10:13:35 +0200
committerIngela Anderton Andin <ingela@erlang.org>2011-09-28 10:13:35 +0200
commitcb6123e1fe26fdd03bfac55c10c2aecabd5eb0ab (patch)
treed98b3dae8828a8e853d77fc5aa705b2526f7ff73 /lib/ssl
parentdf735da124c10ace126f49ab0153c905d0819a30 (diff)
parent814b77adcc273bb0ca4194fd423d05fa534e1a89 (diff)
downloadotp-cb6123e1fe26fdd03bfac55c10c2aecabd5eb0ab.tar.gz
otp-cb6123e1fe26fdd03bfac55c10c2aecabd5eb0ab.tar.bz2
otp-cb6123e1fe26fdd03bfac55c10c2aecabd5eb0ab.zip
Merge branch 'dev' into major
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>