commit a1a1f2325ef8ea0a1d467dcafa8fffde98a5a7c3
author Paul Kehrer <paul.l.kehrer@gmail.com> Sun Mar 15 15:34:35 2015 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sun Mar 29 00:25:02 2015 -0500
tree a9c83a4ea2815e604cf19e2756f96c64f633b7d5
parent 5aadb9cec193ce3486f597dee044b77e268d9b77

rename to CertificateSigningRequest

docs/x509.rst

diff --git a/docs/x509.rst b/docs/x509.rst
index 03301c2..fd1b423 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -77,14 +77,14 @@
     >>> cert.serial
     2
 
-Loading CSRs
-~~~~~~~~~~~~
+Loading Certificate Signing Requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. function:: load_pem_x509_csr(data, backend)
 
     .. versionadded:: 0.9
 
-    Deserialize a certificate signing request from PEM encoded data. PEM
+    Deserialize a certificate signing request (CSR) 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.
@@ -95,7 +95,8 @@
         :class:`~cryptography.hazmat.backends.interfaces.X509Backend`
         interface.
 
-    :returns: An instance of :class:`~cryptography.x509.CSR`.
+    :returns: An instance of
+        :class:`~cryptography.x509.CertificateSigningRequest`.
 
 .. testsetup::
 
@@ -125,8 +126,8 @@
     >>> from cryptography import x509
     >>> from cryptography.hazmat.backends import default_backend
     >>> from cryptography.hazmat.primitives import hashes
-    >>> request = x509.load_pem_x509_csr(pem_req_data, default_backend())
-    >>> isinstance(request.signature_hash_algorithm, hashes.SHA1)
+    >>> csr = x509.load_pem_x509_csr(pem_req_data, default_backend())
+    >>> isinstance(csr.signature_hash_algorithm, hashes.SHA1)
     True
 
 X.509 Certificate Object
@@ -266,7 +267,7 @@
 X.509 CSR (Certificate Signing Request) Object
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. class:: CSR
+.. class:: CertificateSigningRequest
 
     .. versionadded:: 0.9
 
@@ -282,7 +283,7 @@
         .. doctest::
 
             >>> from cryptography.hazmat.primitives.asymmetric import rsa
-            >>> public_key = request.public_key()
+            >>> public_key = csr.public_key()
             >>> isinstance(public_key, rsa.RSAPublicKey)
             True
 
@@ -303,7 +304,7 @@
         .. doctest::
 
             >>> from cryptography.hazmat.primitives import hashes
-            >>> isinstance(request.signature_hash_algorithm, hashes.SHA1)
+            >>> isinstance(csr.signature_hash_algorithm, hashes.SHA1)
             True
 
 .. class:: Name