Update docs

Author: edschofield

docs/quickstart.rst

@@ -98,30 +98,36 @@ be accessed under their Python 3 names and locations in Python 2::
         import http.cookies
         import http.cookiejar
 
+        import urllib.request
+        import urllib.parse
+        import urllib.response
+        import urllib.error
+        import urllib.robotparser
+
         import xmlrpc.client
         import xmlrpc.server
 
-``urllib`` currently requires an explicit import because the name clashes with
-that on Python 2 and because Python's syntax does not allow imports of this
-form with a dotted module name after ``as``::
-
-    import future.moves.urllib.parse as urllib.parse
-
-For submodules of ``urllib`` and other packages (like ``http``), this
-alternative form is available::
-
-    from future.standard_library import import_
-
-    urllib = import_('urllib')
-    import_('urllib.parse')
-    import_('urllib.request')
-    import_('urllib.error')
-
-    response = urllib.request.urlopen('http://mywebsite.com')
-    # etc.
-
-For an explanation of these and other forms of imports from the standard
-library, see :ref:`standard-library-imports`.
+.. ``urllib`` currently requires an explicit import because the name clashes with
+.. that on Python 2 and because Python's syntax does not allow imports of this
+.. form with a dotted module name after ``as``::
+..
+..     import future.moves.urllib.parse as urllib.parse
+..
+.. For submodules of ``urllib`` and other packages (like ``http``), this
+.. alternative form is available::
+..
+..     from future.standard_library import import_
+..
+..     urllib = import_('urllib')
+..     import_('urllib.parse')
+..     import_('urllib.request')
+..     import_('urllib.error')
+..
+..     response = urllib.request.urlopen('http://mywebsite.com')
+..     # etc.
+..
+.. For an explanation of these and other forms of imports from the standard
+.. library, see :ref:`standard-library-imports`.
 
 
 .. _py2-dependencies:

docs/whatsnew.rst

@@ -243,7 +243,7 @@ Many small improvements and fixes have been made across the project. Some highli
 
 - ``futurize``: Shebang lines such as ``#!/usr/bin/env python`` and source code
   file encoding declarations like ``# -*- coding=utf-8 -*-`` are no longer occasionally
-  displaced by ``from __future__ import ...`` statements.
+  displaced by ``from __future__ import ...`` statements. (Issue #10.)
 
 - Improved compatibility with py2exe (`issue #31 <https://github.com/PythonCharmers/python-future/issues/31>`_).
 

future/__init__.py

@@ -6,16 +6,18 @@
 2. It allows you to use a single, clean Python 3.x-compatible codebase to
 support both Python 3 and Python 2 with minimal overhead.
 
-Notable projects that use ``future`` for Python 2/3 compatibility are `Mezzanine <http://mezzanine.jupo.org/>`_ and `xlwt-future <https://pypi.python.org/pypi/xlwt-future>`_.
+Notable projects that use ``future`` for Python 2/3 compatibility are
+`Mezzanine <http://mezzanine.jupo.org/>`_ and `ObsPy <http://obspy.org>`_.
 
 It is designed to be used as follows::
 
     from __future__ import (absolute_import, division,
                             print_function, unicode_literals)
-    from future.builtins import (bytes, dict, int, range, str,
-                                 ascii, chr, hex, input, next,
-                                 oct, open, pow, round, super,
-                                 filter, map, zip)
+    from future.builtins import (
+                    bytes, dict, int, list, object, range, str,
+                    ascii, chr, hex, input, next, oct, open,
+                    pow, round, super,
+                    filter, map, zip)
 
 followed by predominantly standard, idiomatic Python 3 code that then runs
 similarly on Python 2.6/2.7 and Python 3.3+.
@@ -48,12 +50,6 @@
 
 See: http://python-future.org
 
-Also see the docstrings for each of these modules for more info::
-
-- future.standard_library
-- future.builtins
-- future.utils
-
 
 Credits
 -------