aboutsummaryrefslogtreecommitdiffstats
path: root/docs/x509/reference.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-13 08:42:13 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-13 08:42:13 -0500
commita52920302240224260e4dbd6607a3a082fae1dd5 (patch)
tree689c797849bf5648cbaa483a6d84aafed27683cc /docs/x509/reference.rst
parentd148eef8d96b12ca40b18e8fe12472b5bc050592 (diff)
parent4c2561afecdbd25226f093698404facb8b49abee (diff)
downloadcryptography-a52920302240224260e4dbd6607a3a082fae1dd5.tar.gz
cryptography-a52920302240224260e4dbd6607a3a082fae1dd5.tar.bz2
cryptography-a52920302240224260e4dbd6607a3a082fae1dd5.zip
Merge pull request #2412 from alex/correct-syntax
Use the right reST syntax for these
Diffstat (limited to 'docs/x509/reference.rst')
-rw-r--r--docs/x509/reference.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst
index 72603f42..97224c9f 100644
--- a/docs/x509/reference.rst
+++ b/docs/x509/reference.rst
@@ -226,13 +226,13 @@ X.509 Certificate Object
.. method:: public_key()
- :type:
+ The public key associated with the certificate.
+
+ :returns:
:class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`
- The public key associated with the certificate.
-
.. doctest::
>>> from cryptography.hazmat.primitives.asymmetric import rsa
@@ -533,13 +533,13 @@ X.509 CSR (Certificate Signing Request) Object
.. method:: public_key()
- :type:
+ The public key associated with the request.
+
+ :returns:
:class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`
- The public key associated with the request.
-
.. doctest::
>>> from cryptography.hazmat.primitives.asymmetric import rsa