summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2016-02-07 10:28:00 +0000
committerCory Benfield <lukasaoz@gmail.com>2016-02-07 10:28:00 +0000
commit47569251f329ec8a8e36239691312ffb91c8d55e (patch)
tree440d34bad8dac8c1169c8a1021fa65b16d1cb8c3 /doc
parentfb4d4fb313cc26a863e4d0b4f7df8634535b9346 (diff)
downloadpyopenssl-git-47569251f329ec8a8e36239691312ffb91c8d55e.tar.gz
Code review feedback (belatedly!)
Diffstat (limited to 'doc')
-rw-r--r--doc/api/crypto.rst9
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/api/crypto.rst b/doc/api/crypto.rst
index a10e9e3..27da7e8 100644
--- a/doc/api/crypto.rst
+++ b/doc/api/crypto.rst
@@ -34,18 +34,15 @@ Elliptic curves
Serialization and deserialization
---------------------------------
-The following serialization functions take one of these constants to
-determine the format.
+The following serialization functions take one of these constants to determine the format.
.. py:data:: FILETYPE_PEM
-:data:`FILETYPE_PEM` serializes data to a Base64-encoded encoded representation
-of the underlying ASN.1 data structure.
+:data:`FILETYPE_PEM` serializes data to a Base64-encoded encoded representation of the underlying ASN.1 data structure. This representation includes delimiters that define what data structure is contained within the Base64-encoded block: for example, for a certificate, the delimiters are ``-----BEGIN CERTIFICATE-----`` and ``-----END CERTIFICATE-----``.
.. py:data:: FILETYPE_ASN1
-:data:`FILETYPE_ASN1` serializes data to the underlying ASN.1 data structure.
-The format used by :data:`FILETYPE_ASN1` is also sometimes referred to as DER.
+:data:`FILETYPE_ASN1` serializes data to the underlying ASN.1 data structure. The format used by :data:`FILETYPE_ASN1` is also sometimes referred to as DER.
Certificates
~~~~~~~~~~~~