diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-07-12 11:55:16 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-07-12 11:55:16 -0500 |
| commit | 26516e52ec6c463a4db725c7d6f07b49b18c4e21 (patch) | |
| tree | 4ee44c38b6aa0bf082ce04fcd89c07d7ba9e81a8 /docs/hazmat/primitives | |
| parent | 548e85ed63964c38fd450a4ee8753a5be2c956d5 (diff) | |
| parent | b32b005b1fa3965ebc76131eb4c6ebd352cc6f1a (diff) | |
| download | cryptography-26516e52ec6c463a4db725c7d6f07b49b18c4e21.tar.gz cryptography-26516e52ec6c463a4db725c7d6f07b49b18c4e21.tar.bz2 cryptography-26516e52ec6c463a4db725c7d6f07b49b18c4e21.zip | |
Merge pull request #2142 from alex/x509-tutorial
Reorganize the x509 docs in prep for a tutorial
Diffstat (limited to 'docs/hazmat/primitives')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index 7839f346..8d51f0d7 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -97,8 +97,8 @@ all begin with ``-----BEGIN {format}-----`` and end with ``-----END .. note:: A PEM block which starts with ``-----BEGIN CERTIFICATE-----`` is not a - public or private key, it's an :doc:`X.509 Certificate </x509>`. You can - load it using :func:`~cryptography.x509.load_pem_x509_certificate` and + public or private key, it's an :doc:`X.509 Certificate </x509/index>`. You + can load it using :func:`~cryptography.x509.load_pem_x509_certificate` and extract the public key with :meth:`Certificate.public_key <cryptography.x509.Certificate.public_key>`. |