diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:36:02 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:36:02 +0100 |
| commit | e9a01bb9d93a462e868cf2549205fcc617ccb0aa (patch) | |
| tree | 065fc362f0d4e1e65b95443f80c2fcdb2281460d /lib/ssl/doc/src/ssl_protocol.xml | |
| parent | 67777601894ba779757daab0f062084ce03a1432 (diff) | |
| parent | 72f5a4a6174338c011e5c3b73b0ad11ca296b5af (diff) | |
| download | otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.tar.gz otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.tar.bz2 otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.zip | |
Merge branch 'ia/ssl/TLS-1.2-default/OTP-10425'
* ia/ssl/TLS-1.2-default/OTP-10425:
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.xml | 7 |
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 |