Closes #20253: Merge typo fix

82f20efe · Zachary Ware · 73a132ca · 0165f7c8 · 82f20efe · 82f20efe
Commit 82f20efe authored Jan 14, 2014 by Zachary Ware
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Doc/library/ipaddress.rst Doc/library/ipaddress.rst +2 -2

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- 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

--- 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.