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_app.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_app.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl_app.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml index 2ba6f48611..178bbcaebb 100644 --- a/lib/ssl/doc/src/ssl_app.xml +++ b/lib/ssl/doc/src/ssl_app.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="latin1" ?> +<?xml version="1.0" encoding="iso-8859-1" ?> <!DOCTYPE appref SYSTEM "appref.dtd"> <appref> @@ -29,7 +29,17 @@ sockets.</appsummary> <section> - <title>Environment</title> + <title>DEPENDENCIES</title> + <p>The ssl application uses the Erlang applications public_key and + crypto to handle public keys and encryption, hence these + applications needs to be loaded for the ssl application to work. In + an embedded environment that means they need to be started with + application:start/[1,2] before the ssl application is started. + </p> + </section> + + <section> + <title>ENVIRONMENT</title> <p>The following application environment configuration parameters are defined for the SSL application. Refer to application(3) for more information about configuration parameters. |