[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#24963)

[benjamin.peterson]

https://hg.python.org/cpython/rev/6463279d1358
changeset:   97555:6463279d1358
parent:      97552:c427f1b56ecb
parent:      97554:b5434aff4e84
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Aug 30 14:42:59 2015 -0700
summary:
  merge 3.5 (#24963)

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


diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -575,7 +575,7 @@
       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

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