summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-08-30 14:42:59 -0700
committerBenjamin Peterson <benjamin@python.org>2015-08-30 14:42:59 -0700
commit902adbb3935cffcb080bcee4648b583828e657c0 (patch)
treefb8c45dd39a8992a7b8ce20619fad3cb01774bd5
parent7f9f27d767e8abc164e0ac8656a3fdb2c7162ac9 (diff)
parent1498461a7ada7688b347007aa2cc00b857899dff (diff)
downloadcpython-git-902adbb3935cffcb080bcee4648b583828e657c0.tar.gz
merge 3.5 (#24963)
-rw-r--r--Doc/library/ipaddress.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 7b594408c8..90fcc748e7 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -575,7 +575,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
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