diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-08 13:41:36 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-08 13:41:36 -0800 |
| commit | ae17250910ef1bd660552ea0ba7d92020bde325b (patch) | |
| tree | 3eff61c22485d909dac3d1ae30fe938254c4b95b /docs/hazmat | |
| parent | 3d38f7a68b4ffc4cab920a82f1d6d225b906be22 (diff) | |
| parent | 63b3de2fa82729022d2c97e54b4c5e1a7ceff8f4 (diff) | |
| download | cryptography-ae17250910ef1bd660552ea0ba7d92020bde325b.tar.gz cryptography-ae17250910ef1bd660552ea0ba7d92020bde325b.tar.bz2 cryptography-ae17250910ef1bd660552ea0ba7d92020bde325b.zip | |
Merge pull request #579 from public/words
s/which/that/
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 2 | ||||
| -rw-r--r-- | docs/hazmat/backends/multibackend.rst | 2 | ||||
| -rw-r--r-- | docs/hazmat/primitives/cryptographic-hashes.rst | 2 | ||||
| -rw-r--r-- | docs/hazmat/primitives/hmac.rst | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index db68a646..e6bf8f69 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -16,7 +16,7 @@ A specific ``backend`` may provide one or more of these interfaces. .. class:: CipherBackend - A backend which provides methods for using ciphers for encryption + A backend that provides methods for using ciphers for encryption and decryption. The following backends implement this interface: diff --git a/docs/hazmat/backends/multibackend.rst b/docs/hazmat/backends/multibackend.rst index 95538ac8..119b13ae 100644 --- a/docs/hazmat/backends/multibackend.rst +++ b/docs/hazmat/backends/multibackend.rst @@ -10,7 +10,7 @@ MultiBackend .. versionadded:: 0.2 This class allows you to combine multiple backends into a single backend - which offers the combined features of all of its constituents. + that offers the combined features of all of its constituents. .. code-block:: pycon diff --git a/docs/hazmat/primitives/cryptographic-hashes.rst b/docs/hazmat/primitives/cryptographic-hashes.rst index 38347378..6c56acad 100644 --- a/docs/hazmat/primitives/cryptographic-hashes.rst +++ b/docs/hazmat/primitives/cryptographic-hashes.rst @@ -56,7 +56,7 @@ Message Digests :meth:`finalize` and get an intermediate digest value while we continue to call :meth:`update` on the original. - :return: A new instance of :class:`Hash` which can be updated + :return: A new instance of :class:`Hash` that can be updated and finalized independently of the original instance. :raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize` diff --git a/docs/hazmat/primitives/hmac.rst b/docs/hazmat/primitives/hmac.rst index a21799be..0118be78 100644 --- a/docs/hazmat/primitives/hmac.rst +++ b/docs/hazmat/primitives/hmac.rst @@ -67,7 +67,7 @@ message. :meth:`finalize` and get an intermediate digest value while we continue to call :meth:`update` on the original. - :return: A new instance of :class:`HMAC` which can be updated + :return: A new instance of :class:`HMAC` that can be updated and finalized independently of the original instance. :raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize` |