[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[andrew.kuchling]

http://hg.python.org/cpython/rev/2d62ee3c7617
changeset:   89211:2d62ee3c7617
parent:      89208:8a1d3551881f
parent:      89210:383f4eede628
user:        Andrew Kuchling <amk at amk.ca>
date:        Sat Feb 15 17:22:41 2014 -0500
summary:
  Merge from 3.3

files:
  Doc/glossary.rst          |  8 ++++++++
  Doc/library/ipaddress.rst |  2 +-
  2 files changed, 9 insertions(+), 1 deletions(-)


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- 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
--- 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

-- 
Repository URL: http://hg.python.org/cpython