diff options
author | Ingela Anderton Andin <[email protected]> | 2015-05-04 11:06:09 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-05-04 11:06:09 +0200 |
commit | e14b011a35b39e12d75786b07f5fd27e09530dad (patch) | |
tree | 9b49a28e65e38648b7ec5254ce9ac06ff434c10c /lib/ssl/doc/src/ssl_app.xml | |
parent | 33a27226f7402b2daea5c107e94790426e66ea74 (diff) | |
parent | 3ca0dbbcfaab00810c2c19980a2e7041d6ba5567 (diff) | |
download | otp-e14b011a35b39e12d75786b07f5fd27e09530dad.tar.gz otp-e14b011a35b39e12d75786b07f5fd27e09530dad.tar.bz2 otp-e14b011a35b39e12d75786b07f5fd27e09530dad.zip |
Merge branch 'ia/ssl/docs'
* ia/ssl/docs:
ssl: Add missing tag
ssl: Put back marker
ssl: Fix links
ssl: Align with application naming rules
ssl: Keep information in one place only
ssl: Correct makefile
Diffstat (limited to 'lib/ssl/doc/src/ssl_app.xml')
-rw-r--r-- | lib/ssl/doc/src/ssl_app.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml index 43c69ba377..f17f5cb9fe 100644 --- a/lib/ssl/doc/src/ssl_app.xml +++ b/lib/ssl/doc/src/ssl_app.xml @@ -35,21 +35,21 @@ <description></description> <section> <title>DEPENDENCIES</title> - <p>The <c>ssl</c> application uses the <c>public_key</c> and - <c>crypto</c> application to handle public keys and encryption, hence - these applications must be loaded for the <c>ssl</c> application to work. + <p>The SSL application uses the <c>public_key</c> and + Crypto application to handle public keys and encryption, hence + these applications must be loaded for the SSL application to work. In an embedded environment this means they must be started with - <c>application:start/[1,2]</c> before the <c>ssl</c> application is + <c>application:start/[1,2]</c> before the SSL application is started.</p> </section> <section> <title>CONFIGURATION</title> <p>The application environment configuration parameters in this section - are defined for the <c>ssl</c> application. For more information + are defined for the SSL application. For more information about configuration parameters, see the <seealso marker="kernel:application">application(3)</seealso> - manual page in <c>kernel</c>.</p> + manual page in Kernel.</p> <p>The environment parameters can be set on the command line, for example:</p> @@ -60,7 +60,7 @@ <tag><c><![CDATA[protocol_version = <seealso marker="kernel:error_logger">ssl:protocol()</seealso> <optional>]]></c>.</tag> <item><p>Protocol supported by started clients and servers. If this option is not set, it defaults to all - protocols currently supported by the <c>ssl</c> application. + protocols currently supported by the SSL application. This option can be overridden by the version option to <c>ssl:connect/[2,3]</c> and <c>ssl:listen/2</c>.</p></item> @@ -91,7 +91,7 @@ <section> <title>ERROR LOGGER AND EVENT HANDLERS</title> - <p>The <c>ssl</c> applications uses the default <seealso marker="kernel:error_logger">OTP error logger</seealso> to log unexpected errors and TLS alerts. The logging of TLS alerts may be turned off with the <c>log_alert</c> option. </p> + <p>The SSL application uses the default <seealso marker="kernel:error_logger">OTP error logger</seealso> to log unexpected errors and TLS alerts. The logging of TLS alerts may be turned off with the <c>log_alert</c> option. </p> </section> <section> |