aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src/ssl_protocol.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-12-19 16:16:46 +0100
committerIngela Anderton Andin <[email protected]>2012-12-20 10:35:46 +0100
commit72f5a4a6174338c011e5c3b73b0ad11ca296b5af (patch)
treef691d4b9afd939caed2384e1eae4812479cd7dac /lib/ssl/doc/src/ssl_protocol.xml
parent3bd2ba0060f9bcb0d3bddd74a4a5763e520a533f (diff)
downloadotp-72f5a4a6174338c011e5c3b73b0ad11ca296b5af.tar.gz
otp-72f5a4a6174338c011e5c3b73b0ad11ca296b5af.tar.bz2
otp-72f5a4a6174338c011e5c3b73b0ad11ca296b5af.zip
ssl: Make TLS-1.2 default version
Diffstat (limited to 'lib/ssl/doc/src/ssl_protocol.xml')
-rw-r--r--lib/ssl/doc/src/ssl_protocol.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index 17268a634d..f540dc999b 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2003</year><year>2011</year>
+ <year>2003</year><year>2012</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -25,9 +25,8 @@
<file>ssl_protocol.xml</file>
</header>
- <p>The erlang SSL application currently supports SSL 3.0 and TLS 1.0
- RFC 2246, and will in the future also support later versions of TLS.
- SSL 2.0 is not supported.
+ <p>The erlang SSL application currently implements the protocol SSL/TLS
+ for currently supported versions see <seealso marker="ssl">ssl(3)</seealso>
</p>
<p>By default erlang SSL is run over the TCP/IP protocol even