From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Aug 2015 21:42:49 +0000 (-0700)
Subject: merge 3.4 (#24963)
X-Git-Tag: v3.6.0a1~1720^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1498461a7ada7688b347007aa2cc00b857899dff;p=python

merge 3.4 (#24963)
---

1498461a7ada7688b347007aa2cc00b857899dff
diff --cc Doc/library/ipaddress.rst
index 7b594408c8,301048ef6a..90fcc748e7
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@@ -575,14 -550,9 +575,14 @@@ so to avoid duplication they are only d
        single-address network, with the network address being *address* and
        the mask being ``/128``.
  
-    3. An integer packed into a :class:`bytes` object of length 16, bit-endian.
+    3. An integer packed into a :class:`bytes` object of length 16, big-endian.
        The interpretation is similar to an integer *address*.
  
 +   4. A two-tuple of an address description and a netmask, where the address
 +      description is either a string, a 128-bits integer, a 16-bytes packed
 +      integer, or an existing IPv4Address object; and the netmask is an
 +      integer representing the prefix length.
 +
     An :exc:`AddressValueError` is raised if *address* is not a valid IPv6
     address.  A :exc:`NetmaskValueError` is raised if the mask is not valid for
     an IPv6 address.