diff options
author | Ingela Anderton Andin <ingela@erlang.org> | 2019-02-05 14:54:11 +0100 |
---|---|---|
committer | Ingela Anderton Andin <ingela@erlang.org> | 2019-02-05 14:54:11 +0100 |
commit | c2126443b79aa53c9fc04e7dad4e6c717ca6986b (patch) | |
tree | c9b6fe193570f7a0af59b186f02d9b9c7993f87d /lib/ftp | |
parent | a1dacff6a68d905b7620debfbdd401e50fad869e (diff) | |
parent | e042afe54727ae490d47eae47c6d9a210f04dd47 (diff) | |
download | otp-c2126443b79aa53c9fc04e7dad4e6c717ca6986b.tar.gz otp-c2126443b79aa53c9fc04e7dad4e6c717ca6986b.tar.bz2 otp-c2126443b79aa53c9fc04e7dad4e6c717ca6986b.zip |
Merge branch 'ingela/ssl/alert-return/OTP-15423' into maint
* ingela/ssl/alert-return/OTP-15423:
ssl: Use specs to generate type documentation
ssl: Enhance error handling
Diffstat (limited to 'lib/ftp')
-rw-r--r-- | lib/ftp/doc/src/ftp.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ftp/doc/src/ftp.xml b/lib/ftp/doc/src/ftp.xml index ead2367925..9645b03364 100644 --- a/lib/ftp/doc/src/ftp.xml +++ b/lib/ftp/doc/src/ftp.xml @@ -550,7 +550,7 @@ <v>ipfamily() = inet | inet6 | inet6fb4 (default is inet)</v> <v>port() = integer() > 0 (default is 21)</v> <v>mode() = active | passive (default is passive)</v> - <v>tls_options() = [<seealso marker="ssl:ssl#type-ssloption">ssl:ssloption()</seealso>]</v> + <v>tls_options() = [<seealso marker="ssl:ssl#type-tls_option">ssl:tls_option()</seealso>]</v> <v>sock_opts() = [<seealso marker="kernel:gen_tcp#type-option">gen_tcp:option()</seealso> except for ipv6_v6only, active, packet, mode, packet_size and header</v> <v>timeout() = integer() > 0 (default is 60000 milliseconds)</v> <v>dtimeout() = integer() > 0 | infinity (default is infinity)</v> |