diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-10-06 11:53:52 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-10-06 11:53:52 +0200 |
| commit | 00202339445daae6ed931f28f932089d5c3dd455 (patch) | |
| tree | c08c4bb7b615ccb1b3325ce7ad65179a5f15be2a /lib/ssl/doc/src/refman.xml | |
| parent | 811e0de29d02031acb0771e1fa74d8f4f97574a6 (diff) | |
| parent | 64a3651b3ece1a1e3195f20e37247f929d179f61 (diff) | |
| download | otp-00202339445daae6ed931f28f932089d5c3dd455.tar.gz otp-00202339445daae6ed931f28f932089d5c3dd455.tar.bz2 otp-00202339445daae6ed931f28f932089d5c3dd455.zip | |
Merge branch 'ia/ssl/remove-old-ssl/OTP-7048'
* ia/ssl/remove-old-ssl/OTP-7048:
Remove old ssl implementation and deprecated function ssl:peercert/1
Conflicts:
lib/ssl/test/Makefile
Diffstat (limited to 'lib/ssl/doc/src/refman.xml')
| -rw-r--r-- | lib/ssl/doc/src/refman.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/refman.xml b/lib/ssl/doc/src/refman.xml index 68f84660f3..011819e82b 100644 --- a/lib/ssl/doc/src/refman.xml +++ b/lib/ssl/doc/src/refman.xml @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="latin1" ?> +<?xml version="1.0" encoding="iso-8859-1" ?> <!DOCTYPE application SYSTEM "application.dtd"> <application xmlns:xi="http://www.w3.org/2001/XInclude"> <header> <copyright> - <year>1999</year><year>2010</year> + <year>1999</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -45,7 +45,6 @@ </description> <xi:include href="ssl_app.xml"/> <xi:include href="ssl.xml"/> - <xi:include href="old_ssl.xml"/> <xi:include href="ssl_session_cache_api.xml"/> </application> |