Merge branch 'master' into setup-install-extension

Conflicts:
	setup.py

2 files changed, 7 insertions, 4 deletions

diff --git a/docs/hazmat/bindings/index.rst b/docs/hazmat/bindings/index.rst
index 809eddfc..e2a17591 100644
--- a/docs/hazmat/bindings/index.rst
+++ b/docs/hazmat/bindings/index.rst
@@ -6,7 +6,7 @@ Bindings
 .. currentmodule:: cryptography.hazmat.bindings
 
 ``cryptography`` aims to provide low-level CFFI based bindings to multiple
-native C libraries. These provide no automatic initialisation of the library
+native C libraries. These provide no automatic initialization of the library
 and may not provide complete wrappers for its API.
 
 Using these functions directly is likely to require you to be careful in
diff --git a/docs/hazmat/primitives/hmac.rst b/docs/hazmat/primitives/hmac.rst
index b8f94fd2..dc5c54f8 100644
--- a/docs/hazmat/primitives/hmac.rst
+++ b/docs/hazmat/primitives/hmac.rst
@@ -74,8 +74,11 @@ message.
 
     .. method:: verify(signature)
 
-        Finalize the current context and securely compare digest to ``signature``.
+        Finalize the current context and securely compare digest to
+        ``signature``.
 
-        :param bytes signature: The bytes of the HMAC signature recieved.
+        :param bytes signature: The bytes to compare the current digest
+                                against.
         :raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize`
-        :raises cryptography.exceptions.InvalidSignature: If signature does not match digest
+        :raises cryptography.exceptions.InvalidSignature: If signature does not
+                                                          match digest