aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-06 07:59:46 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-06 07:59:46 -0500
commitf50aad13089ba7d53b3b668eb096d5485814fbd8 (patch)
tree771bf1995e855283a0ebb84702a8fbce577060f2 /docs
parent2c67edd301e445bf8f65bf026882f7927d48748b (diff)
parent1534e09c7436356260027e1c1ca83d40d3c8da93 (diff)
downloadcryptography-f50aad13089ba7d53b3b668eb096d5485814fbd8.tar.gz
cryptography-f50aad13089ba7d53b3b668eb096d5485814fbd8.tar.bz2
cryptography-f50aad13089ba7d53b3b668eb096d5485814fbd8.zip
Merge pull request #1017 from Ayrx/fix-documentation-typo
Fixed misspelling
Diffstat (limited to 'docs')
-rw-r--r--docs/hazmat/primitives/key-derivation-functions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/key-derivation-functions.rst b/docs/hazmat/primitives/key-derivation-functions.rst
index 269f949d..ee8f8ab6 100644
--- a/docs/hazmat/primitives/key-derivation-functions.rst
+++ b/docs/hazmat/primitives/key-derivation-functions.rst
@@ -194,7 +194,7 @@ Different KDFs are suitable for different tasks such as:
.. method:: derive(key_material)
:param bytes key_material: The input key material.
- :retunr bytes: The derived key.
+ :return bytes: The derived key.
Derives a new key from the input key material by performing both the
extract and expand operations.