Closes #20253: Merge typo fix

zware · zware · commit 5c15424aa96a · 2014-01-14T09:10:33.000-06:00
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
@@ -414,7 +414,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.
 
@@ -570,7 +570,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
@@ -475,6 +475,9 @@ Build
 Documentation
 -------------
 
+- Issue #20253: Fixed a typo in the ipaddress docs that advertised an
+  illegal attribute name.  Found by INADA Naoki.
+
 - Issue #18840: Introduce the json module in the tutorial, and deemphasize
   the pickle module.
 
