]> granicus.if.org Git - python/commitdiff
Closes #20253: Merge typo fix
authorZachary Ware <zachary.ware@gmail.com>
Tue, 14 Jan 2014 15:10:33 +0000 (09:10 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 14 Jan 2014 15:10:33 +0000 (09:10 -0600)
1  2 
Doc/library/ipaddress.rst
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index 6c8cacdea5754a7199fba4c6dea50b53dd6f731d,d5d0274b95a50343af5fda9731673ee518adbba7..da727f264470962e4404391b651d205d8240f98c
+++ b/Misc/NEWS
@@@ -475,6 -302,12 +475,9 @@@ Buil
  Documentation
  -------------
  
 -- Issue #19963: Document that importlib.import_module() no longer requires
 -  importing parent packages separately.
 -
+ - 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.