commit d1c0fb8bbe0984d54ba0f4b7a8861bca0e446e19
author Paul Kehrer <paul.l.kehrer@gmail.com> Thu May 15 14:43:00 2014 -0400
committer Paul Kehrer <paul.l.kehrer@gmail.com> Thu May 15 14:43:00 2014 -0400
tree 908e336dcd1ef61c773e366f390c0dfb563580bf
parent a6112133d6797313ea8fe741daf25178b2abe25c
parent af075f0e1e80d5ceb55f20dc95a305a741678469

Merge pull request #1042 from alex/improve-docs

Fixed #1039 -- provide links to PSS and PKCS1v15 in the RSA docs

docs/hazmat/primitives/asymmetric/rsa.rst

diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst
index 7bae714..234a5c6 100644
--- a/docs/hazmat/primitives/asymmetric/rsa.rst
+++ b/docs/hazmat/primitives/asymmetric/rsa.rst
@@ -85,7 +85,10 @@
 
         :param padding: An instance of a
             :class:`~cryptography.hazmat.primitives.interfaces.AsymmetricPadding`
-            provider.
+            provider. Valid values are
+            :class:`~cryptography.hazmat.primitives.asymmetric.padding.PSS` and
+            :class:`~cryptography.hazmat.primitives.asymmetric.padding.PKCS1v15`
+            (``PSS`` is recommended for all new applications).
 
         :param algorithm: An instance of a
             :class:`~cryptography.hazmat.primitives.interfaces.HashAlgorithm`
@@ -254,7 +257,10 @@
 
         :param padding: An instance of a
             :class:`~cryptography.hazmat.primitives.interfaces.AsymmetricPadding`
-            provider.
+            provider. Valid values are
+            :class:`~cryptography.hazmat.primitives.asymmetric.padding.PSS` and
+            :class:`~cryptography.hazmat.primitives.asymmetric.padding.PKCS1v15`
+            (``PSS`` is recommended for all new applications).
 
         :param algorithm: An instance of a
             :class:`~cryptography.hazmat.primitives.interfaces.HashAlgorithm`