From 31e398802c79d3b4a182b28f17b99595e84bbe2a Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 11 Mar 2015 11:37:04 -0500
Subject: rename request to CSR

---
 docs/hazmat/backends/interfaces.rst |  4 ++--
 docs/x509.rst                       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'docs')

diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index 1f71f5d1..2b53dfdb 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -510,10 +510,10 @@ A specific ``backend`` may provide one or more of these interfaces.
 
         :returns: An instance of :class:`~cryptography.x509.Certificate`.
 
-    .. method:: load_pem_x509_request(data)
+    .. method:: load_pem_x509_csr(data)
 
         .. versionadded:: 0.9
 
         :param bytes data: PEM formatted certificate request data.
 
-        :returns: An instance of :class:`~cryptography.x509.Request`.
+        :returns: An instance of :class:`~cryptography.x509.CSR`.
diff --git a/docs/x509.rst b/docs/x509.rst
index 2ff12902..7f681ead 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -77,10 +77,10 @@ Loading Certificates
     >>> cert.serial
     2
 
-Loading Certificate Requests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Loading CSRs
+~~~~~~~~~~~~
 
-.. function:: load_pem_x509_request(data, backend)
+.. function:: load_pem_x509_csr(data, backend)
 
     .. versionadded:: 0.9
 
@@ -95,7 +95,7 @@ Loading Certificate Requests
         :class:`~cryptography.hazmat.backends.interfaces.X509Backend`
         interface.
 
-    :returns: An instance of :class:`~cryptography.x509.Request`.
+    :returns: An instance of :class:`~cryptography.x509.CSR`.
 
 .. testsetup::
 
@@ -125,7 +125,7 @@ Loading Certificate Requests
     >>> from cryptography import x509
     >>> from cryptography.hazmat.backends import default_backend
     >>> from cryptography.hazmat.primitives import hashes
-    >>> request = x509.load_pem_x509_request(pem_req_data, default_backend())
+    >>> request = x509.load_pem_x509_csr(pem_req_data, default_backend())
     >>> isinstance(request.signature_hash_algorithm, hashes.SHA1)
     True
 
@@ -263,10 +263,10 @@ 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 Certificate Request Object
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+X.509 CSR Object
+~~~~~~~~~~~~~~~~
 
-.. class:: Request
+.. class:: CSR
 
     .. versionadded:: 0.9
 
-- 
cgit v1.2.3