summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-08-30 21:42:49 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-08-30 21:42:49 (GMT)
commit1498461a7ada7688b347007aa2cc00b857899dff (patch)
tree3ba05faa66ac7fd37cf3fce88fdafff944274321
parent9157545c1179045dda9d3c23961a971d838afa3a (diff)
parent0612ffe8c8a06f8d16d136622106f0cf5f43f90f (diff)
downloadcpython-1498461a7ada7688b347007aa2cc00b857899dff.zip
cpython-1498461a7ada7688b347007aa2cc00b857899dff.tar.gz
cpython-1498461a7ada7688b347007aa2cc00b857899dff.tar.bz2
merge 3.4 (#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 7b59440..90fcc74 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