diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:35:19 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:35:19 +0100 |
| commit | f258633921e7dd0bd5760281d2a26a0f937e53c4 (patch) | |
| tree | 8c6e16902035cbf583c1325c84bfb8f2b118f8cc /lib/ssl/doc/src/ssl.xml | |
| parent | 1d1677c2a85ebce0ada828d254c7a1122b825e0a (diff) | |
| parent | 55569124ac815eedc21c234c447e346b97f3c8fe (diff) | |
| download | otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.gz otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.bz2 otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.zip | |
Merge branch 'ia/ssl/max-sessions/OTP-12392' into maint
* ia/ssl/max-sessions/OTP-12392:
ssl: Fix documentation mistakes
ssl: Add upper limit for session cache
ssl: Measure elapsed time with erlang:monotonic_time
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 22ac98c24e..3a541ed162 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -84,7 +84,7 @@ <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso> manual pages in Kernel.</p></item> - <tag><marker id="type-ssloption"></marker><c>ssloption() =</c></tag> + <tag><marker id="type-ssloption"/><c>ssloption() =</c></tag> <item> <p><c>{verify, verify_type()}</c></p> <p><c>| {verify_fun, {fun(), term()}}</c></p> @@ -160,7 +160,7 @@ <tag><c>sslsocket() =</c></tag> <item><p>opaque()</p></item> - <tag><c>protocol() =</c></tag> + <tag><marker id="type-protocol"/><c>protocol() =</c></tag> <item><p><c>sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'</c></p></item> <tag><c>ciphers() =</c></tag> |