From 361a9fc2b7ec3c41dbf479071fca87a2573e0c52 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 24 Jun 2017 10:12:04 -1000 Subject: changelog entry and a few updates to the new DH params docs (#3718) --- docs/hazmat/primitives/asymmetric/serialization.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/hazmat/primitives/asymmetric/serialization.rst') diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index b0cfbd0e..24e2b89c 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -199,8 +199,8 @@ all begin with ``-----BEGIN {format}-----`` and end with ``-----END .. versionadded:: 2.0 - Deserialize encryption parameters from PEM encoded data to one of the supported - asymmetric encryption parameters types. + Deserialize parameters from PEM encoded data to one of the supported + asymmetric parameters types. .. doctest:: @@ -317,8 +317,8 @@ the rest. .. versionadded:: 2.0 - Deserialize encryption parameters from DER encoded data to one of the supported - asymmetric encryption parameters types. + Deserialize parameters from DER encoded data to one of the supported + asymmetric parameters types. :param bytes data: The DER encoded parameters data. -- cgit v1.2.3