aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/doc/src/public_key.xml
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2013-01-09 08:35:20 +0100
committerHans Bolinder <[email protected]>2013-01-09 08:35:20 +0100
commit9767e72b44ebd0cd5277634c4a37318479623c2d (patch)
treea63b53163c57875a377952a648f4e824813b5753 /lib/public_key/doc/src/public_key.xml
parentee4d1a790007aa3419b61300936aa20acafda142 (diff)
parent3448e2aa81a01244458824aae94d3e746a9a4c24 (diff)
downloadotp-9767e72b44ebd0cd5277634c4a37318479623c2d.tar.gz
otp-9767e72b44ebd0cd5277634c4a37318479623c2d.tar.bz2
otp-9767e72b44ebd0cd5277634c4a37318479623c2d.zip
Merge branch 'hb/fix_fop_warnings/OTP-10665'
* hb/fix_fop_warnings/OTP-10665: Fix some FOP warnings
Diffstat (limited to 'lib/public_key/doc/src/public_key.xml')
-rw-r--r--lib/public_key/doc/src/public_key.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 2ec1fcff9d..b240d53571 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>2008</year>
- <year>2012</year>
+ <year>2013</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -60,8 +60,9 @@
<p><code>string = [bytes()]</code></p>
- <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
- 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'| 'PrivateKeyInfo' | 'CertificationRequest'</code></p>
+ <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey' |
+ 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo' |
+ 'PrivateKeyInfo' | 'CertificationRequest'</code></p>
<p><code>pem_entry () = {pki_asn1_type(), binary(), %% DER or encrypted DER
not_encrypted | cipher_info()} </code></p>