diff options
| author | Rickard Green <rickard@erlang.org> | 2021-12-15 15:02:07 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2021-12-15 15:02:07 +0100 |
| commit | 97bba97d8f9583b9d66385449cde3c04eadc272d (patch) | |
| tree | 805b868c9676ea6cc2867f6c9ca3cd544b8dd947 /lib/crypto/doc/src/crypto.xml | |
| parent | 09dd2c69ee4192fb2ef7d32754e236f2a29299ce (diff) | |
| parent | df48c260e74c3e9058ff8681ce9f554e6fa0fe34 (diff) | |
| download | erlang-97bba97d8f9583b9d66385449cde3c04eadc272d.tar.gz | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# lib/crypto/doc/src/crypto.xml
# lib/kernel/src/kernel.app.src
Diffstat (limited to 'lib/crypto/doc/src/crypto.xml')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 1fe350f114..862ca960c6 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -1153,7 +1153,7 @@ </func> <func> - <name name="info" arity="0" since="OTP @OTP-17603@"/> + <name name="info" arity="0" since="OTP 24.2"/> <fsummary>Provides information about crypto and the library used by crypto.</fsummary> <desc> <p>Provides a map with information about the compilation and linking of crypto. @@ -1974,7 +1974,7 @@ FloatValue = rand:uniform(). % again </func> <func> - <name name="pbkdf2_hmac" arity="5" since="OTP @OTP-17808@"/> + <name name="pbkdf2_hmac" arity="5" since="OTP 24.2"/> <fsummary>PBKDF2 in combination with HMAC</fsummary> <desc> <p> |