Merge from 3.3
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 2f658ac..f71a1f7 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -783,6 +783,14 @@
mapping rather than a sequence because the lookups use arbitrary
:term:`immutable` keys rather than integers.
+ The :class:`collections.abc.Sequence` abstract base class
+ defines a much richer interface that goes beyond just
+ :meth:`__getitem__` and :meth:`__len__`, adding :meth:`count`,
+ :meth:`index`, :meth:`__contains__`, and
+ :meth:`__reversed__`. Types that implement this expanded
+ interface can be registered explicitly using
+ :func:`~abc.register`.
+
single dispatch
A form of :term:`generic function` dispatch where the implementation is
chosen based on the type of a single argument.
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 9ccf262..aedf5c2 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -167,7 +167,7 @@
.. attribute:: is_unspecified
- ``True`` if the address is unspecified. See :RFC:`5375` (for IPv4)
+ ``True`` if the address is unspecified. See :RFC:`5735` (for IPv4)
or :RFC:`2373` (for IPv6).
.. attribute:: is_reserved