diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:14:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:57:03 +0100 |
| commit | c44caa428b65e85b034b01a7f6145e5fee60a863 (patch) | |
| tree | ab9e99da4400bf93cc2f512f10f1ebf66452fd80 /lib/public_key/doc | |
| parent | e8ddbc58fda4ca07ff1f2f4d3c77ecae036ee513 (diff) | |
| parent | c2126443b79aa53c9fc04e7dad4e6c717ca6986b (diff) | |
| download | otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.gz otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.bz2 otp-c44caa428b65e85b034b01a7f6145e5fee60a863.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
lib/ssl/src/ssl_cipher_format.erl
lib/ssl/src/tls_handshake.erl
Diffstat (limited to 'lib/public_key/doc')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 4c61139197..9fcedf6ef9 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -644,7 +644,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{}, <v>conf_opt() = {cert, der_encoded()} | {key, PrivateKey} |{cacerts, [der_encoded()]}</v> <d> This is a subset of the type - <seealso marker="ssl:ssl#type-ssloption"> ssl:ssl_option()</seealso>. + <seealso marker="ssl:ssl#type-tls_option"> ssl:tls_option()</seealso>. <c>PrivateKey</c> is what <seealso marker="#generate_key-1">generate_key/1</seealso> returns. |