From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 14 Jan 2014 15:10:33 +0000 (-0600)
Subject: Closes #20253: Merge typo fix
X-Git-Tag: v3.4.0b3~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c15424aa96acce4f136b74a7bd2afaafa9d9651;p=thirdparty%2FPython%2Fcpython.git

Closes #20253: Merge typo fix
---

5c15424aa96acce4f136b74a7bd2afaafa9d9651
diff --cc Misc/NEWS
index 6c8cacdea575,d5d0274b95a5..da727f264470
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -475,6 -302,12 +475,9 @@@ Buil
  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.
 -
  - Issue #18840: Introduce the json module in the tutorial, and deemphasize
    the pickle module.