summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-01-14 15:09:48 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-01-14 15:09:48 (GMT)
commit9774ce0cabb0811b0eac146f0051787cf25ee76a (patch)
tree3a6249365da06fa96aff15e7d5786f6a222ec9d6
parent26d5fab8c8a979d383db681f4c3d93b549a095ad (diff)
downloadcpython-9774ce0cabb0811b0eac146f0051787cf25ee76a.zip
cpython-9774ce0cabb0811b0eac146f0051787cf25ee76a.tar.gz
cpython-9774ce0cabb0811b0eac146f0051787cf25ee76a.tar.bz2
Issue #20253: Fixed a typo in the ipaddress docs that advertised an
illegal attribute name. Found by INADA Naoki.
-rw-r--r--Doc/library/ipaddress.rst4
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 2 deletions
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 769af72..3a567fc 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -405,7 +405,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
The broadcast address for the network. Packets sent to the broadcast
address should be received by every host on the network.
- .. attribute:: host mask
+ .. attribute:: hostmask
The host mask, as a string.
@@ -561,7 +561,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
.. attribute:: is_link_local
.. attribute:: network_address
.. attribute:: broadcast_address
- .. attribute:: host mask
+ .. attribute:: hostmask
.. attribute:: with_prefixlen
.. attribute:: compressed
.. attribute:: exploded
diff --git a/Misc/NEWS b/Misc/NEWS
index eada667..d5d0274 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -302,6 +302,9 @@ Tests
Documentation
-------------
+- Issue #20253: Fixed a typo in the ipaddress docs that advertised an
+ illegal attribute name. Found by INADA Naoki.
+
- Issue #19963: Document that importlib.import_module() no longer requires
importing parent packages separately.