aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-11 20:48:42 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-29 00:24:37 -0500
commit5aadb9cec193ce3486f597dee044b77e268d9b77 (patch)
tree258a3ae41469cde57600ae19c9ddd8e7b49bc185 /docs
parent31e398802c79d3b4a182b28f17b99595e84bbe2a (diff)
downloadcryptography-5aadb9cec193ce3486f597dee044b77e268d9b77.tar.gz
cryptography-5aadb9cec193ce3486f597dee044b77e268d9b77.tar.bz2
cryptography-5aadb9cec193ce3486f597dee044b77e268d9b77.zip
address some review comments
Diffstat (limited to 'docs')
-rw-r--r--docs/x509.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/x509.rst b/docs/x509.rst
index 7f681ead..03301c22 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -84,8 +84,8 @@ Loading CSRs
.. versionadded:: 0.9
- Deserialize a certificate request from PEM encoded data. PEM requests are
- base64 decoded and have delimiters that look like
+ Deserialize a certificate signing request from PEM encoded data. PEM
+ requests are base64 decoded and have delimiters that look like
``-----BEGIN CERTIFICATE REQUEST-----``. This is also known as PKCS#10
format.
@@ -263,8 +263,8 @@ X.509 Certificate Object
... print(ext)
<Extension(oid=<ObjectIdentifier(oid=2.5.29.19, name=basicConstraints)>, critical=True, value=<BasicConstraints(ca=True, path_length=None)>)>
-X.509 CSR Object
-~~~~~~~~~~~~~~~~
+X.509 CSR (Certificate Signing Request) Object
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. class:: CSR