[Python-checkins] cpython (merge 3.3 -> default): Closes #20253: Merge typo fix

[zach.ware]

http://hg.python.org/cpython/rev/2f54b55fcbfa
changeset:   88478:2f54b55fcbfa
parent:      88476:e38225008f2e
parent:      88477:4f8ad9a4193f
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jan 14 09:10:33 2014 -0600
summary:
  Closes #20253: Merge typo fix

files:
  Doc/library/ipaddress.rst |  4 ++--
  Misc/NEWS                 |  3 +++
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -414,7 +414,7 @@
       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 @@
    .. 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -475,6 +475,9 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython