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/crypto/doc/src | |
| 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/crypto/doc/src')
| -rw-r--r-- | lib/crypto/doc/src/engine_keys.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/engine_keys.xml b/lib/crypto/doc/src/engine_keys.xml index b28606fb4e..f78bb81bba 100644 --- a/lib/crypto/doc/src/engine_keys.xml +++ b/lib/crypto/doc/src/engine_keys.xml @@ -51,7 +51,7 @@ <p> OTP/Crypto requires that the user provides two or three items of information about the key. The application used by the user is usually on a higher level, for example in - <seealso marker="ssl:ssl#key_option_def">SSL</seealso>. If using + <seealso marker="ssl:ssl#type-key">SSL</seealso>. If using the crypto application directly, it is required that: </p> <list> |