diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-06-10 11:26:32 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-06-10 11:26:32 (GMT) |
| commit | 62e3ad3e037d5b5b9a12d239facc334ab4341940 (patch) | |
| tree | 8fa30a1b9fa5b8ccb70df01a9179f4695f7b189d /Doc | |
| parent | b7bdfcff97d13b803d182f02f7005bce9ae29f18 (diff) | |
| parent | 420e4d843b8b8995aaf7019645e4249d49113cd9 (diff) | |
| download | cpython-62e3ad3e037d5b5b9a12d239facc334ab4341940.zip cpython-62e3ad3e037d5b5b9a12d239facc334ab4341940.tar.gz cpython-62e3ad3e037d5b5b9a12d239facc334ab4341940.tar.bz2 | |
Issue #27280: Merge from 3.5
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/ipaddress.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst index 6a7b979..f6bfcf9 100644 --- a/Doc/library/ipaddress.rst +++ b/Doc/library/ipaddress.rst @@ -580,7 +580,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`. 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, or an existing IPv6Address object; and the netmask is an integer representing the prefix length. An :exc:`AddressValueError` is raised if *address* is not a valid IPv6 |