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_protocol.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_protocol.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl_protocol.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml index 20f53c98e1..cc49515066 100644 --- a/lib/ssl/doc/src/ssl_protocol.xml +++ b/lib/ssl/doc/src/ssl_protocol.xml @@ -32,19 +32,19 @@ <file>ssl_protocol.xml</file> </header> - <p>The Erlang <c>ssl</c> application implements the SSL/TLS protocol + <p>The Erlang SSL application implements the SSL/TLS protocol for the currently supported versions, see the <seealso marker="ssl">ssl(3)</seealso> manual page. </p> - <p>By default <c>ssl</c> is run over the TCP/IP protocol even + <p>By default SSL/TLS is run over the TCP/IP protocol even though you can plug in any other reliable transport protocol with the same Application Programming Interface (API) as the - <c>gen_tcp</c> module in <c>kernel</c>.</p> + <c>gen_tcp</c> module in Kernel.</p> <p>If a client and a server wants to use an upgrade mechanism, such as defined by RFC 2817, to upgrade a regular TCP/IP connection to an SSL - connection, this is supported by the Erlang <c>ssl</c> API. This can be + connection, this is supported by the Erlang SSL application API. This can be useful for, for example, supporting HTTP and HTTPS on the same port and implementing virtual hosting. </p> @@ -143,7 +143,7 @@ connections. Sessions are used to avoid the expensive negotiation of new security parameters for each connection."</p> - <p>Session data is by default kept by the <c>ssl</c> application in a + <p>Session data is by default kept by the SSL application in a memory storage, hence session data is lost at application restart or takeover. Users can define their own callback module to handle session data storage if persistent data storage is |