Merge.

pep-3144.txt

@@ -55,6 +55,23 @@ Background:
     * A few attributes were renamed to disambiguate their purpose as
       well. (eg. network, network_address)
 
+    * A number of methods and functions which returned containers in ipaddr now
+    return iterators. This includes, subnets, address_exclude,
+    summarize_address_range and collapse_address_list.
+
+
+    Due to the backwards incompatible API changes between ipaddress and ipaddr,
+    the proposal is to add the module using the new provisional API status:
+
+    * http://docs.python.org/dev/glossary.html#term-provisional-package
+
+
+    Relevant messages on python-dev:
+
+    * http://mail.python.org/pipermail/python-dev/2012-January/116016.html
+    * http://mail.python.org/pipermail/python-dev/2012-February/116656.html
+    * http://mail.python.org/pipermail/python-dev/2012-February/116688.html
+
 
 Specification:
 
@@ -115,6 +132,9 @@ Specification:
 Reference Implementation:
 
     The current reference implementation can be found at:
+    https://code.google.com/p/ipaddr-py/source/browse/branches/3144/ipaddress.py
+
+    Or see the tarball to include the README and unittests.
     http://code.google.com/p/ipaddr-py/downloads/detail?name=3144.tar.gz
 
     More information about using the reference implementation can be