aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2013-11-20 12:04:16 +0100
committerHans Nilsson <[email protected]>2013-11-20 12:04:16 +0100
commit265f95e7fc9f813c7d0c7d1fb64e5084515089c9 (patch)
tree9525eed9a4989228c588451661fa9de3f5db187e /lib/ssl/doc/src
parent4bb55a35e516cb407bdda1b319ab2cd0bb85a3b8 (diff)
parent0d57daec5738447eb033681834146bf31dfd266c (diff)
downloadotp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.tar.gz
otp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.tar.bz2
otp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.zip
Merge branch 'hans/inets/ftps/OTP-11037' into maint
* hans/inets/ftps/OTP-11037: ftp,ssl: Fixes broken type link (ssloption). ftp: Adds dynamic cert generation to tests. ftp: Clean Makefile and conf file ftp: Linking rfc-refs. ftp: Add documentation. ftp: delete old test files ftp: small fixes ftp: Add ftps documentation ftp: Add timeouts to ssl:connect ftps: working . added some printouts ftp: towards a working ftps, chapter 1 ftp: old ftp_SUITE re-written and works ftp: Implement ftps (upgrade to TLS) ftp: Implement ftps (upgrade to TLS)
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/ssl.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 19c0c8c9ee..1d74faf1b3 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -76,7 +76,7 @@
<seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso>.
</p>
- <p> <c>ssloption() = {verify, verify_type()} |
+ <p><marker id="type-ssloption"></marker><c>ssloption() = {verify, verify_type()} |
{verify_fun, {fun(), term()}} |
{fail_if_no_peer_cert, boolean()}
{depth, integer()} |