diff options
author | Ingela Anderton Andin <[email protected]> | 2016-02-18 12:06:51 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-02-18 12:06:51 +0100 |
commit | 2b01586730f2e59064ecd9cc1bf8a9a207d41764 (patch) | |
tree | fd4f9731d177008f28bfd1214547b3d65fdb1fc0 /lib/public_key/doc/src/public_key_records.xml | |
parent | 44faa18995371b985c7c0648a7dc1efff5e3afb5 (diff) | |
parent | d5e60238a01c87782cb02c8b7613a0984a7ddeb6 (diff) | |
download | otp-2b01586730f2e59064ecd9cc1bf8a9a207d41764.tar.gz otp-2b01586730f2e59064ecd9cc1bf8a9a207d41764.tar.bz2 otp-2b01586730f2e59064ecd9cc1bf8a9a207d41764.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/public_key/doc/src/public_key_records.xml')
-rw-r--r-- | lib/public_key/doc/src/public_key_records.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml index fb03da3150..d34f3ed9a3 100644 --- a/lib/public_key/doc/src/public_key_records.xml +++ b/lib/public_key/doc/src/public_key_records.xml @@ -57,9 +57,9 @@ <taglist> <tag><c>time() =</c></tag> - <item><p><c>uct_time() | general_time()</c></p></item> + <item><p><c>utc_time() | general_time()</c></p></item> - <tag><c>uct_time() =</c></tag> + <tag><c>utc_time() =</c></tag> <item><p><c>{utcTime, "YYMMDDHHMMSSZ"}</c></p></item> <tag><c>general_time() =</c></tag> @@ -144,7 +144,7 @@ <section> <title>DSA</title> - <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digigital Signature Algorithm (DSA)</url> keys</p> + <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digital Signature Algorithm (DSA)</url> keys</p> <code> #'DSAPrivateKey',{ version, % integer() |