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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | lib/ssl/doc/src/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile index 3119d37af0..5d808d6727 100644 --- a/lib/ssl/doc/src/Makefile +++ b/lib/ssl/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1999-2010. All Rights Reserved. +# Copyright Ericsson AB 1999-2011. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -37,7 +37,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) # Target Specs # ---------------------------------------------------- XML_APPLICATION_FILES = refman.xml -XML_REF3_FILES = ssl.xml old_ssl.xml ssl_session_cache_api.xml +XML_REF3_FILES = ssl.xml ssl_session_cache_api.xml XML_REF6_FILES = ssl_app.xml XML_PART_FILES = release_notes.xml usersguide.xml |