aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/doc/src/introduction.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-16 10:25:55 +0100
committerIngela Anderton Andin <[email protected]>2012-11-16 10:25:55 +0100
commit9aa4de3c97b98974f32c2b8e07c971343faf3f13 (patch)
tree19e1b2574a6d27f32c59a343049abfa1ebd41809 /lib/public_key/doc/src/introduction.xml
parent7a637b67d2c97ed682fb338f66ec9aabbf8d47c9 (diff)
parent1180643da5bedf3b3b50ef9c25c361c1c2be7316 (diff)
downloadotp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.tar.gz
otp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.tar.bz2
otp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.zip
Merge branch 'ia/public_key/Additional-PKCS-support/OTP-10509' into maint
* ia/public_key/Additional-PKCS-support/OTP-10509: Prepare for release public_key: Add PKCS-10 documentation and PKCS-7 test case public_key: Simplified PKCS-7 and PKCS-10 specs. public_key: Added PKCS-10 public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS. public_key: Add PKCS-7
Diffstat (limited to 'lib/public_key/doc/src/introduction.xml')
-rw-r--r--lib/public_key/doc/src/introduction.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/public_key/doc/src/introduction.xml b/lib/public_key/doc/src/introduction.xml
index a21fcf3576..b1d1114a6c 100644
--- a/lib/public_key/doc/src/introduction.xml
+++ b/lib/public_key/doc/src/introduction.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
<!DOCTYPE chapter SYSTEM "chapter.dtd">
<chapter>
<header>
<copyright>
<year>2008</year>
- <year>2011</year>
+ <year>2012</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -37,15 +37,15 @@
<section>
<title>Purpose</title>
<p> This application provides an API to public key infrastructure
- from RFC 3280 (X.509 certificates) and public key formats defined
- by the PKCS-standard.</p>
+ from <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC
+ 5280</url> (X.509 certificates) and public key formats defined by
+ the <url href=http://www.rsa.com/rsalabs/node.asp?id=2124"> PKCS-standard</url></p>
</section>
<section>
<title>Prerequisites</title>
- <p>It is assumed that the reader is familiar with the Erlang
- programming language, concepts of OTP and has a basic understanding
- of the concepts of using public keys.</p>
+ <p>It is assumed that the reader has a basic understanding
+ of the concepts of using public keys and digital certificates.</p>
</section>
<section>