Merge heads.

Doc/library/hmac.rst

@@ -75,7 +75,7 @@ This module also provides the following helper function:
    appropriate for cryptography.  *a* and *b*
    must both be of the same type: either :class:`str` (ASCII only, as e.g.
    returned by :meth:`HMAC.hexdigest`), or any type that supports the
-   :term:`buffer protocol` (e.g. :class:`bytes`).
+   buffer protocol (e.g. :class:`bytes`).
 
    Using a short circuiting comparison (that is, one that terminates as soon as
    it finds any difference between the values) to check digests for correctness